From: Yaowu Xu <yaowu@google.com>
Date: Fri, 2 Mar 2012 04:16:49 +0000 (-0800)
Subject: Fixed zbin_mode_boost initialization
X-Git-Tag: v1.3.0~1217^2~380^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaa955ba98299081399c96b0dad0411f69a9cec6;p=libvpx

Fixed zbin_mode_boost initialization

The commit added the correct Zbin_mode_boost initialization based on
Intra Mode before using rate distortion to pick UV intra mode.

Change-Id: I8e57878ff356a06672f6fa2431be860bf9b9a5c7
---

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 2a61e1f54..085d8c4cf 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2552,6 +2552,10 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     vpx_memset(mode_mv, 0, sizeof(mode_mv));
 
     x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME;
+
+    /* Initialize zbin mode boost for uv costing */
+    cpi->zbin_mode_boost = 0;
+    vp8_update_zbin_extra(cpi, x);
     rd_pick_intra_mbuv_mode(cpi, x, &uv_intra_rate, &uv_intra_rate_tokenonly, &uv_intra_distortion);
     uv_intra_mode = x->e_mbd.mode_info_context->mbmi.uv_mode;