[FFmpeg-cvslog] avcodec/h2645_vui: Ensure color primaries/trc/space isn't reserved value

Zhao Zhili git at videolan.org
Sun Jun 1 11:47:40 EEST 2025


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Thu May 22 13:06:15 2025 +0800| [c80002aa81e39f6bcc8d08c13acf8f9f61105cb0] | committer: Zhao Zhili

avcodec/h2645_vui: Ensure color primaries/trc/space isn't reserved value

Fix error reported by swscaler:
Unsupported input (Operation not supported): fmt:yuv420p csp:unknown prim:reserved trc:bt709 -> fmt:yuv420p csp:bt709 prim:reserved trc:bt709

Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c80002aa81e39f6bcc8d08c13acf8f9f61105cb0
---

 libavcodec/h2645_vui.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h2645_vui.c b/libavcodec/h2645_vui.c
index e5c7bf46f9..0e576c1563 100644
--- a/libavcodec/h2645_vui.c
+++ b/libavcodec/h2645_vui.c
@@ -67,11 +67,16 @@ void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *l
             vui->matrix_coeffs            = get_bits(gb, 8);
 
             // Set invalid values to "unspecified"
-            if (!av_color_primaries_name(vui->colour_primaries))
+            if (vui->colour_primaries == AVCOL_PRI_RESERVED0 ||
+                vui->colour_primaries == AVCOL_PRI_RESERVED ||
+                !av_color_primaries_name(vui->colour_primaries))
                 vui->colour_primaries = AVCOL_PRI_UNSPECIFIED;
-            if (!av_color_transfer_name(vui->transfer_characteristics))
+            if (vui->transfer_characteristics == AVCOL_TRC_RESERVED0 ||
+                vui->transfer_characteristics == AVCOL_TRC_RESERVED ||
+                !av_color_transfer_name(vui->transfer_characteristics))
                 vui->transfer_characteristics = AVCOL_TRC_UNSPECIFIED;
-            if (!av_color_space_name(vui->matrix_coeffs))
+            if (vui->matrix_coeffs == AVCOL_SPC_RESERVED ||
+                !av_color_space_name(vui->matrix_coeffs))
                 vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED;
         }
     }



More information about the ffmpeg-cvslog mailing list