From 88b65bed9ca033818f5618885c8a3d26d61a7c8a Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Fri, 1 Jan 2021 21:35:14 +0000 Subject: [PATCH] cbs_sei: Remove restrictions on MDCV values Since this was originally written the standards have changed to allow arbitrary values here, but leaves their meaning unspecified. --- libavcodec/cbs_sei_syntax_template.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c index 5f84246663..9114e61ff6 100644 --- a/libavcodec/cbs_sei_syntax_template.c +++ b/libavcodec/cbs_sei_syntax_template.c @@ -103,17 +103,15 @@ static int FUNC(mastering_display_colour_volume) HEADER("Mastering Display Colour Volume"); for (c = 0; c < 3; c++) { - us(16, display_primaries_x[c], 0, 50000, 1, c); - us(16, display_primaries_y[c], 0, 50000, 1, c); + ubs(16, display_primaries_x[c], 1, c); + ubs(16, display_primaries_y[c], 1, c); } - u(16, white_point_x, 0, 50000); - u(16, white_point_y, 0, 50000); + ub(16, white_point_x); + ub(16, white_point_y); - u(32, max_display_mastering_luminance, - 1, MAX_UINT_BITS(32)); - u(32, min_display_mastering_luminance, - 0, current->max_display_mastering_luminance - 1); + ub(32, max_display_mastering_luminance); + ub(32, min_display_mastering_luminance); return 0; }