[FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266: fix use of uninitialized value

[FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266: fix use of uninitialized value

[James Almer]

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".

[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]

Fixes warnings about variable set but not used.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/cbs_h266_syntax_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index f6aae3ac51..97ca6fd32b 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -1845,7 +1845,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
         }
         for (i = 0; i <= current->pps_num_exp_tile_rows_minus1; i++) {
             ues(pps_tile_row_height_minus1[i],
-                0, pic_height_in_ctbs_y - 1, 1, i);
+                0, pic_height_in_ctbs_y - exp_tile_height - 1, 1, i);
             exp_tile_height += current->pps_tile_row_height_minus1[i] + 1;
         }
 
-- 
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".

[FFmpeg-devel] [PATCH v2 1/2] avcodec/cbs_h266: fix use of uninitialized value

[James Almer]

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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index b984a12d8f..29eb9b70ed 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 {
-- 
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".