1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

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@tencent.com>
This commit is contained in:
Zhao Zhili
2025-05-22 13:06:15 +08:00
parent 6c291232cf
commit c80002aa81

View File

@ -67,11 +67,16 @@ void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *l
vui->matrix_coeffs = get_bits(gb, 8); vui->matrix_coeffs = get_bits(gb, 8);
// Set invalid values to "unspecified" // 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; 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; 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; vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED;
} }
} }