commit d39f6b330065f416e552b1d557fa1d2316c1af42
author Angie Chiang <angiebird@google.com> Mon Jul 24 13:28:27 2017 -0700
committer Angie Chiang <angiebird@google.com> Mon Jul 24 22:45:42 2017 +0000
tree 261b769d032740d64a46412b7c9dbba212b53d5e
parent 57127c52bf9a0639125339b3d75fb984b3e24b87

Turn off adapt_scan for IDTX/1D txfms

The performance stay the same compared to turn on adpat_scan for
all txfms

The  performance of adapt_scan on top of ext_tx are
lowres: 0.517%
midres: 0.484%
hdres:  0.639%

Change-Id: Ic148dbe9c0af4554bbbe3f7012625f389f997289

av1/common/scan.h

diff --git a/av1/common/scan.h b/av1/common/scan.h
index d137d04..c9911de 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -84,12 +84,18 @@
   // use the DCT_DCT scan order for MRC_DCT for now
   if (tx_type == MRC_DCT) tx_type = DCT_DCT;
 #endif  // CONFIG_MRC_TX
+  const int is_inter = is_inter_block(mbmi);
 #if CONFIG_ADAPT_SCAN
   (void)mbmi;
-  return &cm->fc->sc[tx_size][tx_type];
+  (void)is_inter;
+#if CONFIG_EXT_TX
+  if (tx_type >= IDTX)
+    return get_default_scan(tx_size, tx_type, is_inter);
+  else
+#endif  // CONFIG_EXT_TX
+    return &cm->fc->sc[tx_size][tx_type];
 #else   // CONFIG_ADAPT_SCAN
   (void)cm;
-  const int is_inter = is_inter_block(mbmi);
   return get_default_scan(tx_size, tx_type, is_inter);
 #endif  // CONFIG_ADAPT_SCAN
 }