Merge "added a last stage rounding for 8x8 inverse dct" into experimental

This commit is contained in:
Yaowu Xu 2011-10-25 16:08:51 +00:00 committed by On2 (Google) Code Review
commit 4081e5b3fe

View File

@ -369,7 +369,7 @@ static void idctcol (int *blk)
((blk[8 * 0] + 32) >> 6); ((blk[8 * 0] + 32) >> 6);
return; return;
} }
x0 = (blk[8 * 0] << 8) + 8192; x0 = (blk[8 * 0] << 8) + 16384;
/* first stage */ /* first stage */
x8 = W7 * (x4 + x5) + 4; x8 = W7 * (x4 + x5) + 4;
@ -399,14 +399,14 @@ static void idctcol (int *blk)
x4 = (181 * (x4 - x5) + 128) >> 8; x4 = (181 * (x4 - x5) + 128) >> 8;
/* fourth stage */ /* fourth stage */
blk[8 * 0] = (x7 + x1) >> 14; blk[8 * 0] = (x7 + x1 ) >> 15;
blk[8 * 1] = (x3 + x2) >> 14; blk[8 * 1] = (x3 + x2 ) >> 15;
blk[8 * 2] = (x0 + x4) >> 14; blk[8 * 2] = (x0 + x4 ) >> 15;
blk[8 * 3] = (x8 + x6) >> 14; blk[8 * 3] = (x8 + x6 ) >> 15;
blk[8 * 4] = (x8 - x6) >> 14; blk[8 * 4] = (x8 - x6 ) >> 15;
blk[8 * 5] = (x0 - x4) >> 14; blk[8 * 5] = (x0 - x4 ) >> 15;
blk[8 * 6] = (x3 - x2) >> 14; blk[8 * 6] = (x3 - x2 ) >> 15;
blk[8 * 7] = (x7 - x1) >> 14; blk[8 * 7] = (x7 - x1 ) >> 15;
} }
#define TX_DIM 8 #define TX_DIM 8
@ -434,7 +434,7 @@ void vp8_short_idct8x8_c(short *coefs, short *block, int pitch)
{ {
for (j = 0; j < TX_DIM; j++) for (j = 0; j < TX_DIM; j++)
{ {
block[i*shortpitch+j] = X[i * TX_DIM + j]>>1; block[i*shortpitch+j] = X[i * TX_DIM + j];
} }
} }
} }