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

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

[Fei Wang]

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>
---
1. Tested the patchset with ~1000 different kinds of clips and get a
positive result, without any regression.

 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 fe18ca2b1d..3f8fe1ef18 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -174,21 +174,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) &&
-- 
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 v1 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process

[Fei Wang]

From: Xu Guangxin <guangxin.xu@intel.com>

We will generate a new frame for a missed reference. The frame can only
be used for reference. We assign an invalid decode sequence to it, so
it will not be involved in any dpb process.

Tested-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
---
 libavcodec/hevc_refs.c | 13 ++++++++++++-
 libavcodec/hevcdec.c   |  4 ++--
 libavcodec/hevcdec.h   |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 3f8fe1ef18..3ea2fb6c0b 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -172,8 +172,19 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc)
     return 0;
 }
 
+static void unref_missing_refs(HEVCContext *s)
+{
+    for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+         HEVCFrame *frame = &s->DPB[i];
+         if (frame->sequence == HEVC_DECODE_SEQUENCE_INVALID) {
+             ff_hevc_unref_frame(s, frame, ~0);
+         }
+    }
+}
+
 int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
 {
+    unref_missing_refs(s);
     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++) {
@@ -418,7 +429,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc)
     }
 
     frame->poc      = poc;
-    frame->sequence = s->seq_decode;
+    frame->sequence = HEVC_DECODE_SEQUENCE_INVALID;
     frame->flags    = 0;
 
     if (s->threads_type == FF_THREAD_FRAME)
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index f782ea6394..99785aa5d1 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -569,7 +569,7 @@ static int hls_slice_header(HEVCContext *s)
     }
 
     if ((IS_IDR(s) || IS_BLA(s)) && sh->first_slice_in_pic_flag) {
-        s->seq_decode = (s->seq_decode + 1) & 0xff;
+        s->seq_decode = (s->seq_decode + 1) & HEVC_DECODE_SEQUENCE_MASK;
         s->max_ra     = INT_MAX;
         if (IS_IDR(s))
             ff_hevc_clear_refs(s);
@@ -614,7 +614,7 @@ static int hls_slice_header(HEVCContext *s)
             return pix_fmt;
         s->avctx->pix_fmt = pix_fmt;
 
-        s->seq_decode = (s->seq_decode + 1) & 0xff;
+        s->seq_decode = (s->seq_decode + 1) & HEVC_DECODE_SEQUENCE_MASK;
         s->max_ra     = INT_MAX;
     }
 
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index de861b88b3..9c8bcefb48 100644
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -390,6 +390,9 @@ typedef struct DBParams {
 #define HEVC_FRAME_FLAG_LONG_REF  (1 << 2)
 #define HEVC_FRAME_FLAG_BUMPING   (1 << 3)
 
+#define HEVC_DECODE_SEQUENCE_MASK 0xff
+#define HEVC_DECODE_SEQUENCE_INVALID (HEVC_DECODE_SEQUENCE_MASK + 1)
+
 typedef struct HEVCFrame {
     AVFrame *frame;
     AVFrame *frame_grain;
-- 
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 v1 3/4] lavc/hevc_refs: exclude current frame from long term refs

[Fei Wang]

From: Xu Guangxin <guangxin.xu@intel.com>

suppose
a. You have 3 frames, 0, 1, 4096.
b. The ltMask is 0xfff and use_msb is 0.
c. The 0, 1 are lt refs for 4096.
d. you are decoding frame 4096, and get the 0 frame.
Since 4096 & ltMask is 0 too, even you want get 0, find_ref_idx may give you 4096.
add_candidate_ref will report an error for this

Tested-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
---
 libavcodec/hevc_refs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 3ea2fb6c0b..7b106e31d7 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -387,7 +387,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, uint8_t use_msb)
     for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
         HEVCFrame *ref = &s->DPB[i];
         if (ref->frame->buf[0] && ref->sequence == s->seq_decode) {
-            if ((ref->poc & mask) == poc)
+            if ((ref->poc & mask) == poc && (use_msb || ref->poc != s->poc))
                 return ref;
         }
     }
-- 
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 v1 4/4] lavc/hevcdec: respect the value of no_output_of_prior_pics_flag

[Fei Wang]

From: Xu Guangxin <guangxin.xu@intel.com>

