The color properties enumerations may contain gaps, and lavc should not rely on lavu ABI in this way.
Signed-off-by: Vittorio Giovara <[email protected]> --- Following discussion on IRC. A better wording for either commit log is welcome. Cheers, Vittorio libavcodec/h264_ps.c | 8 +++++--- libavcodec/hevc_ps.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 37c3be1..8a64a33 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -191,11 +191,13 @@ static inline int decode_vui_parameters(GetBitContext *gb, AVCodecContext *avctx sps->color_primaries = get_bits(gb, 8); /* colour_primaries */ sps->color_trc = get_bits(gb, 8); /* transfer_characteristics */ sps->colorspace = get_bits(gb, 8); /* matrix_coefficients */ - if (sps->color_primaries >= AVCOL_PRI_NB) + + // Set invalid values to "unspecified" + if (!av_color_primaries_name(sps->color_primaries)) sps->color_primaries = AVCOL_PRI_UNSPECIFIED; - if (sps->color_trc >= AVCOL_TRC_NB) + if (!av_color_transfer_name(sps->color_trc)) sps->color_trc = AVCOL_TRC_UNSPECIFIED; - if (sps->colorspace >= AVCOL_SPC_NB) + if (!av_color_space_name(sps->colorspace)) sps->colorspace = AVCOL_SPC_UNSPECIFIED; } } diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index c28e86b..2471907 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -497,11 +497,11 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx, vui->matrix_coeffs = get_bits(gb, 8); // Set invalid values to "unspecified" - if (vui->colour_primaries >= AVCOL_PRI_NB) + if (!av_color_primaries_name(vui->colour_primaries)) vui->colour_primaries = AVCOL_PRI_UNSPECIFIED; - if (vui->transfer_characteristic >= AVCOL_TRC_NB) + if (!av_color_transfer_name(vui->transfer_characteristic)) vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED; - if (vui->matrix_coeffs >= AVCOL_SPC_NB) + if (!av_color_space_name(vui->matrix_coeffs)) vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED; } } -- 2.10.0 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
