commit bc9293b8159b68e64d9b73e118b90f9fdadd6d80
author Alpha Lam <hclam@google.com> Tue Aug 30 19:23:34 2011 +0100
committer Alpha Lam <hclam@google.com> Tue Aug 30 19:23:34 2011 +0100
tree 84aeba762068e237fb4abef35d6f79c846df0e31
parent 2f964bac26340746d4e40f69cff61074770b81ba

Recalculate zbin_extra only if regular quantizer is being used

vp8_update_zbin_extra() is called all the time even though the fast
quantizer doesn't use it. Skip this call if fast quantizer is used.

Change-Id: Ia711c38431930cc2486cf59b8466060ef0e9d9db

vp8/encoder/encodeframe.c

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 5d4e7e7..a194259 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1257,7 +1257,11 @@
                     cpi->zbin_mode_boost = MV_ZBIN_BOOST;
             }
         }
-        vp8_update_zbin_extra(cpi, x);
+
+        /* The fast quantizer doesn't use zbin_extra, only do so with
+         * the regular quantizer. */
+        if (cpi->sf.improved_quant)
+            vp8_update_zbin_extra(cpi, x);
     }
 
     cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++;