generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/master' into experimental

Browse Source 
Change-Id: I238df40ea8e0f34b85a38525605f7c91905f650a
This commit is contained in:
John Koleszar 2010-12-27 00:05:05 -05:00
commit 2a68727af9
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
vp8/encoder/rdopt.c
View File

@ -173,45 +173,44 @@ static int rd_iifactor [ 32 ] = { 4, 4, 3, 2, 1, 0, 0, 0,
}; };
// The values in this table should be reviewed /* values are now correlated to quantizer */
static int sad_per_bit16lut[128] = static int sad_per_bit16lut[QINDEX_RANGE] =
{ {
4, 4, 4, 4, 4, 4, 4, 4, // 4 5, 5, 5, 5, 5, 5, 6, 6,
4, 4, 4, 4, 4, 4, 4, 4, // 1 6, 6, 6, 6, 6, 7, 7, 7,
4, 4, 4, 4, 4, 4, 4, 4, // 2 7, 7, 7, 7, 8, 8, 8, 8,
4, 4, 4, 4, 4, 4, 4, 4, // 3 8, 8, 8, 8, 8, 8, 9, 9,
4, 4, 4, 4, 4, 4, 4, 4, // 4 9, 9, 9, 9, 10, 10, 10, 10,
4, 4, 12, 12, 13, 13, 14, 14, // 5 10, 10, 11, 11, 11, 11, 11, 11,
14, 14, 14, 15, 15, 15, 15, 15, // 6 12, 12, 12, 12, 12, 12, 12, 13,
15, 15, 15, 15, 15, 15, 15, 15, // 7 13, 13, 13, 13, 13, 14, 14, 14,
15, 15, 15, 15, 15, 16, 16, 16, // 8 14, 14, 15, 15, 15, 15, 15, 15,
16, 16, 18, 18, 18, 18, 19, 19, // 9 16, 16, 16, 16, 16, 16, 17, 17,
19, 19, 19, 19, 19, 19, 19, 19, // 10 17, 17, 17, 17, 17, 18, 18, 18,
20, 20, 22, 22, 22, 22, 21, 21, // 11 18, 18, 19, 19, 19, 19, 19, 19,
22, 22, 22, 22, 22, 22, 22, 22, // 12 20, 20, 20, 21, 21, 21, 21, 22,
22, 22, 22, 22, 22, 22, 22, 22, // 13 22, 22, 23, 23, 23, 24, 24, 24,
22, 22, 22, 22, 22, 22, 22, 22, // 14 25, 25, 26, 26, 27, 27, 27, 28,
22, 22, 22, 22, 22, 22, 22, 22, // 15 28, 28, 29, 29, 30, 30, 31, 31
}; };
static int sad_per_bit4lut[QINDEX_RANGE] =
static int sad_per_bit4lut[128] =
{ {
4, 4, 4, 4, 4, 4, 4, 4, // 4 5, 5, 5, 5, 5, 5, 7, 7,
4, 4, 4, 4, 4, 4, 4, 4, // 1 7, 7, 7, 7, 7, 8, 8, 8,
4, 4, 4, 4, 4, 4, 4, 4, // 2 8, 8, 8, 8, 10, 10, 10, 10,
4, 4, 4, 4, 4, 4, 4, 4, // 3 10, 10, 10, 10, 10, 10, 11, 11,
4, 4, 4, 4, 4, 4, 4, 4, // 4 11, 11, 11, 11, 13, 13, 13, 13,
4, 4, 15, 15, 15, 15, 16, 16, // 5 13, 13, 14, 14, 14, 14, 14, 14,
16, 17, 17, 17, 17, 17, 17, 17, // 6 16, 16, 16, 16, 16, 16, 16, 17,
17, 17, 19, 19, 22, 22, 21, 21, // 7 17, 17, 17, 17, 17, 19, 19, 19,
23, 23, 23, 23, 23, 24, 24, 24, // 8 19, 19, 20, 20, 20, 20, 20, 20,
25, 25, 27, 27, 27, 27, 28, 28, // 9 22, 22, 22, 22, 22, 22, 23, 23,
28, 28, 29, 29, 29, 29, 29, 29, // 10 23, 23, 23, 23, 23, 25, 25, 25,
30, 30, 31, 31, 31, 31, 32, 32, // 11 25, 25, 26, 26, 26, 26, 26, 26,
34, 34, 34, 34, 34, 34, 34, 34, // 12 28, 28, 28, 29, 29, 29, 29, 31,
34, 34, 34, 34, 34, 34, 34, 34, // 13 31, 31, 32, 32, 32, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34, // 14 35, 35, 37, 37, 38, 38, 38, 40,
34, 34, 34, 34, 34, 34, 34, 34, // 15 40, 40, 41, 41, 43, 43, 44, 44,
}; };
void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex) void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex)
@ -262,10 +261,6 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
cpi->RDMULT = 125; cpi->RDMULT = 125;
cpi->mb.errorperbit = (cpi->RDMULT / 100); cpi->mb.errorperbit = (cpi->RDMULT / 100);
if (cpi->mb.errorperbit < 1)
cpi->mb.errorperbit = 1;
vp8_set_speed_features(cpi); vp8_set_speed_features(cpi);
if (cpi->common.simpler_lpf) if (cpi->common.simpler_lpf)