diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-11-11 15:38:42 +0000 |
|---|---|---|
| committer | On2 (Google) Code Review <on2-gerrit@google.com> | 2011-11-11 15:38:42 +0000 |
| commit | 0c846f660289ea18a55be21ec9588e6f934d21fa (patch) | |
| tree | 4571b02c520e7983c478f7c0a30296042b8f92dd /vp8 | |
| parent | 982b061dc2f39cb4a7505260a856ce870ba7ba1c (diff) | |
| parent | 7189198d53123273fe89f20e35ee11ae45ee8fcd (diff) | |
| download | libvpx-0c846f660289ea18a55be21ec9588e6f934d21fa.tar libvpx-0c846f660289ea18a55be21ec9588e6f934d21fa.tar.gz libvpx-0c846f660289ea18a55be21ec9588e6f934d21fa.tar.bz2 libvpx-0c846f660289ea18a55be21ec9588e6f934d21fa.zip | |
Merge "fixed the decoder when using 8x8 transform" into experimental
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/decoder/decodframe.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index aa079d8bd..57b781a11 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -393,34 +393,18 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ((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 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, else #endif { + DEQUANT_INVOKE(&pbi->dequant, block)(b); if (xd->eobs[24] > 1) { IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff); |