diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 02:36:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 02:36:58 +0100 |
| commit | e3d7a3978b857e32b32575ff78ecc7d67a18687e (patch) | |
| tree | a1e66665123518f16ced8fb8ab34983247f573f7 | |
| parent | ab6ea7a81921a168575be63b3d9049ca716e707a (diff) | |
| download | ffmpeg-e3d7a3978b857e32b32575ff78ecc7d67a18687e.tar.gz | |
avcodec/h264_refs: improve key frame detection heuristic
Fixes Ticket3186
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_refs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 17799a8ede..7eb1f9e2d4 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -575,6 +575,7 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice) int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) { int i, av_uninit(j); + int pps_count; int current_ref_assigned = 0, err = 0; Picture *av_uninit(pic); @@ -745,9 +746,13 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) print_short_term(h); print_long_term(h); + pps_count = 0; + for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++) + pps_count += !!h->pps_buffers[i]; + if ( err >= 0 && h->long_ref_count==0 - && h->short_ref_count<=2 + && (h->short_ref_count<=2 || h->pps.ref_count[0] <= 1 && h->pps.ref_count[1] <= 1 && pps_count == 1) && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){ h->cur_pic_ptr->recovered |= 1; |