From: Jingning Han <jingning@google.com>
Date: Tue, 23 Dec 2014 17:30:24 +0000 (-0800)
Subject: Set ref frame scaling factor in RTC inter mode decision
X-Git-Tag: v1.4.0~304^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb1795f64363c670c7034855fe62968e05b6a884;p=libvpx

Set ref frame scaling factor in RTC inter mode decision

Properly set the corresponding scaling factor of the reference
frame in the non-RD mode decision process. This allows the mode
search process to account for the scaled reference frame when
selecting coding mode.

Change-Id: I9d41bff6931c98e5a82b413e37ac5e6e14b93b23
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 319a47833..9c3a0a8bc 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -662,6 +662,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
     clamp_mv2(&frame_mv[NEARMV][ref_frame].as_mv, xd);
 
     mbmi->ref_frame[0] = ref_frame;
+    set_ref_ptrs(cm, xd, ref_frame, NONE);
 
     for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) {
       int rate_mv = 0;