diff options
| author | Jingning Han <jingning@google.com> | 2013-02-11 14:46:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-11 14:46:06 -0800 |
| commit | f1060e4cd8046875a1826b4eaa11d3dbdee32e14 (patch) | |
| tree | 236c9a674a1891a6f1d9a0ed3bdd7d3d71ec9509 /vp9/decoder/vp9_dequantize.c | |
| parent | ab2dc6ae57f0d55c0b324d2c43b332f8fa37f348 (diff) | |
| parent | 57e995ff9c01d8c09af50439c8c88876a234d205 (diff) | |
| download | libvpx-f1060e4cd8046875a1826b4eaa11d3dbdee32e14.tar libvpx-f1060e4cd8046875a1826b4eaa11d3dbdee32e14.tar.gz libvpx-f1060e4cd8046875a1826b4eaa11d3dbdee32e14.tar.bz2 libvpx-f1060e4cd8046875a1826b4eaa11d3dbdee32e14.zip | |
Merge "butterfly inverse 4x4 ADST" into experimental
Diffstat (limited to 'vp9/decoder/vp9_dequantize.c')
| -rw-r--r-- | vp9/decoder/vp9_dequantize.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_dequantize.c b/vp9/decoder/vp9_dequantize.c index 839a918fb..1f64767fa 100644 --- a/vp9/decoder/vp9_dequantize.c +++ b/vp9/decoder/vp9_dequantize.c @@ -69,7 +69,11 @@ void vp9_ht_dequant_idct_add_c(TX_TYPE tx_type, int16_t *input, input[i] = dq[i] * input[i]; } +#if CONFIG_INTHT4X4 + vp9_short_iht4x4(input, output, 8, tx_type); +#else vp9_ihtllm(input, output, 4 << 1, tx_type, 4, eobs); +#endif vpx_memset(input, 0, 32); @@ -93,7 +97,7 @@ void vp9_ht_dequant_idct_add_8x8_c(TX_TYPE tx_type, int16_t *input, } #if CONFIG_INTHT - vp9_short_iht8x8(input, output, tx_type, 16); + vp9_short_iht8x8(input, output, 16, tx_type); #else vp9_ihtllm(input, output, 16, tx_type, 8, eobs); #endif |