From: Paul Wilkins <paulwilkins@google.com>
Date: Fri, 28 Jan 2011 13:13:30 +0000 (+0000)
Subject: Inconsistent distortion metric in vp8_rd_pick_intra_mbuv_mode
X-Git-Tag: v0.9.6~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcb23e2aaaef27a12d72f7e263f9629fdf68c266;p=libvpx

Inconsistent distortion metric in vp8_rd_pick_intra_mbuv_mode

This function was using a variance metric compared to and SSE metric in
other places (eg. vp8_rd_inter_uv)

Change-Id: I9109fcc5a13bca9db1d7ead500fe14999ab233eb
---

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 950c02997..50780a3c1 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -813,7 +813,7 @@ int vp8_rd_pick_intra_mbuv_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate, int *ra
         rate_to = rd_cost_mbuv(x);
         rate = rate_to + x->intra_uv_mode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context->mbmi.uv_mode];
 
-        distortion = vp8_get_mbuvrecon_error(IF_RTCD(&cpi->rtcd.variance), x);
+        distortion = ENCODEMB_INVOKE(&cpi->rtcd.encodemb, mbuverr)(x) / 4;
 
         this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);