From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/h264: Use FRAME_RECOVERED_HEURISTIC instead of IDR/SEI
Date: Tue, 14 Nov 2023 18:20:47 +0100
Message-ID: <20231114172051.13872-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20231114172051.13872-1-michael@niedermayer.cc>
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 --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
--
2.17.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".
next prev parent reply other threads:[~2023-11-14 17:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 17:20 [FFmpeg-devel] [PATCH 1/6] avcodec/h264: Seperate SEI and IDR recovery handling Michael Niedermayer
2023-11-14 17:20 ` Michael Niedermayer [this message]
2023-11-14 17:20 ` [FFmpeg-devel] [PATCH 3/6] avcodec/h264dec: More elaborate documentation for frame_recovered Michael Niedermayer
2023-11-14 17:20 ` [FFmpeg-devel] [PATCH 4/6] avcodec/h264: keep track of which frames used gray references Michael Niedermayer
2023-11-14 17:32 ` Hendrik Leppkes
2023-11-14 18:46 ` Michael Niedermayer
2023-11-20 0:11 ` Michael Niedermayer
2023-11-20 3:01 ` Vittorio Giovara
2023-11-20 23:53 ` Michael Niedermayer
2023-11-14 17:20 ` [FFmpeg-devel] [PATCH 5/6] avcodec/h264: Avoid using gray gap frames as references Michael Niedermayer
2023-11-21 12:27 ` James Almer
2023-11-22 0:09 ` Michael Niedermayer
2023-11-14 17:20 ` [FFmpeg-devel] [PATCH 6/6] avcodec/h264dec: Support skipping frames that used gray gap frames Michael Niedermayer
2023-11-21 12:28 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114172051.13872-2-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git