diff mbox series

[FFmpeg-devel,v3,1/4] lavc/hevc_refs: fix dpb logical for IRAP

Message ID 20220715050644.879488-1-fei.w.wang@intel.com
State New
Headers show
Series [FFmpeg-devel,v3,1/4] lavc/hevc_refs: fix dpb logical for IRAP | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Wang, Fei W July 15, 2022, 5:06 a.m. UTC 
From: Xu Guangxin <guangxin.xu@intel.com>

According to C.5.2.2, item 2. When we got an IRAP, and the
NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.

Tested-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
---
update:
1. clean and replace 0xff with HEVC_SEQUENCE_COUNTER_MASK

 libavcodec/hevc_refs.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

Comments

Xiang, Haihao July 18, 2022, 9:09 a.m. UTC | #1 
On Fri, 2022-07-15 at 13:06 +0800, Fei Wang wrote:
> From: Xu Guangxin <guangxin.xu@intel.com>
> 
> According to C.5.2.2, item 2. When we got an IRAP, and the
> NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.
> 
> Tested-by: Fei Wang <fei.w.wang@intel.com>
> Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> ---
> update:
> 1. clean and replace 0xff with HEVC_SEQUENCE_COUNTER_MASK
> 
>  libavcodec/hevc_refs.c | 23 +++++++++++++----------
>  1 file changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
> index 6a70c817b0..2b0468d6c4 100644
> --- a/libavcodec/hevc_refs.c
> +++ b/libavcodec/hevc_refs.c
> @@ -175,21 +175,24 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame,
> int poc)
>  
>  int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
>  {
> +    if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
> +        const static int mask = HEVC_FRAME_FLAG_BUMPING |
> HEVC_FRAME_FLAG_OUTPUT;
> +        for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> +            HEVCFrame *frame = &s->DPB[i];
> +            if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
> +                frame->sequence != s->seq_decode) {
> +                if (s->sh.no_output_of_prior_pics_flag == 1)
> +                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> +                else
> +                    frame->flags |= HEVC_FRAME_FLAG_BUMPING;
> +            }
> +        }
> +    }
>      do {
>          int nb_output = 0;
>          int min_poc   = INT_MAX;
>          int i, min_idx, ret;
>  
> -        if (s->sh.no_output_of_prior_pics_flag == 1 && s->no_rasl_output_flag 
> == 1) {
> -            for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> -                HEVCFrame *frame = &s->DPB[i];
> -                if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc
> != s->poc &&
> -                        frame->sequence == s->seq_output) {
> -                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> -                }
> -            }
> -        }
> -
>          for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
>              HEVCFrame *frame = &s->DPB[i];
>              if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&

Patchset LGTM. 

-Haihao
Xiang, Haihao July 25, 2022, 5:22 a.m. UTC | #2 
On Mon, 2022-07-18 at 09:09 +0000, Xiang, Haihao wrote:
> On Fri, 2022-07-15 at 13:06 +0800, Fei Wang wrote:
> > From: Xu Guangxin <guangxin.xu@intel.com>
> > 
> > According to C.5.2.2, item 2. When we got an IRAP, and the
> > NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.
> > 
> > Tested-by: Fei Wang <fei.w.wang@intel.com>
> > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > ---
> > update:
> > 1. clean and replace 0xff with HEVC_SEQUENCE_COUNTER_MASK
> > 
> >  libavcodec/hevc_refs.c | 23 +++++++++++++----------
> >  1 file changed, 13 insertions(+), 10 deletions(-)
> > 
> > diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
> > index 6a70c817b0..2b0468d6c4 100644
> > --- a/libavcodec/hevc_refs.c
> > +++ b/libavcodec/hevc_refs.c
> > @@ -175,21 +175,24 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame
> > **frame,
> > int poc)
> >  
> >  int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
> >  {
> > +    if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
> > +        const static int mask = HEVC_FRAME_FLAG_BUMPING |
> > HEVC_FRAME_FLAG_OUTPUT;
> > +        for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> > +            HEVCFrame *frame = &s->DPB[i];
> > +            if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
> > +                frame->sequence != s->seq_decode) {
> > +                if (s->sh.no_output_of_prior_pics_flag == 1)
> > +                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> > +                else
> > +                    frame->flags |= HEVC_FRAME_FLAG_BUMPING;
> > +            }
> > +        }
> > +    }
> >      do {
> >          int nb_output = 0;
> >          int min_poc   = INT_MAX;
> >          int i, min_idx, ret;
> >  
> > -        if (s->sh.no_output_of_prior_pics_flag == 1 && s-
> > >no_rasl_output_flag 
> > == 1) {
> > -            for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> > -                HEVCFrame *frame = &s->DPB[i];
> > -                if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc
> > != s->poc &&
> > -                        frame->sequence == s->seq_output) {
> > -                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> > -                }
> > -            }
> > -        }
> > -
> >          for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> >              HEVCFrame *frame = &s->DPB[i];
> >              if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&
> 
> Patchset LGTM. 
> 

