[FFmpeg-devel] [PATCH 1/4] lavc/vvc_parser: Remove max_b_frames setting

[FFmpeg-devel] [PATCH 1/4] lavc/vvc_parser: Remove max_b_frames setting

[Jun Zhao]

From: Jun Zhao <mypopydev@gmail.com>

We don't used the max_b_frames field in decoder normally

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavcodec/vvc_parser.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
index e3501fa139..a0e10e1a7c 100644
--- a/libavcodec/vvc_parser.c
+++ b/libavcodec/vvc_parser.c
@@ -187,7 +187,6 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx,
 
     avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 :
                            sps->sps_max_sublayers_minus1;
-    avctx->max_b_frames = sps->sps_max_sublayers_minus1;
 
     if (sps->sps_ptl_dpb_hrd_params_present_flag &&
         sps->sps_timing_hrd_params_present_flag) {
-- 
2.25.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/4] lavc/libxevd: Fixed the has_b_frames setting

[Jun Zhao]

From: Jun Zhao <mypopydev@gmail.com>

has_b_frames used in decoder for size of the frame
reordering buffer, and we don't used the max_b_frames
in decoder.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavcodec/libxevd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c
index c6c7327e65..479d9be046 100644
--- a/libavcodec/libxevd.c
+++ b/libavcodec/libxevd.c
@@ -170,14 +170,12 @@ static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx)
     }
 
     // the function returns sps->num_reorder_pics
-    ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size);
+    ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->has_b_frames, &size);
     if (XEVD_FAILED(ret)) {
         av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n");
         return AVERROR_EXTERNAL;
     }
 
-    avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0;
-
     return 0;
 }
 
-- 
2.25.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 3/4] lavc/vvc_parser: Fixed the has_b_frames setting

[Jun Zhao]

From: Jun Zhao <mypopydev@gmail.com>

has_b_frames used in decoder for size of the frame reordering
buffer, setting this field from dpb_max_num_reorder_pics.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavcodec/vvc_parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
index a0e10e1a7c..5373875aae 100644
--- a/libavcodec/vvc_parser.c
+++ b/libavcodec/vvc_parser.c
@@ -185,8 +185,8 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx,
     avctx->color_range =
         sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
 
-    avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 :
-                           sps->sps_max_sublayers_minus1;
+    avctx->has_b_frames =
+        sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1];
 
     if (sps->sps_ptl_dpb_hrd_params_present_flag &&
         sps->sps_timing_hrd_params_present_flag) {
-- 
2.25.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/4] lavc/vvc_parser: Fixed the has_b_frames setting

[Nuo Mi]

On Fri, Apr 19, 2024 at 9:55 PM Jun Zhao <mypopy@gmail.com> wrote:

> From: Jun Zhao <mypopydev@gmail.com>
>
> has_b_frames used in decoder for size of the frame reordering
> buffer, setting this field from dpb_max_num_reorder_pics.
>
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  libavcodec/vvc_parser.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
> index a0e10e1a7c..5373875aae 100644
> --- a/libavcodec/vvc_parser.c
> +++ b/libavcodec/vvc_parser.c
> @@ -185,8 +185,8 @@ static void set_parser_ctx(AVCodecParserContext *s,
> AVCodecContext *avctx,
>      avctx->color_range =
>          sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG :
> AVCOL_RANGE_MPEG;
>
> -    avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 :
> -                           sps->sps_max_sublayers_minus1;
> +    avctx->has_b_frames =
> +
> sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1];
>
Should we relocate this to the decoder? Other codecs typically set this
parameter in the decoder.

thank you

