From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266: fix use of uninitialized value
Date: Thu, 6 Jul 2023 12:06:07 -0300
Message-ID: <20230706150608.1265-1-jamrial@gmail.com> (raw)
And fix the allowed range for ph_log2_diff_max_bt_min_qt_intra_slice_luma while at it.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/cbs_h266_syntax_template.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index b984a12d8f..f6aae3ac51 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -2730,9 +2730,14 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
0, FFMIN(6, ctb_log2_size_y) - min_cb_log2_size_y);
ue(ph_max_mtt_hierarchy_depth_intra_slice_luma,
0, 2 * (ctb_log2_size_y - min_cb_log2_size_y));
+ min_qt_log2_size_intra_y =
+ current->ph_log2_diff_min_qt_min_cb_intra_slice_luma +
+ min_cb_log2_size_y;
if (current->ph_max_mtt_hierarchy_depth_intra_slice_luma != 0) {
ue(ph_log2_diff_max_bt_min_qt_intra_slice_luma,
- 0, ctb_log2_size_y - min_qt_log2_size_intra_y);
+ 0, (sps->sps_qtbtt_dual_tree_intra_flag ?
+ FFMIN(6, ctb_log2_size_y) :
+ ctb_log2_size_y) - min_qt_log2_size_intra_y);
ue(ph_log2_diff_max_tt_min_qt_intra_slice_luma,
0, FFMIN(6, ctb_log2_size_y) - min_qt_log2_size_intra_y);
} else {
@@ -2780,9 +2785,6 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
sps->sps_log2_diff_max_tt_min_qt_intra_slice_chroma);
}
- min_qt_log2_size_intra_y =
- current->ph_log2_diff_min_qt_min_cb_intra_slice_luma +
- min_cb_log2_size_y;
if (pps->pps_cu_qp_delta_enabled_flag)
ue(ph_cu_qp_delta_subdiv_intra_slice, 0,
2 * (ctb_log2_size_y - min_qt_log2_size_intra_y +
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2023-07-06 15:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 15:06 James Almer [this message]
2023-07-06 15:06 ` [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_h266: use exp_tile_height when checking the allowed range for pps_num_exp_tile_rows_minus1 James Almer
2023-07-06 16:50 ` [FFmpeg-devel] [PATCH v2 1/2] avcodec/cbs_h266: fix use of uninitialized value James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230706150608.1265-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git