mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-18 21:45:10 +00:00
lavc/vvc: Use second definition of MinQtLog2SizeIntraC if relevant
MinQtLog2SizeIntraC is usually (eq. (51) from VVCv3) defined as sps_log2_diff_min_qt_min_cb_intra_slice_chroma + MinCbLog2SizeY However, in the case ph_log2_diff_min_qt_min_cb_intra_slice_chroma is present, it is instead (eq. (83) from VVCv3) defined as ph_log2_diff_min_qt_min_cb_intra_slice_chroma + MinCbLog2SizeY When ph_log2_diff_max_bt_min_qt_intra_slice_chroma and ph_log2_diff_max_tt_min_qt_intra_slice_chroma are present, so is ph_log2_diff_min_qt_min_cb_intra_slice_chroma, and so we should use the second definition of MinQtLog2SizeIntraC, rather than the first, when calculating the bounds for these syntax elements. Signed-off-by: Frank Plowman <post@frankplowman.com>
This commit is contained in:
parent
a280e2e646
commit
9221cb0443
@ -2812,7 +2812,7 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
|
||||
0, 2 * (ctb_log2_size_y - min_cb_log2_size_y));
|
||||
if (sps->sps_max_mtt_hierarchy_depth_intra_slice_chroma != 0) {
|
||||
unsigned int min_qt_log2_size_intra_c =
|
||||
sps->sps_log2_diff_min_qt_min_cb_intra_slice_chroma +
|
||||
current->ph_log2_diff_min_qt_min_cb_intra_slice_chroma +
|
||||
min_cb_log2_size_y;
|
||||
ue(ph_log2_diff_max_bt_min_qt_intra_slice_chroma,
|
||||
0, FFMIN(6, ctb_log2_size_y) - min_qt_log2_size_intra_c);
|
||||
|
Loading…
Reference in New Issue
Block a user