>
>      if (sps->sps_ptl_dpb_hrd_params_present_flag &&
>          sps->sps_timing_hrd_params_present_flag) {
> --
> 2.25.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".

Re: [FFmpeg-devel] [PATCH 3/4] lavc/vvc_parser: Fixed the has_b_frames setting

[mypopy]

On Sat, Apr 20, 2024 at 11:50 AM Nuo Mi <nuomi2021@gmail.com> wrote:
>
> On Fri, Apr 19, 2024 at 9:55 PM Jun Zhao <mypopy@gmail.com> wrote:
>
> > From: Jun Zhao <mypopydev@gmail.com>
> >
> > has_b_frames used in decoder for size of the frame reordering
> > buffer, setting this field from dpb_max_num_reorder_pics.
> >
> > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > ---
> >  libavcodec/vvc_parser.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
> > index a0e10e1a7c..5373875aae 100644
> > --- a/libavcodec/vvc_parser.c
> > +++ b/libavcodec/vvc_parser.c
> > @@ -185,8 +185,8 @@ static void set_parser_ctx(AVCodecParserContext *s,
> > AVCodecContext *avctx,
> >      avctx->color_range =
> >          sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG :
> > AVCOL_RANGE_MPEG;
> >
> > -    avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 :
> > -                           sps->sps_max_sublayers_minus1;
> > +    avctx->has_b_frames =
> > +
> > sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1];
> >
> Should we relocate this to the decoder? Other codecs typically set this
> parameter in the decoder.
>
I think the part that needs to be refactored is like the 264/265
decoder, but before the refactoring, we need to fix the issue first.
> thank you
>
> >
> >      if (sps->sps_ptl_dpb_hrd_params_present_flag &&
> >          sps->sps_timing_hrd_params_present_flag) {
> > --
> > 2.25.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/4] lavc/vvc_parser: Fixed the has_b_frames setting

[Nuo Mi]

On Sun, Apr 21, 2024 at 10:51 AM mypopy@gmail.com <mypopy@gmail.com> wrote:

> On Sat, Apr 20, 2024 at 11:50 AM Nuo Mi <nuomi2021@gmail.com> wrote:
> >
> > On Fri, Apr 19, 2024 at 9:55 PM Jun Zhao <mypopy@gmail.com> wrote:
> >
> > > From: Jun Zhao <mypopydev@gmail.com>
> > >
> > > has_b_frames used in decoder for size of the frame reordering
> > > buffer, setting this field from dpb_max_num_reorder_pics.
> > >
> > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > > ---
> > >  libavcodec/vvc_parser.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
> > > index a0e10e1a7c..5373875aae 100644
> > > --- a/libavcodec/vvc_parser.c
> > > +++ b/libavcodec/vvc_parser.c
> > > @@ -185,8 +185,8 @@ static void set_parser_ctx(AVCodecParserContext *s,
> > > AVCodecContext *avctx,
> > >      avctx->color_range =
> > >          sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG :
> > > AVCOL_RANGE_MPEG;
> > >
> > > -    avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2
> :
> > > -                           sps->sps_max_sublayers_minus1;
> > > +    avctx->has_b_frames =
> > > +
> > >
> sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1];
> > >
> > Should we relocate this to the decoder? Other codecs typically set this
> > parameter in the decoder.
> >
> I think the part that needs to be refactored is like the 264/265
> decoder, but before the refactoring, we need to fix the issue first.
>
OK, tracked with https://github.com/ffvvc/FFmpeg/issues/217 in case we
forget it

> > thank you
> >
> > >
> > >      if (sps->sps_ptl_dpb_hrd_params_present_flag &&
> > >          sps->sps_timing_hrd_params_present_flag) {
> > > --
> > > 2.25.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 4/4] lavc/vvc/refs: Use dpb_max_num_reorder_pics to control output

[Jun Zhao]

From: Jun Zhao <mypopydev@gmail.com>

Use dpb_max_num_reorder_pics to control output instead of
dpb_max_dec_pic_buffering, when dpb_max_dec_pic_buffering
is much larger than dpb_max_num_reorder_pics, it may cause
dpb overflow error.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Signed-off-by: elinyhuang <elinyhuang@tencent.com>
---
 libavcodec/vvc/refs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c
index a5ee7338d6..6694bc4c51 100644
--- a/libavcodec/vvc/refs.c
+++ b/libavcodec/vvc/refs.c
@@ -226,7 +226,7 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *out, const
 
         /* wait for more frames before output */
         if (!flush && s->seq_output == s->seq_decode && sps &&
-            nb_output <= sps->r->sps_dpb_params.dpb_max_dec_pic_buffering_minus1[sps->r->sps_max_sublayers_minus1] + 1)
+            nb_output <= sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1])
             return 0;
 
         if (nb_output) {
-- 
2.25.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 4/4] lavc/vvc/refs: Use dpb_max_num_reorder_pics to control output

[Nuo Mi]

Hi Barry and Eliny,
LGTM.
Thank you for the patch.
Is it possible to provide the clip so we can add it to our CI?

 ci like https://github.com/ffvvc/FFmpeg/actions


On Fri, Apr 19, 2024 at 9:48 PM Jun Zhao <mypopy@gmail.com> wrote:

