cbs_av1: Remove constraint on MDCV luminance values

While desiring min to be less than max feels entirely sensible,
unfortunately the standard does not actually have this requirement.
release/6.0
Mark Thompson 2 years ago
parent 20b96494de
commit aaa49a7a42
  1. 7
      libavcodec/cbs_av1_syntax_template.c

@ -1862,11 +1862,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw,
fb(16, white_point_chromaticity_x); fb(16, white_point_chromaticity_x);
fb(16, white_point_chromaticity_y); fb(16, white_point_chromaticity_y);
fc(32, luminance_max, 1, MAX_UINT_BITS(32)); fb(32, luminance_max);
// luminance_min must be lower than luminance_max. Convert luminance_max from fb(32, luminance_min);
// 24.8 fixed point to 18.14 fixed point in order to compare them.
fc(32, luminance_min, 0, FFMIN(((uint64_t)current->luminance_max << 6) - 1,
MAX_UINT_BITS(32)));
return 0; return 0;
} }

Loading…
Cancel
Save