History

swscale/utils: check for supported color transfers

We will use the av_csp_itu_eotf() functions to decode these internally, so check this function to see if it succeeds.

Niklas Haas committed 1 year ago

Commit b9dfe811 parent 6c9218d1 file · +4 −2Browse files

Unified · Split

libswscale/utils.c+4−2
@@ -41,6 +41,7 @@ · 40 unmodified lines
4141 #include "libavutil/attributes.h"
4242 #include "libavutil/avassert.h"
4343 #include "libavutil/cpu.h"
44+#include "libavutil/csp.h"
4445 #include "libavutil/emms.h"
4546 #include "libavutil/imgutils.h"
4647 #include "libavutil/intreadwrite.h"
@@ -2738,8 +2739,9 @@ int sws_test_primaries(enum AVColorPrimaries prim, int output) · 2691 unmodified lines
27382739
27392740 int sws_test_transfer(enum AVColorTransferCharacteristic trc, int output)
27402741 {
2741− return trc > AVCOL_TRC_RESERVED0 && trc < AVCOL_TRC_NB &&
2742− trc != AVCOL_TRC_RESERVED;
2742+ av_csp_eotf_function eotf = output ? av_csp_itu_eotf_inv(trc)
2743+ : av_csp_itu_eotf(trc);
2744+ return trc == AVCOL_TRC_UNSPECIFIED || eotf != NULL;
27432745 }
27442746
27452747 static int test_range(enum AVColorRange range)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t