ref: 0c846f660289ea18a55be21ec9588e6f934d21fa
parent: 982b061dc2f39cb4a7505260a856ce870ba7ba1c
parent: 7189198d53123273fe89f20e35ee11ae45ee8fcd
author: Yaowu Xu <yaowu@google.com>
date: Fri Nov 11 10:38:42 EST 2011
Merge "fixed the decoder when using 8x8 transform" into experimental
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -393,34 +393,18 @@
((int *)b->qcoeff)[0] = 0;
}
}
-
}
else if (mode == SPLITMV)
{
-#if CONFIG_T8X8
- if ( tx_type == TX_8X8 )
- {
- DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block_8x8)
- (xd->qcoeff, xd->block[0].dequant,
- xd->predictor, xd->dst.y_buffer,
- xd->dst.y_stride, xd->eobs, xd);
- }
- else
-#endif
- {
- DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
- (xd->qcoeff, xd->block[0].dequant,
- xd->predictor, xd->dst.y_buffer,
- xd->dst.y_stride, xd->eobs);
- }
+ DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
+ (xd->qcoeff, xd->block[0].dequant,
+ xd->predictor, xd->dst.y_buffer,
+ xd->dst.y_stride, xd->eobs);
}
else
{
BLOCKD *b = &xd->block[24];
- DEQUANT_INVOKE(&pbi->dequant, block)(b);
-
- /* do 2nd order transform on the dc block */
#if CONFIG_T8X8
if( tx_type == TX_8X8 )
{
@@ -455,6 +439,7 @@
else
#endif
{
+ DEQUANT_INVOKE(&pbi->dequant, block)(b);
if (xd->eobs[24] > 1)
{
IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);