commit ad4ac8a8361129465728aa8848a5d19ccefddb98
author Jingning Han <jingning@google.com> Wed Nov 22 10:01:33 2017 -0800
committer Jingning Han <jingning@google.com> Mon Nov 27 23:00:15 2017 +0000
tree f3c004ad9db6498bc97c6ee40d70aba2bacac4b4
parent b3b5304f6586b1715f842321fbd6f7228163dd8a

Allow adaptive scan to support a reduced txfm kernel set

Reduce the supported txfm kernel set from 9 to 4. This
substantially reduce the memory requirement in SRAM for hw design.

Change-Id: Id4f75b7fb1eaad05efe6db89a7bfc60d0324bd35

av1/common/scan.h

diff --git a/av1/common/scan.h b/av1/common/scan.h
index a6ff153..7512ba9 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -30,8 +30,9 @@
 extern const SCAN_ORDER av1_inter_scan_orders[TX_SIZES_ALL][TX_TYPES];
 
 #if CONFIG_ADAPT_SCAN
-#define USE_2X2_PROB 1
-#define CACHE_SCAN_PROB 1
+#define USE_2X2_PROB 0
+#define CACHE_SCAN_PROB 0
+#define REDUCED_SET 1
 #define USE_TOPOLOGICAL_SORT 0
 #define USE_LIMIT_SCAN_DISTANCE 0
 void av1_update_scan_count_facade(AV1_COMMON *cm, FRAME_COUNTS *counts,
@@ -91,6 +92,11 @@
   (void)tx_size;
   if (tx_size_2d[tx_size] >= 1024 && tx_type != DCT_DCT) return 0;
   if (tx_size > TX_32X16) return 0;
+#if CONFIG_ADAPT_SCAN
+#if REDUCED_SET
+  return tx_type <= ADST_ADST;
+#endif
+#endif
   return tx_type < IDTX;
 }