> From: Jun Zhao <mypopydev@gmail.com>
>
> Use dpb_max_num_reorder_pics to control output instead of
> dpb_max_dec_pic_buffering, when dpb_max_dec_pic_buffering
> is much larger than dpb_max_num_reorder_pics, it may cause
> dpb overflow error.
>
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> Signed-off-by: elinyhuang <elinyhuang@tencent.com>
> ---
>  libavcodec/vvc/refs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c
> index a5ee7338d6..6694bc4c51 100644
> --- a/libavcodec/vvc/refs.c
> +++ b/libavcodec/vvc/refs.c
> @@ -226,7 +226,7 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext
> *fc, AVFrame *out, const
>
>          /* wait for more frames before output */
>          if (!flush && s->seq_output == s->seq_decode && sps &&
> -            nb_output <=
> sps->r->sps_dpb_params.dpb_max_dec_pic_buffering_minus1[sps->r->sps_max_sublayers_minus1]
> + 1)
> +            nb_output <=
> sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1])
>              return 0;
>
>          if (nb_output) {
> --
> 2.25.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".

Re: [FFmpeg-devel] [PATCH 4/4] lavc/vvc/refs: Use dpb_max_num_reorder_pics to control output

[mypopy]

Send it privately via email


On Sat, Apr 20, 2024 at 11:55 AM Nuo Mi <nuomi2021@gmail.com> wrote:
>
> Hi Barry and Eliny,
> LGTM.
> Thank you for the patch.
> Is it possible to provide the clip so we can add it to our CI?
>
>  ci like https://github.com/ffvvc/FFmpeg/actions
>
>

> On Fri, Apr 19, 2024 at 9:48 PM Jun Zhao <mypopy@gmail.com> wrote:
>
> > From: Jun Zhao <mypopydev@gmail.com>
> >
> > Use dpb_max_num_reorder_pics to control output instead of
> > dpb_max_dec_pic_buffering, when dpb_max_dec_pic_buffering
> > is much larger than dpb_max_num_reorder_pics, it may cause
> > dpb overflow error.
> >
> > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > Signed-off-by: elinyhuang <elinyhuang@tencent.com>
> > ---
> >  libavcodec/vvc/refs.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c
> > index a5ee7338d6..6694bc4c51 100644
> > --- a/libavcodec/vvc/refs.c
> > +++ b/libavcodec/vvc/refs.c
> > @@ -226,7 +226,7 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext
> > *fc, AVFrame *out, const
> >
> >          /* wait for more frames before output */
> >          if (!flush && s->seq_output == s->seq_decode && sps &&
> > -            nb_output <=
> > sps->r->sps_dpb_params.dpb_max_dec_pic_buffering_minus1[sps->r->sps_max_sublayers_minus1]
> > + 1)
> > +            nb_output <=
> > sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1])
> >              return 0;
> >
> >          if (nb_output) {
> > --
> > 2.25.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 4/4] lavc/vvc/refs: Use dpb_max_num_reorder_pics to control output

[Nuo Mi]

Thank you for the clip.
Applied all except the libxevd one

On Sun, Apr 21, 2024 at 10:34 AM mypopy@gmail.com <mypopy@gmail.com> wrote:

> Send it privately via email
>
>
> On Sat, Apr 20, 2024 at 11:55 AM Nuo Mi <nuomi2021@gmail.com> wrote:
> >
> > Hi Barry and Eliny,
> > LGTM.
> > Thank you for the patch.
> > Is it possible to provide the clip so we can add it to our CI?
> >
> >  ci like https://github.com/ffvvc/FFmpeg/actions
> >
> >
>
> > On Fri, Apr 19, 2024 at 9:48 PM Jun Zhao <mypopy@gmail.com> wrote:
> >
> > > From: Jun Zhao <mypopydev@gmail.com>
> > >
> > > Use dpb_max_num_reorder_pics to control output instead of
> > > dpb_max_dec_pic_buffering, when dpb_max_dec_pic_buffering
> > > is much larger than dpb_max_num_reorder_pics, it may cause
> > > dpb overflow error.
> > >
> > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> > > Signed-off-by: elinyhuang <elinyhuang@tencent.com>
> > > ---
> > >  libavcodec/vvc/refs.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c
> > > index a5ee7338d6..6694bc4c51 100644
> > > --- a/libavcodec/vvc/refs.c
> > > +++ b/libavcodec/vvc/refs.c
> > > @@ -226,7 +226,7 @@ int ff_vvc_output_frame(VVCContext *s,
> VVCFrameContext
> > > *fc, AVFrame *out, const
> > >
> > >          /* wait for more frames before output */
> > >          if (!flush && s->seq_output == s->seq_decode && sps &&
> > > -            nb_output <=
> > >
> sps->r->sps_dpb_params.dpb_max_dec_pic_buffering_minus1[sps->r->sps_max_sublayers_minus1]
> > > + 1)
> > > +            nb_output <=
> > >
> sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1])
> > >              return 0;
> > >
> > >          if (nb_output) {
> > > --
> > > 2.25.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".

Re: [FFmpeg-devel] [PATCH 1/4] lavc/vvc_parser: Remove max_b_frames setting

[Nuo Mi]

LGTM

On Fri, Apr 19, 2024 at 9:47 PM Jun Zhao <mypopy@gmail.com> wrote:

> From: Jun Zhao <mypopydev@gmail.com>
>
> We don't used the max_b_frames field in decoder normally
>
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  libavcodec/vvc_parser.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c
> index e3501fa139..a0e10e1a7c 100644
> --- a/libavcodec/vvc_parser.c
> +++ b/libavcodec/vvc_parser.c
> @@ -187,7 +187,6 @@ static void set_parser_ctx(AVCodecParserContext *s,
> AVCodecContext *avctx,
>
>      avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 :
>                             sps->sps_max_sublayers_minus1;
> -    avctx->max_b_frames = sps->sps_max_sublayers_minus1;
>
>      if (sps->sps_ptl_dpb_hrd_params_present_flag &&
>          sps->sps_timing_hrd_params_present_flag) {
> --
> 2.25.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".