RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h264_refs: extend RAP heuristic to multiple PPS 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-29 02:51:19 +02:00
parent 9789595189
commit 0a6aa30f7c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264_refs.c
View File

@ -617,6 +617,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
{ {
int i, av_uninit(j); int i, av_uninit(j);
int pps_count; int pps_count;
int pps_ref_count[2] = {0};
int current_ref_assigned = 0, err = 0; int current_ref_assigned = 0, err = 0;
H264Picture *av_uninit(pic); 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); print_long_term(h);
pps_count = 0; 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_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 if ( err >= 0
&& h->long_ref_count==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->short_ref_count<=2 || pps_ref_count[0] <= 1 && pps_ref_count[1] <= 1)
&& h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point) && 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->f->pict_type == AV_PICTURE_TYPE_I){
h->cur_pic_ptr->recovered |= 1; h->cur_pic_ptr->recovered |= 1;
if(!h->avctx->has_b_frames) if(!h->avctx->has_b_frames)