Even resolution or number of picture stores changes, we still need
follow no_output_of_prior_pics_flag in next IDR.

Tested-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
---
 libavcodec/hevcdec.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 99785aa5d1..b0317339a2 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -594,15 +594,8 @@ static int hls_slice_header(HEVCContext *s)
 
     if (s->ps.sps != (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data) {
         const HEVCSPS *sps = (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data;
-        const HEVCSPS *last_sps = s->ps.sps;
         enum AVPixelFormat pix_fmt;
 
-        if (last_sps && IS_IRAP(s) && s->nal_unit_type != HEVC_NAL_CRA_NUT) {
-            if (sps->width != last_sps->width || sps->height != last_sps->height ||
-                sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering !=
-                last_sps->temporal_layer[last_sps->max_sub_layers - 1].max_dec_pic_buffering)
-                sh->no_output_of_prior_pics_flag = 0;
-        }
         ff_hevc_clear_refs(s);
 
         ret = set_sps(s, sps, sps->pix_fmt);
-- 
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 v1 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1613 bytes --]

On Tue, Jun 07, 2022 at 03:08:28PM +0800, Fei Wang wrote:
> From: Xu Guangxin <guangxin.xu@intel.com>
> 
> We will generate a new frame for a missed reference. The frame can only
> be used for reference. We assign an invalid decode sequence to it, so
> it will not be involved in any dpb process.
> 
> Tested-by: Fei Wang <fei.w.wang@intel.com>
> Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> ---
>  libavcodec/hevc_refs.c | 13 ++++++++++++-
>  libavcodec/hevcdec.c   |  4 ++--
>  libavcodec/hevcdec.h   |  3 +++
>  3 files changed, 17 insertions(+), 3 deletions(-)

This causes segfaults

Thread 9 "ffmpeg_g" received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7fffcc5ad700 (LWP 14108)]
0x00005555564b88c0 in ff_emu_edge_vfix19_sse ()
(gdb) bt
#0  0x00005555564b88c0 in ff_emu_edge_vfix19_sse ()
#1  0x00005555561c515c in emulated_edge_mc_avx2 ()
#2  0x0000555555d21bc8 in hls_prediction_unit.isra ()
#3  0x0000555555d2420b in hls_coding_quadtree ()
#4  0x0000555555d2338d in hls_coding_quadtree ()
#5  0x0000555555d25371 in hls_decode_entry ()
#6  0x0000555555bd77e5 in avcodec_default_execute ()
#7  0x0000555555d2a00f in hevc_decode_frame ()
#8  0x0000555555edc5a3 in frame_worker_thread ()
#9  0x00007ffff75fc6db in start_thread (arg=0x7fffcc5ad700) at pthread_create.c:463
#10 0x00007fffed17061f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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 v1 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process

[Wang, Fei W]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Michael Niedermayer
> Sent: Tuesday, June 7, 2022 8:07 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v1 2/4] lavc/hevcdec: do not let missing ref
> frames invovled in dpb process
> 
> On Tue, Jun 07, 2022 at 03:08:28PM +0800, Fei Wang wrote:
> > From: Xu Guangxin <guangxin.xu@intel.com>
> >
> > We will generate a new frame for a missed reference. The frame can
> > only be used for reference. We assign an invalid decode sequence to
> > it, so it will not be involved in any dpb process.
> >
> > Tested-by: Fei Wang <fei.w.wang@intel.com>
> > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > ---
> >  libavcodec/hevc_refs.c | 13 ++++++++++++-
> >  libavcodec/hevcdec.c   |  4 ++--
> >  libavcodec/hevcdec.h   |  3 +++
> >  3 files changed, 17 insertions(+), 3 deletions(-)
> 
> This causes segfaults

Thanks Michael, could you share your clip to me? I can't reproduce this with all my clips.

Thanks
Fei

