ref: 5920b520a01574525dc279cad37087e604c1f212
parent: 0d203eff8e1c95723eb92173236ca3d3bcdbdedd
parent: 7187c462d83cbab9c8e4dc6a1a3c466a1df07eec
author: Paul Wilkins <paulwilkins@google.com>
date: Tue Dec 20 06:12:28 EST 2011
Merge "Extended Q:" into experimental
--- a/vp8/common/quant_common.c
+++ b/vp8/common/quant_common.c
@@ -37,30 +37,7 @@
213, 217, 221, 225, 229, 234, 239, 245, 249, 254, 259, 264, 269, 274, 279, 284,
};
#else
-/*static int dc_qlookup[QINDEX_RANGE] =
-{- 4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 17,
- 18, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 91, 93, 95, 96, 98, 100, 101, 102, 104, 106, 108, 110, 112, 114, 116, 118,
- 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 143, 145, 148, 151, 154, 157,
-};
-static int ac_qlookup[QINDEX_RANGE] =
-{- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76,
- 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108,
- 110, 112, 114, 116, 119, 122, 125, 128, 131, 134, 137, 140, 143, 146, 149, 152,
- 155, 158, 161, 164, 167, 170, 173, 177, 181, 185, 189, 193, 197, 201, 205, 209,
- 213, 217, 221, 225, 229, 234, 239, 245, 249, 254, 259, 264, 269, 274, 279, 284,
-};*/
-
static int dc_qlookup[QINDEX_RANGE];
static int ac_qlookup[QINDEX_RANGE];
@@ -71,35 +48,27 @@
void vp8_init_quant_tables()
{int i;
- int current_val = 16;
- int last_val = 16;
+ //int current_val = 16;
+ //int last_val = 16;
+ int current_val = 4;
+ int last_val = 4;
int ac_val;
- int dc_max;
+ //int dc_max;
- /*for ( i = 0; i < QINDEX_RANGE; i++ )
- {- ac_qlookup[i] = ac_qlookup[i] << 2;
- dc_qlookup[i] = dc_qlookup[i] << 2;
- }
-
- // Not active by default for now.
- return;*/
-
for ( i = 0; i < QINDEX_RANGE; i++ )
{ac_qlookup[i] = current_val;
- //current_val = (int)((double)current_val * 1.045);
- //current_val = (int)((double)current_val * 1.04);
- current_val = (int)((double)current_val * 1.018);
+ //current_val = (int)((double)current_val * 1.018);
+ current_val = (int)((double)current_val * 1.02);
if ( current_val == last_val )
current_val++;
last_val = current_val;
ac_val = ac_qlookup[i];
- dc_max = (int)(((double)ac_val * 0.75) + 0.5);
dc_qlookup[i] = (0.000000305 * ac_val * ac_val * ac_val) +
(-0.00065 * ac_val * ac_val) +
(0.9 * ac_val) + 0.5;
+ //dc_max = (int)(((double)ac_val * 0.75) + 0.5);
//if ( dc_qlookup[i] > dc_max )
// dc_qlookup[i] = dc_max;
if ( dc_qlookup[i] < ACDC_MIN )