[FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266_syntax_template: Don't use uninitialized value

[FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266_syntax_template: Don't use uninitialized value

[Andreas Rheinhardt]

Probably a typo. Fixes a warning from Clang.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.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 863fecdefa..56e1205337 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -1059,7 +1059,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw,
             if (current->sps_pic_width_max_in_luma_samples > ctb_size_y)
                 ubs(wlen, sps_subpic_width_minus1[0], 1, 0);
             else
-                infer(sps_subpic_width_minus1[i], tmp_width_val - 1);
+                infer(sps_subpic_width_minus1[0], tmp_width_val - 1);
             if (current->sps_pic_height_max_in_luma_samples > ctb_size_y)
                 ubs(hlen, sps_subpic_height_minus1[0], 1, 0);
             else
-- 
2.34.1

_______________________________________________
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_syntax_template: Remove set-but-unused variable

[Andreas Rheinhardt]

Reported by Clang.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Maybe this was meant to be used?

 libavcodec/cbs_h266_syntax_template.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index 56e1205337..a329b7f9ed 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -1711,7 +1711,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
     pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
         current->pps_pic_height_in_luma_samples,(sps->sps_log2_ctu_size_minus5 + 5));
     if (!current->pps_no_pic_partition_flag) {
-        unsigned int exp_tile_width = 0, exp_tile_height = 0;
+        unsigned int exp_tile_width = 0;
         unsigned int unified_size, remaining_size;
 
         u(2, pps_log2_ctu_size_minus5,
@@ -1729,7 +1729,6 @@ 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);
-            exp_tile_height += current->pps_tile_row_height_minus1[i] + 1;
         }
 
         remaining_size = pic_width_in_ctbs_y;
-- 
2.34.1

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

Re: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_h266_syntax_template: Remove set-but-unused variable

[Nuo Mi]

On Sat, Jul 1, 2023 at 5:33 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Reported by Clang.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> Maybe this was meant to be used?
>
>  libavcodec/cbs_h266_syntax_template.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/libavcodec/cbs_h266_syntax_template.c
> b/libavcodec/cbs_h266_syntax_template.c
> index 56e1205337..a329b7f9ed 100644
> --- a/libavcodec/cbs_h266_syntax_template.c
> +++ b/libavcodec/cbs_h266_syntax_template.c
> @@ -1711,7 +1711,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx,
> RWContext *rw,
>      pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
>
>  current->pps_pic_height_in_luma_samples,(sps->sps_log2_ctu_size_minus5 +
> 5));
>      if (!current->pps_no_pic_partition_flag) {
> -        unsigned int exp_tile_width = 0, exp_tile_height = 0;
> +        unsigned int exp_tile_width = 0;
>          unsigned int unified_size, remaining_size;
>
>          u(2, pps_log2_ctu_size_minus5,
> @@ -1729,7 +1729,6 @@ 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);
> -            exp_tile_height += current->pps_tile_row_height_minus1[i] + 1;
>          }
>
>          remaining_size = pic_width_in_ctbs_y;
>
The original patch
https://ffmpeg.org/pipermail/ffmpeg-devel/2021-January/274535.html  is
"remaining_size
= pic_height_in_ctbs_y - exp_tile_height;"
Not sure we removed exp_tile_height.

-- 
> 2.34.1
>
> _______________________________________________
> 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 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 3/3] avcodec/cbs_h266_syntax_template: Avoid shadowing

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_h266_syntax_template.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index a329b7f9ed..646cd94413 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -514,9 +514,9 @@ static int FUNC(ref_pic_lists) (CodedBitstreamContext *ctx, RWContext *rw,
         ref_list = &current->rpl_ref_list[i];
 
         num_ltrp_entries = 0;
-        for (int i = 0; i < ref_list->num_ref_entries; i++) {
-            if (!ref_list->inter_layer_ref_pic_flag[i]) {
-                if (!ref_list->st_ref_pic_flag[i]) {
+        for (int k = 0; k < ref_list->num_ref_entries; k++) {
+            if (!ref_list->inter_layer_ref_pic_flag[k]) {
+                if (!ref_list->st_ref_pic_flag[k]) {
                     num_ltrp_entries++;
                 }
             }
-- 
2.34.1

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

Re: [FFmpeg-devel] [PATCH 3/3] avcodec/cbs_h266_syntax_template: Avoid shadowing

[Nuo Mi]

On Sat, Jul 1, 2023 at 6:07 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/cbs_h266_syntax_template.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/cbs_h266_syntax_template.c
> b/libavcodec/cbs_h266_syntax_template.c
> index a329b7f9ed..646cd94413 100644
> --- a/libavcodec/cbs_h266_syntax_template.c
> +++ b/libavcodec/cbs_h266_syntax_template.c
> @@ -514,9 +514,9 @@ static int FUNC(ref_pic_lists) (CodedBitstreamContext
> *ctx, RWContext *rw,
>          ref_list = &current->rpl_ref_list[i];
>
>          num_ltrp_entries = 0;
> -        for (int i = 0; i < ref_list->num_ref_entries; i++) {
> -            if (!ref_list->inter_layer_ref_pic_flag[i]) {
> -                if (!ref_list->st_ref_pic_flag[i]) {
> +        for (int k = 0; k < ref_list->num_ref_entries; k++) {
> +            if (!ref_list->inter_layer_ref_pic_flag[k]) {
> +                if (!ref_list->st_ref_pic_flag[k]) {
>                      num_ltrp_entries++;
>                  }
>              }
> --
> 2.34.1
>
> _______________________________________________
> 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".
>
:) LGTM
_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h266_syntax_template: Don't use uninitialized value

[Nuo Mi]

On Sat, Jul 1, 2023 at 5:31 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Probably a typo. Fixes a warning from Clang.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.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 863fecdefa..56e1205337 100644
> --- a/libavcodec/cbs_h266_syntax_template.c
> +++ b/libavcodec/cbs_h266_syntax_template.c
> @@ -1059,7 +1059,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx,
> RWContext *rw,
>              if (current->sps_pic_width_max_in_luma_samples > ctb_size_y)
>                  ubs(wlen, sps_subpic_width_minus1[0], 1, 0);
>              else
> -                infer(sps_subpic_width_minus1[i], tmp_width_val - 1);
> +                infer(sps_subpic_width_minus1[0], tmp_width_val - 1);
>              if (current->sps_pic_height_max_in_luma_samples > ctb_size_y)
>                  ubs(hlen, sps_subpic_height_minus1[0], 1, 0);
>              else
> --
> 2.34.1
>
> _______________________________________________
> 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".

LGTM.
It's a typo,  fixed at
https://github.com/ffvvc/FFmpeg/blob/cd27af258d2832706b6831cc3840dd69ddeeb4b5/libavcodec/cbs_h266_syntax_template.c#L1063
It may have some other misc fixes. I will send them out later.
_______________________________________________
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".