Fixed a bug in the experiment EXT_TX.

Change-Id: I1adf0e916f9414e6dfe1d07cefc0693bc63b7e97

diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index 57e4999d93f7fd2a756b19f292e28435b04d1d4b..56fccb19f28149a1e20681d14edf143201f5ee43 100644 (file)
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -268,7 +268,7 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block,
             if (mbmi->tx_skip[plane != 0]) {
               vp9_tx_identity_add(dqcoeff, dst, stride, 32, shift);
             } else {
-            vp9_highbd_idct32x32_add(dqcoeff, dst, stride, eob, xd->bd);
+              vp9_highbd_idct32x32_add(dqcoeff, dst, stride, eob, xd->bd);
             }
 #else
             vp9_highbd_idct32x32_add(dqcoeff, dst, stride, eob, xd->bd);

diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index c35c504b7dd3fc2c5f0b1685016a687d06fa21fb..fb08ea3c4c6f2c73a6c32d6052c78c871c536137 100644 (file)
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -1255,6 +1255,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
         break;
       case TX_16X16:
 #if CONFIG_EXT_TX
+        tx_type = get_tx_type(plane, xd);
         vp9_highbd_iht16x16_add(tx_type, dqcoeff, dst, pd->dst.stride,
                                 p->eobs[block], xd->bd);
 #else
@@ -1264,6 +1265,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
         break;
       case TX_8X8:
 #if CONFIG_EXT_TX
+        tx_type = get_tx_type(plane, xd);
         vp9_highbd_iht8x8_add(tx_type, dqcoeff, dst, pd->dst.stride,
                               p->eobs[block], xd->bd);
 #else
@@ -1310,6 +1312,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
       break;
     case TX_16X16:
 #if CONFIG_EXT_TX
+      tx_type = get_tx_type(plane, xd);
       vp9_iht16x16_add(tx_type, dqcoeff, dst, pd->dst.stride, p->eobs[block]);
 #else
       vp9_idct16x16_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
@@ -1317,6 +1320,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
       break;
     case TX_8X8:
 #if CONFIG_EXT_TX
+      tx_type = get_tx_type(plane, xd);
       vp9_iht8x8_add(tx_type, dqcoeff, dst, pd->dst.stride, p->eobs[block]);
 #else
       vp9_idct8x8_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);