diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-29 02:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-29 03:03:30 +0200 |
| commit | 0a6aa30f7c05d9032900311158f733b7376b9499 (patch) | |
| tree | 0697c12416872c96b422966a3df880b7b298c656 | |
| parent | 9789595189e7f192aa269a830211763fb73e4f0d (diff) | |
| download | ffmpeg-0a6aa30f7c05d9032900311158f733b7376b9499.tar.gz | |
avcodec/h264_refs: extend RAP heuristic to multiple PPS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264_refs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index ac6f6bf59c..9d56fbf17d 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -617,6 +617,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) { int i, av_uninit(j); int pps_count; + int pps_ref_count[2] = {0}; int current_ref_assigned = 0, err = 0; H264Picture *av_uninit(pic); @@ -801,13 +802,16 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) print_long_term(h); pps_count = 0; - for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++) + for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++) { pps_count += !!h->pps_buffers[i]; + pps_ref_count[0] = FFMAX(pps_ref_count[0], h->pps.ref_count[0]); + pps_ref_count[1] = FFMAX(pps_ref_count[1], h->pps.ref_count[1]); + } if ( err >= 0 && h->long_ref_count==0 - && (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) + (2*!h->has_recovery_point) + && (h->short_ref_count<=2 || pps_ref_count[0] <= 1 && 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 |= 1; if(!h->avctx->has_b_frames) |