diff options
| author | Jingning Han <jingning@google.com> | 2013-02-22 16:29:28 -0800 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-02-25 09:16:12 -0800 |
| commit | 77a3becf92b6385ce7e2ffcf636c9cc373d8760c (patch) | |
| tree | 6c8da72ff10aa4552e26d9967494cccae42cdd9f /vp9/decoder | |
| parent | 499fe05dc030b31d15c2ad9717e6bcee839f7d12 (diff) | |
| download | libvpx-77a3becf92b6385ce7e2ffcf636c9cc373d8760c.tar libvpx-77a3becf92b6385ce7e2ffcf636c9cc373d8760c.tar.gz libvpx-77a3becf92b6385ce7e2ffcf636c9cc373d8760c.tar.bz2 libvpx-77a3becf92b6385ce7e2ffcf636c9cc373d8760c.zip | |
clean up forward and inverse hybrid transform
Rebased.
Remove the old matrix multiplication transform computation. The 16x16
ADST/DCT can be switched on/off and evaluated by setting ACTIVE_HT16
300/0 in vp9/common/vp9_blockd.h.
Change-Id: Icab2dbd18538987e1dc4e88c45abfc4cfc6e133f
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_dequantize.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/vp9/decoder/vp9_dequantize.c b/vp9/decoder/vp9_dequantize.c index f66a57d28..7a6c12a99 100644 --- a/vp9/decoder/vp9_dequantize.c +++ b/vp9/decoder/vp9_dequantize.c @@ -68,12 +68,7 @@ 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, eob); -#endif - vpx_memset(input, 0, 32); add_residual(diff_ptr, pred, pitch, dest, stride, 4, 4); @@ -95,11 +90,7 @@ void vp9_ht_dequant_idct_add_8x8_c(TX_TYPE tx_type, int16_t *input, input[i] *= dq[1]; } -#if CONFIG_INTHT vp9_short_iht8x8(input, output, 16, tx_type); -#else - vp9_ihtllm(input, output, 16, tx_type, 8, eob); -#endif vpx_memset(input, 0, 128); add_residual(diff_ptr, pred, pitch, dest, stride, 8, 8); @@ -264,11 +255,7 @@ void vp9_ht_dequant_idct_add_16x16_c(TX_TYPE tx_type, int16_t *input, input[i] *= dq[1]; // inverse hybrid transform -#if CONFIG_INTHT16X16 vp9_short_iht16x16(input, output, 32, tx_type); -#else - vp9_ihtllm(input, output, 32, tx_type, 16, eob); -#endif // the idct halves ( >> 1) the pitch // vp9_short_idct16x16_c(input, output, 32); |