Merge "Merge of further two pass rc clean up and adjustments." into experimental

36fe9735 · Paul Wilkins · On2 (Google) Code Review · 9b2c63e9 · 7eb66d82 · 36fe9735
Commit 36fe9735 authored Jun 12, 2012 by Paul Wilkins Committed by On2 (Google) Code Review Jun 12, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 112 additions and 85 deletions

vp8/encoder/firstpass.c vp8/encoder/firstpass.c +103 -77

vp8/encoder/quantize.c vp8/encoder/quantize.c +9 -8

No files found.
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
--- a/vp8/encoder/quantize.c
+++ b/vp8/encoder/quantize.c
@@ -297,17 +297,18 @@ void vp8cx_init_quantizer(VP8_COMP *cpi)
    int zbin_boost[16] = { 0,  0,  8, 10, 12, 14, 16, 20,
                          24, 28, 32, 36, 40, 44, 44, 44};

-    int zbin_boost_8x8[64] = {  0,  0,  8, 10, 12, 14, 16, 20,
-                               24, 28, 32, 36, 40, 44, 48, 52,
-                               56, 60, 64, 68, 72, 76, 80, 80,
-                               80, 80, 80, 80, 80, 80, 80, 80,
-                               80, 80, 80, 80, 80, 80, 80, 80,
-                               80, 80, 80, 80, 80, 80, 80, 80,
-                               80, 80, 80, 80, 80, 80, 80, 80,
-                               80, 80, 80, 80, 80, 80, 80, 80 };
+    int zbin_boost_8x8[64] = {  0,  0,  0,  8,  8,  8, 10, 12,
+                               14, 16, 18, 20, 22, 24, 26, 28,
+                               30, 32, 34, 36, 38, 40, 42, 44,
+                               46, 48, 48, 48, 48, 48, 48, 48,
+                               48, 48, 48, 48, 48, 48, 48, 48,
+                               48, 48, 48, 48, 48, 48, 48, 48,
+                               48, 48, 48, 48, 48, 48, 48, 48,
+                               48, 48, 48, 48, 48, 48, 48, 48 };

    int qrounding_factor = 48;

+
    for (Q = 0; Q < QINDEX_RANGE; Q++)
    {
        int qzbin_factor = (vp8_dc_quant(Q,0) < 148) ? 84 : 80;