Commit 6a42bdd2 authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review
Browse files

Merge "Modify early exit for alt_ref in nonrd_pickmode."

parents 9a71811d 77e51e20
......@@ -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[GOLDEN_FRAME] = 1;
}
if (cm->show_frame == 0) {
usable_ref_frame = GOLDEN_FRAME;
skip_ref_find_pred[ALTREF_FRAME] = 1;
if (!cm->show_frame) {
if (cpi->rc.frames_since_key == 1) {
usable_ref_frame = LAST_FRAME;
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))
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 &&
cpi->rc.frames_since_golden > (cpi->rc.baseline_gf_interval >> 1) &&
ref_frame == GOLDEN_FRAME &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment