[FFmpeg-devel] [PATCH v2 1/2] hevc_ps: fix cpb_cnt_minus1 initialization

[FFmpeg-devel] [PATCH v2 1/2] hevc_ps: fix cpb_cnt_minus1 initialization

[llyyr]

Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb

cpb_cnt used to be initialized to 1 before
fc429d785e9e24c5520ce716d4bc3b5547e581eb so cpb_cnt_minus1 should be
initialized to 0.

Also add +1 to the decode_sublayer_hrd call to account for the change to
the offset
---
 libavcodec/hevc_ps.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index bdd623507d..ac3fe55b07 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -406,8 +406,6 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present,
     for (int i = 0; i < max_sublayers; i++) {
         hdr->flags.fixed_pic_rate_general_flag = get_bits1(gb);
 
-        hdr->cpb_cnt_minus1[i] = 1;
-
         if (!hdr->flags.fixed_pic_rate_general_flag)
             hdr->flags.fixed_pic_rate_within_cvs_flag = get_bits1(gb);
 
@@ -426,11 +424,11 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present,
         }
 
         if (hdr->flags.nal_hrd_parameters_present_flag)
-            decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i], &hdr->nal_params[i],
+            decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i]+1, &hdr->nal_params[i],
                                 hdr->flags.sub_pic_hrd_params_present_flag);
 
         if (hdr->flags.vcl_hrd_parameters_present_flag)
-            decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i], &hdr->vcl_params[i],
+            decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i]+1, &hdr->vcl_params[i],
                                 hdr->flags.sub_pic_hrd_params_present_flag);
     }
 
-- 
2.42.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 2/2] hevc_ps: fix fixed_rate check

[llyyr]

Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb

Since fc429d785e9e24c5520ce716d4bc3b5547e581eb splits the fixed_rate
flag into general and within_cvs, check for both.
---
 libavcodec/hevc_ps.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index ac3fe55b07..7507d2bf9c 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -409,7 +409,8 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present,
         if (!hdr->flags.fixed_pic_rate_general_flag)
             hdr->flags.fixed_pic_rate_within_cvs_flag = get_bits1(gb);
 
-        if (hdr->flags.fixed_pic_rate_within_cvs_flag)
+        if (hdr->flags.fixed_pic_rate_within_cvs_flag ||
+            hdr->flags.fixed_pic_rate_general_flag)
             hdr->elemental_duration_in_tc_minus1[i] = get_ue_golomb_long(gb);
         else
             hdr->flags.low_delay_hrd_flag = get_bits1(gb);
-- 
2.42.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".

Re: [FFmpeg-devel] [PATCH v2 2/2] hevc_ps: fix fixed_rate check

[Lynne]

Sep 10, 2023, 17:26 by llyyr.public@gmail.com:

> Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb
>
> Since fc429d785e9e24c5520ce716d4bc3b5547e581eb splits the fixed_rate
> flag into general and within_cvs, check for both.
> ---
>  libavcodec/hevc_ps.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
> index ac3fe55b07..7507d2bf9c 100644
> --- a/libavcodec/hevc_ps.c
> +++ b/libavcodec/hevc_ps.c
> @@ -409,7 +409,8 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present,
>  if (!hdr->flags.fixed_pic_rate_general_flag)
>  hdr->flags.fixed_pic_rate_within_cvs_flag = get_bits1(gb);
>  
> -        if (hdr->flags.fixed_pic_rate_within_cvs_flag)
> +        if (hdr->flags.fixed_pic_rate_within_cvs_flag ||
> +            hdr->flags.fixed_pic_rate_general_flag)
>  hdr->elemental_duration_in_tc_minus1[i] = get_ue_golomb_long(gb);
>  else
>  hdr->flags.low_delay_hrd_flag = get_bits1(gb);
>

Both patches lgtm
Thanks
_______________________________________________
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 v2 2/2] hevc_ps: fix fixed_rate check

[Derek Buitenhuis]

On 9/10/2023 4:32 PM, Lynne wrote:
> Both patches lgtm

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