tx64x64 experiment fix for high-bitdepth

Change-Id: Ia8d769b43bad0f9ad0684ecf6925e580339c7397

diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c
index 935db9f7b7eb9c2e1b278fd21f89bab23865da16..4d9559c8c603b6d789ddb1bb339fdcae5e800df9 100644 (file)
--- a/vp9/common/vp9_idct.c
+++ b/vp9/common/vp9_idct.c
@@ -3788,8 +3788,9 @@ void vp9_highbd_iht16x16_add(TX_TYPE tx_type, const tran_low_t *input,
 }
 
 #if CONFIG_TX64X64
-void vp9_highbd_idct64x64_4096_add_c(const tran_low_t *input, uint8_t *dest,
+void vp9_highbd_idct64x64_4096_add_c(const tran_low_t *input, uint8_t *dest8,
                                      int stride, int bd) {
+  uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);
   // vp9_clear_system_state();  // Make it simd safe : __asm emms;
   {
     double out[64 * 64], out2[64 * 64];

diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index 67a5e073f9fec0de713313030fa93c5694b5a41b..e11ef932f482a21fd8fbe0da04d845e6156afa36 100644 (file)
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -538,12 +538,12 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block,
                                       xd->bd);
               break;
             case TX_32X32:
-              tx_type = DCT_DCT;
+              tx_type = get_tx_type_large(plane_type, xd);
               vp9_highbd_idct32x32_add(dqcoeff, dst, stride, eob, xd->bd);
               break;
 #if CONFIG_TX64X64
             case TX_64X64:
-              tx_type = DCT_DCT;
+              tx_type = get_tx_type_large(plane_type, xd);
               vp9_highbd_idct64x64_add(dqcoeff, dst, stride, eob, xd->bd);
               break;
 #endif  // CONFIG_TX64X64