diff options
| author | Nuo Mi <nuomi2021@gmail.com> | 2024-11-23 17:32:34 +0800 |
|---|---|---|
| committer | Nuo Mi <nuomi2021@gmail.com> | 2024-11-30 09:58:59 +0800 |
| commit | 98698ed3c24bfd0b1e6e6db943b5f25f6046cee7 (patch) | |
| tree | d6b2fe6a2059d67a22f7e511046e76aea6296f5f | |
| parent | e06515b092225f7d954aa64aedde98df097515ee (diff) | |
| download | ffmpeg-98698ed3c24bfd0b1e6e6db943b5f25f6046cee7.tar.gz | |
avcodec/cbs_h266: stricter validation for subpicture's max width and height
Co-authored-by: Frank Plowman <post@frankplowman.com>
| -rw-r--r-- | libavcodec/cbs_h266_syntax_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index fd42734166..43def9220f 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1147,11 +1147,11 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, infer(sps_subpic_ctu_top_left_x[0], 0); infer(sps_subpic_ctu_top_left_y[0], 0); if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) - ubs(wlen, sps_subpic_width_minus1[0], 1, 0); + us(wlen, sps_subpic_width_minus1[0], 0, max_width_minus1, 1, 0); else infer(sps_subpic_width_minus1[0], max_width_minus1); if (current->sps_pic_height_max_in_luma_samples > ctb_size_y) - ubs(hlen, sps_subpic_height_minus1[0], 1, 0); + us(hlen, sps_subpic_height_minus1[0], 0, max_width_minus1, 1, 0); else infer(sps_subpic_height_minus1[0], max_height_minus1); if (!current->sps_independent_subpics_flag) { @@ -1201,14 +1201,14 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, if (i < current->sps_num_subpics_minus1 && current->sps_pic_width_max_in_luma_samples > ctb_size_y) { - us(wlen, sps_subpic_width_minus1[i], min_width, MAX_UINT_BITS(wlen), 1, i); + us(wlen, sps_subpic_width_minus1[i], min_width, max_width_minus1, 1, i); } else { infer(sps_subpic_width_minus1[i], max_width_minus1); } if (i < current->sps_num_subpics_minus1 && current->sps_pic_height_max_in_luma_samples > ctb_size_y) { - us(hlen, sps_subpic_height_minus1[i], min_height, MAX_UINT_BITS(hlen), 1, i); + us(hlen, sps_subpic_height_minus1[i], min_height, max_height_minus1, 1, i); } else { infer(sps_subpic_height_minus1[i], max_height_minus1); } |