From: John Koleszar <jkoleszar@google.com>
Date: Tue, 8 Mar 2011 01:58:37 +0000 (-0500)
Subject: correct zbin boost for splitmv mode
X-Git-Tag: v0.9.7~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d1d9911cbf77f2eb4a1bc30179c0256f0304e12;p=libvpx

correct zbin boost for splitmv mode

Disable zbin boost in SPLITMV mode as intended. Was incorrectly looking
at vp8_ref_frame_order instead of vp8_mode_order when comparing against
SPLITMV. This condition should have always been false, as SPLITMV is
not in the range of valid reference frames.

Change-Id: I0408cc7595eff68f00efef6d008e79f5b60d14bf
---

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 8aaca0917..b0dcfe0a4 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1968,7 +1968,7 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
                     else
                         cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST;
                 }
-                else if (vp8_ref_frame_order[mode_index] == SPLITMV)
+                else if (vp8_mode_order[mode_index] == SPLITMV)
                     cpi->zbin_mode_boost = 0;
                 else
                     cpi->zbin_mode_boost = MV_ZBIN_BOOST;