diff mbox series

[FFmpeg-devel,2/6] avcodec/h264: Use FRAME_RECOVERED_HEURISTIC instead of IDR/SEI

Message ID 20231114172051.13872-2-michael@niedermayer.cc
State Accepted
Commit 68e1cf204aa62141c8e93bfad1787102b06ce594
Headers show
Series [FFmpeg-devel,1/6] avcodec/h264: Seperate SEI and IDR recovery handling | 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

Michael Niedermayer Nov. 14, 2023, 5:20 p.m. UTC 
This keeps IDR/SEI and heuristically detected recovery points cleaner seperated

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/h264_refs.c | 4 ++--
 libavcodec/h264dec.h   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 25e521dafc0..92778e737a5 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -822,9 +822,9 @@  int ff_h264_execute_ref_pic_marking(H264Context *h)
             || pps_ref_count[0] <= 1 + (h->picture_structure != PICT_FRAME) && pps_ref_count[1] <= 1)
         && pps_ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point)
         && h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){
-        h->cur_pic_ptr->recovered |= FRAME_RECOVERED_IDR;
+        h->cur_pic_ptr->recovered |= FRAME_RECOVERED_HEURISTIC;
         if(!h->avctx->has_b_frames)
-            h->frame_recovered |= FRAME_RECOVERED_SEI;
+            h->frame_recovered |= FRAME_RECOVERED_HEURISTIC;
     }
 
 out:
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 5ce3a6be735..b0c54ad82fb 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -519,6 +519,10 @@  typedef struct H264Context {
  * so all the following frames in presentation order are correct.
  */
 #define FRAME_RECOVERED_SEI  (1 << 1)
+/**
+ * Recovery point detected by heuristic
+ */
+#define FRAME_RECOVERED_HEURISTIC  (1 << 2)
 
     int frame_recovered;    ///< Initial frame has been completely recovered