From: Yunqing Wang <yunqingwang@google.com>
Date: Tue, 24 May 2011 19:59:37 +0000 (-0400)
Subject: Fix a bug happening while encoding at profile=3
X-Git-Tag: v0.9.7~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d75eb7365357ec45626452756308d4327fa66911;p=libvpx

Fix a bug happening while encoding at profile=3

While profile=3, there is no sub-pixel search. Distortion and SSE
have to calculated using get_inter_mbpred_error().

Change-Id: Ifb36e17eef7750af93efa7d0e2870142ef540184
---

diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 431127626..666948060 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -840,7 +840,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
             x->e_mbd.block[0].bmi.mode = this_mode;
             x->e_mbd.block[0].bmi.mv.as_int = x->e_mbd.mode_info_context->mbmi.mv.as_int;
 
-            if((this_mode != NEWMV) || !(have_subp_search))
+            if((this_mode != NEWMV) || !(have_subp_search) || cpi->common.full_pixel==1)
                 distortion2 = get_inter_mbpred_error(x, &cpi->fn_ptr[BLOCK_16X16], &sse);
 
             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);