From: Marco <marpan@google.com>
Date: Wed, 20 Sep 2017 21:55:31 +0000 (-0700)
Subject: vp9: Modify pickmode early exit for ARF in 1pass.
X-Git-Tag: v1.7.0~156^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42373b21cea6651b3063e14a8cdaaaf646ae7f14;p=libvpx

vp9: Modify pickmode early exit for ARF in 1pass.

Add the condition frames_since_golden > 0 to the
early exit check for ARF usage in nonrd_pickmode.
This improves quality of first frame following ARF, where
frame_since_golden = 0.

Small/neutral gain in metrics for speed 6, neutral change in speed.

Only affects when USE_ALTREF_FOR_ONE_PASS is enabled.

Change-Id: I82e73e6ff6fc849e5ca5448563cb8a0515fe0cdc
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index d22dcddfe..7eee81294 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1678,6 +1678,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data,
         continue;
 
       if (cpi->rc.alt_ref_gf_group && cm->show_frame &&
+          cpi->rc.frames_since_golden > 0 &&
           cpi->rc.frames_since_golden < (cpi->rc.baseline_gf_interval >> 1) &&
           ref_frame == ALTREF_FRAME &&
           frame_mv[this_mode][ref_frame].as_int != 0)