generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Modify early exit for alt_ref in nonrd_pickmode."

Browse Source
This commit is contained in:
Marco Paniconi 2017-10-04 19:38:49 +00:00 committed by Gerrit Code Review
commit 6a42bdd25f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_pickmode.c
View File

@ -1582,9 +1582,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
skip_ref_find_pred[LAST_FRAME] = 1; skip_ref_find_pred[LAST_FRAME] = 1;
skip_ref_find_pred[GOLDEN_FRAME] = 1; skip_ref_find_pred[GOLDEN_FRAME] = 1;
} }
if (cm->show_frame == 0) { if (!cm->show_frame) {
usable_ref_frame = GOLDEN_FRAME;
skip_ref_find_pred[ALTREF_FRAME] = 1;
if (cpi->rc.frames_since_key == 1) { if (cpi->rc.frames_since_key == 1) {
usable_ref_frame = LAST_FRAME; usable_ref_frame = LAST_FRAME;
skip_ref_find_pred[GOLDEN_FRAME] = 1; skip_ref_find_pred[GOLDEN_FRAME] = 1;
@ -1681,6 +1679,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
frame_mv[this_mode][ref_frame].as_int != 0)) frame_mv[this_mode][ref_frame].as_int != 0))
continue; continue;
if (!cm->show_frame && ref_frame == ALTREF_FRAME &&
frame_mv[this_mode][ref_frame].as_int != 0)
continue;
if (cpi->rc.alt_ref_gf_group && cm->show_frame && if (cpi->rc.alt_ref_gf_group && cm->show_frame &&
cpi->rc.frames_since_golden > (cpi->rc.baseline_gf_interval >> 1) && cpi->rc.frames_since_golden > (cpi->rc.baseline_gf_interval >> 1) &&
ref_frame == GOLDEN_FRAME && ref_frame == GOLDEN_FRAME &&