The patchset works well for me. Are there any more comments here ? If not, I'll
apply this patchset in a few days.

Thanks
Haihao
Xiang, Haihao July 27, 2022, 5:35 a.m. UTC | #3 
On Mon, 2022-07-25 at 05:22 +0000, Xiang, Haihao wrote:
> On Mon, 2022-07-18 at 09:09 +0000, Xiang, Haihao wrote:
> > On Fri, 2022-07-15 at 13:06 +0800, Fei Wang wrote:
> > > From: Xu Guangxin <guangxin.xu@intel.com>
> > > 
> > > According to C.5.2.2, item 2. When we got an IRAP, and the
> > > NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.
> > > 
> > > Tested-by: Fei Wang <fei.w.wang@intel.com>
> > > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > > ---
> > > update:
> > > 1. clean and replace 0xff with HEVC_SEQUENCE_COUNTER_MASK
> > > 
> > >  libavcodec/hevc_refs.c | 23 +++++++++++++----------
> > >  1 file changed, 13 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
> > > index 6a70c817b0..2b0468d6c4 100644
> > > --- a/libavcodec/hevc_refs.c
> > > +++ b/libavcodec/hevc_refs.c
> > > @@ -175,21 +175,24 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame
> > > **frame,
> > > int poc)
> > >  
> > >  int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
> > >  {
> > > +    if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
> > > +        const static int mask = HEVC_FRAME_FLAG_BUMPING |
> > > HEVC_FRAME_FLAG_OUTPUT;
> > > +        for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> > > +            HEVCFrame *frame = &s->DPB[i];
> > > +            if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
> > > +                frame->sequence != s->seq_decode) {
> > > +                if (s->sh.no_output_of_prior_pics_flag == 1)
> > > +                    ff_hevc_unref_frame(s, frame,
> > > HEVC_FRAME_FLAG_OUTPUT);
> > > +                else
> > > +                    frame->flags |= HEVC_FRAME_FLAG_BUMPING;
> > > +            }
> > > +        }
> > > +    }
> > >      do {
> > >          int nb_output = 0;
> > >          int min_poc   = INT_MAX;
> > >          int i, min_idx, ret;
> > >  
> > > -        if (s->sh.no_output_of_prior_pics_flag == 1 && s-
> > > > no_rasl_output_flag 
> > > 
> > > == 1) {
> > > -            for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> > > -                HEVCFrame *frame = &s->DPB[i];
> > > -                if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame-
> > > >poc
> > > != s->poc &&
> > > -                        frame->sequence == s->seq_output) {
> > > -                    ff_hevc_unref_frame(s, frame,
> > > HEVC_FRAME_FLAG_OUTPUT);
> > > -                }
> > > -            }
> > > -        }
> > > -
> > >          for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> > >              HEVCFrame *frame = &s->DPB[i];
> > >              if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&
> > 
> > Patchset LGTM. 
> > 
> 
> The patchset works well for me. Are there any more comments here ? If not,
> I'll
> apply this patchset in a few days.
> 

Applied, thx

-Haihao
diff mbox series

Patch

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 6a70c817b0..2b0468d6c4 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -175,21 +175,24 @@  int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc)
 
 int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
 {
+    if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
+        const static int mask = HEVC_FRAME_FLAG_BUMPING | HEVC_FRAME_FLAG_OUTPUT;
+        for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+            HEVCFrame *frame = &s->DPB[i];
+            if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
+                frame->sequence != s->seq_decode) {
+                if (s->sh.no_output_of_prior_pics_flag == 1)
+                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
+                else
+                    frame->flags |= HEVC_FRAME_FLAG_BUMPING;
+            }
+        }
+    }
     do {
         int nb_output = 0;
         int min_poc   = INT_MAX;
         int i, min_idx, ret;
 
-        if (s->sh.no_output_of_prior_pics_flag == 1 && s->no_rasl_output_flag == 1) {
-            for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
-                HEVCFrame *frame = &s->DPB[i];
-                if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc != s->poc &&
-                        frame->sequence == s->seq_output) {
-                    ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
-                }
-            }
-        }
-
         for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
             HEVCFrame *frame = &s->DPB[i];
             if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&