wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/h264: Use FRAME_RECOVERED_HEURISTIC instead of IDR/SEI

Browse source 
This keeps IDR/SEI and heuristically detected recovery points cleaner seperated

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-10-02 18:32:33 +02:00
parent 3f4a1a24a5
commit 68e1cf204a
No known key found for this signature in database
GPG key ID: B18E8928B3948D64
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/h264_refs.c
View file

@ -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:

4
libavcodec/h264dec.h
View file

@ -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