ffmpeg | branch: release/6.1 | Frank Plowman <p...@frankplowman.com> | Sun Feb 25 22:30:42 2024 +0000| [f9b68bc9a566ff73cd8fead599b22f436599bdeb] | committer: James Almer
lavc/vvc: Read subpic ID when only one subpicture is present Previously, the following syntax elements were not read in the case sps_num_subpics_minus is 0: * sps_subpic_id_len_minus1 * sps_subpic_id_mapping_explicitly_signalled_flag * sps_subpic_id_mapping_present_flag * sps_subpic_id[i] This was causing failures to decode bitstreams, for example the DVB's "VVC HDR UHDTV1 OpenGOP 3840x2160 50fps HLG10 PiP" V&V bitstream. Patch fixes this by moving the reads for these syntax elements out a scope. Signed-off-by: Frank Plowman <p...@frankplowman.com> Signed-off-by: James Almer <jamr...@gmail.com> (cherry picked from commit 8b6219a99d80cabf87c50170c009fe93092e32bd) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9b68bc9a566ff73cd8fead599b22f436599bdeb --- libavcodec/cbs_h266_syntax_template.c | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index ad9dcbc93c..2c9988341b 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1213,30 +1213,30 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, infer(sps_loop_filter_across_subpic_enabled_flag[i], 0); } } - ue(sps_subpic_id_len_minus1, 0, 15); - if ((1 << (current->sps_subpic_id_len_minus1 + 1)) < - current->sps_num_subpics_minus1 + 1) { - av_log(ctx->log_ctx, AV_LOG_ERROR, - "sps_subpic_id_len_minus1(%d) is too small\n", - current->sps_subpic_id_len_minus1); - return AVERROR_INVALIDDATA; - } - flag(sps_subpic_id_mapping_explicitly_signalled_flag); - if (current->sps_subpic_id_mapping_explicitly_signalled_flag) { - flag(sps_subpic_id_mapping_present_flag); - if (current->sps_subpic_id_mapping_present_flag) { - for (i = 0; i <= current->sps_num_subpics_minus1; i++) { - ubs(current->sps_subpic_id_len_minus1 + 1, - sps_subpic_id[i], 1, i); - } - } - } } else { infer(sps_subpic_ctu_top_left_x[0], 0); infer(sps_subpic_ctu_top_left_y[0], 0); infer(sps_subpic_width_minus1[0], tmp_width_val - 1); infer(sps_subpic_height_minus1[0], tmp_height_val - 1); } + ue(sps_subpic_id_len_minus1, 0, 15); + if ((1 << (current->sps_subpic_id_len_minus1 + 1)) < + current->sps_num_subpics_minus1 + 1) { + av_log(ctx->log_ctx, AV_LOG_ERROR, + "sps_subpic_id_len_minus1(%d) is too small\n", + current->sps_subpic_id_len_minus1); + return AVERROR_INVALIDDATA; + } + flag(sps_subpic_id_mapping_explicitly_signalled_flag); + if (current->sps_subpic_id_mapping_explicitly_signalled_flag) { + flag(sps_subpic_id_mapping_present_flag); + if (current->sps_subpic_id_mapping_present_flag) { + for (i = 0; i <= current->sps_num_subpics_minus1; i++) { + ubs(current->sps_subpic_id_len_minus1 + 1, + sps_subpic_id[i], 1, i); + } + } + } } else { infer(sps_num_subpics_minus1, 0); infer(sps_independent_subpics_flag, 1); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
