diff mbox series

[FFmpeg-devel] avcodec/pngdec: warn when reading tv-range cICP chunks

Message ID 20230131231254.277086-1-leo.izen@gmail.com
State New
Headers show
Series [FFmpeg-devel] avcodec/pngdec: warn when reading tv-range cICP chunks | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Leo Izen Jan. 31, 2023, 11:12 p.m. UTC 
FFmpeg doesn't support tv-range RGB pixel data, so if we see a cICP
chunk that marks its RGB data as tv-range, we should print a warning
instead of setting it to AVCOL_RANGE_MPEG and having things possibly
mess up later down the line.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavcodec/pngdec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 0d969decf2..384ae97177 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1511,8 +1511,10 @@  static int output_frame(PNGDecContext *s, AVFrame *f)
             av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n");
         else
             avctx->color_trc = f->color_trc = s->cicp_trc;
-        avctx->color_range = f->color_range =
-            s->cicp_range == 0 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+        /* we don't support tv-range RGB */
+        avctx->color_range = f->color_range = AVCOL_RANGE_JPEG;
+        if (s->cicp_range == 0)
+            av_log(avctx, AV_LOG_WARNING, "unsupported tv-range cICP chunk\n");
     } else if (s->iccp_data) {
         AVFrameSideData *sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len);
         if (!sd) {