Merge "Add horizontal and vertical scan order for 1-D transform" into nextgenv2

240ae972 · Jingning Han · Gerrit Code Review · 954e560f · e0413094 · 240ae972
Commit 240ae972 authored Mar 09, 2016 by Jingning Han Committed by Gerrit Code Review Mar 09, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1089 additions and 11 deletions

vp10/common/scan.c vp10/common/scan.c +1084 -11

vp10/decoder/decodeframe.c vp10/decoder/decodeframe.c +5 -0

No files found.
--- a/vp10/common/scan.c
+++ b/vp10/common/scan.c
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -276,10 +276,15 @@ static void inverse_transform_block_inter(MACROBLOCKD* xd, int plane,
    } else {
      if (tx_type == DCT_DCT && tx_size <= TX_16X16 && eob <= 10)
        memset(dqcoeff, 0, 4 * (4 << tx_size) * sizeof(dqcoeff[0]));
+#if CONFIG_EXT_TX
+      else
+        memset(dqcoeff, 0, (16 << (tx_size << 1)) * sizeof(dqcoeff[0]));
+#else
      else if (tx_size == TX_32X32 && eob <= 34)
        memset(dqcoeff, 0, 256 * sizeof(dqcoeff[0]));
      else
        memset(dqcoeff, 0, (16 << (tx_size << 1)) * sizeof(dqcoeff[0]));
+#endif
    }
  }
 }