> 
> Thread 9 "ffmpeg_g" received signal SIGSEGV, Segmentation fault.
> [Switching to Thread 0x7fffcc5ad700 (LWP 14108)]
> 0x00005555564b88c0 in ff_emu_edge_vfix19_sse ()
> (gdb) bt
> #0  0x00005555564b88c0 in ff_emu_edge_vfix19_sse ()
> #1  0x00005555561c515c in emulated_edge_mc_avx2 ()
> #2  0x0000555555d21bc8 in hls_prediction_unit.isra ()
> #3  0x0000555555d2420b in hls_coding_quadtree ()
> #4  0x0000555555d2338d in hls_coding_quadtree ()
> #5  0x0000555555d25371 in hls_decode_entry ()
> #6  0x0000555555bd77e5 in avcodec_default_execute ()
> #7  0x0000555555d2a00f in hevc_decode_frame ()
> #8  0x0000555555edc5a3 in frame_worker_thread ()
> #9  0x00007ffff75fc6db in start_thread (arg=0x7fffcc5ad700) at
> pthread_create.c:463
> #10 0x00007fffed17061f in clone ()
> at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
> 
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> 
> I do not agree with what you have to say, but I'll defend to the death your right
> to say it. -- Voltaire
_______________________________________________
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 v1 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1474 bytes --]

On Thu, Jun 09, 2022 at 05:34:47AM +0000, Wang, Fei W wrote:
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> > Michael Niedermayer
> > Sent: Tuesday, June 7, 2022 8:07 PM
> > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> > Subject: Re: [FFmpeg-devel] [PATCH v1 2/4] lavc/hevcdec: do not let missing ref
> > frames invovled in dpb process
> > 
> > On Tue, Jun 07, 2022 at 03:08:28PM +0800, Fei Wang wrote:
> > > From: Xu Guangxin <guangxin.xu@intel.com>
> > >
> > > We will generate a new frame for a missed reference. The frame can
> > > only be used for reference. We assign an invalid decode sequence to
> > > it, so it will not be involved in any dpb process.
> > >
> > > Tested-by: Fei Wang <fei.w.wang@intel.com>
> > > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > > ---
> > >  libavcodec/hevc_refs.c | 13 ++++++++++++-
> > >  libavcodec/hevcdec.c   |  4 ++--
> > >  libavcodec/hevcdec.h   |  3 +++
> > >  3 files changed, 17 insertions(+), 3 deletions(-)
> > 
> > This causes segfaults
> 
> Thanks Michael, could you share your clip to me? I can't reproduce this with all my clips.

file sent by private mail

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The smallest minority on earth is the individual. Those who deny 
individual rights cannot claim to be defenders of minorities. - Ayn Rand

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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 v1 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process

[Wang, Fei W]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Michael Niedermayer
> Sent: Thursday, June 9, 2022 10:05 PM
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v1 2/4] lavc/hevcdec: do not let missing ref
> frames invovled in dpb process
> 
> On Thu, Jun 09, 2022 at 05:34:47AM +0000, Wang, Fei W wrote:
> > > -----Original Message-----
> > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> > > Michael Niedermayer
> > > Sent: Tuesday, June 7, 2022 8:07 PM
> > > To: FFmpeg development discussions and patches
> > > <ffmpeg-devel@ffmpeg.org>
> > > Subject: Re: [FFmpeg-devel] [PATCH v1 2/4] lavc/hevcdec: do not let
> > > missing ref frames invovled in dpb process
> > >
> > > On Tue, Jun 07, 2022 at 03:08:28PM +0800, Fei Wang wrote:
> > > > From: Xu Guangxin <guangxin.xu@intel.com>
> > > >
> > > > We will generate a new frame for a missed reference. The frame can
> > > > only be used for reference. We assign an invalid decode sequence
> > > > to it, so it will not be involved in any dpb process.
> > > >
> > > > Tested-by: Fei Wang <fei.w.wang@intel.com>
> > > > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > > > ---
> > > >  libavcodec/hevc_refs.c | 13 ++++++++++++-
> > > >  libavcodec/hevcdec.c   |  4 ++--
> > > >  libavcodec/hevcdec.h   |  3 +++
> > > >  3 files changed, 17 insertions(+), 3 deletions(-)
> > >
> > > This causes segfaults
> >
> > Thanks Michael, could you share your clip to me? I can't reproduce this with all
> my clips.
> 
> file sent by private mail

Fixed in V2.

Thanks
Fei

> 
> thx
> 
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> 
> The smallest minority on earth is the individual. Those who deny individual rights
> cannot claim to be defenders of minorities. - Ayn Rand
_______________________________________________
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".