summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2011-05-24 15:59:37 -0400
committerYunqing Wang <yunqingwang@google.com>2011-05-24 16:28:23 -0400
commitd75eb7365357ec45626452756308d4327fa66911 (patch)
tree2f375dc9ae7d1fb30a13943961925047b180c5cc
parentcfab2caee1d937b1ec34b1a8ea1e8680ad55ad3a (diff)
downloadlibvpx-d75eb7365357ec45626452756308d4327fa66911.tar
libvpx-d75eb7365357ec45626452756308d4327fa66911.tar.gz
libvpx-d75eb7365357ec45626452756308d4327fa66911.tar.bz2
libvpx-d75eb7365357ec45626452756308d4327fa66911.zip
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
-rw-r--r--vp8/encoder/pickinter.c2
1 files changed, 1 insertions, 1 deletions
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);