commit 42b903f69a36ee046a40d120c8b2478d4d7467ce
author hui su <huisu@google.com> Tue May 16 18:13:42 2017 -0700
committer Hui Su <huisu@google.com> Fri May 19 17:19:33 2017 +0000
tree b5bf298ce57355deda4590ee044aeda0f23540c4
parent f288951cd9c8b23f015be7e3f6c59c86a6c7014d

Filter-intra: make filter tap arrays static

Change-Id: Id6078c5e3c82bc382af7b576133beb9026797a9b

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 7ce0aa6..297fb01 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1207,7 +1207,7 @@
 
 #if CONFIG_FILTER_INTRA
 #if USE_3TAP_INTRA_FILTER
-int av1_filter_intra_taps_3[TX_SIZES][FILTER_INTRA_MODES][3] = {
+static int filter_intra_taps_3[TX_SIZES][FILTER_INTRA_MODES][3] = {
 #if CONFIG_CB4X4
   {
       { 697, 836, -509 },
@@ -1286,7 +1286,7 @@
 #endif  // CONFIG_TX64X64
 };
 #else
-int av1_filter_intra_taps_4[TX_SIZES][FILTER_INTRA_MODES][4] = {
+static int filter_intra_taps_4[TX_SIZES][FILTER_INTRA_MODES][4] = {
 #if CONFIG_CB4X4
   {
       { 735, 881, -537, -54 },
@@ -1391,9 +1391,9 @@
   int buffer[33][33];
 #endif  // CONFIG_TX64X64
   const TX_SIZE tx_size = get_txsize_from_blocklen(bs);
-  const int c0 = av1_filter_intra_taps_3[tx_size][mode][0];
-  const int c1 = av1_filter_intra_taps_3[tx_size][mode][1];
-  const int c2 = av1_filter_intra_taps_3[tx_size][mode][2];
+  const int c0 = filter_intra_taps_3[tx_size][mode][0];
+  const int c1 = filter_intra_taps_3[tx_size][mode][1];
+  const int c2 = filter_intra_taps_3[tx_size][mode][2];
 
   k = 0;
   mean = 0;
@@ -1433,10 +1433,10 @@
   int buffer[33][65];
 #endif  // CONFIG_TX64X64
   const TX_SIZE tx_size = get_txsize_from_blocklen(bs);
-  const int c0 = av1_filter_intra_taps_4[tx_size][mode][0];
-  const int c1 = av1_filter_intra_taps_4[tx_size][mode][1];
-  const int c2 = av1_filter_intra_taps_4[tx_size][mode][2];
-  const int c3 = av1_filter_intra_taps_4[tx_size][mode][3];
+  const int c0 = filter_intra_taps_4[tx_size][mode][0];
+  const int c1 = filter_intra_taps_4[tx_size][mode][1];
+  const int c2 = filter_intra_taps_4[tx_size][mode][2];
+  const int c3 = filter_intra_taps_4[tx_size][mode][3];
 
   k = 0;
   mean = 0;
@@ -1607,9 +1607,9 @@
   int preds[33][33];
 #endif  // CONFIG_TX64X64
   const TX_SIZE tx_size = get_txsize_from_blocklen(bs);
-  const int c0 = av1_filter_intra_taps_3[tx_size][mode][0];
-  const int c1 = av1_filter_intra_taps_3[tx_size][mode][1];
-  const int c2 = av1_filter_intra_taps_3[tx_size][mode][2];
+  const int c0 = filter_intra_taps_3[tx_size][mode][0];
+  const int c1 = filter_intra_taps_3[tx_size][mode][1];
+  const int c2 = filter_intra_taps_3[tx_size][mode][2];
 
   k = 0;
   mean = 0;
@@ -1651,10 +1651,10 @@
   int preds[33][65];
 #endif  // CONFIG_TX64X64
   const TX_SIZE tx_size = get_txsize_from_blocklen(bs);
-  const int c0 = av1_filter_intra_taps_4[tx_size][mode][0];
-  const int c1 = av1_filter_intra_taps_4[tx_size][mode][1];
-  const int c2 = av1_filter_intra_taps_4[tx_size][mode][2];
-  const int c3 = av1_filter_intra_taps_4[tx_size][mode][3];
+  const int c0 = filter_intra_taps_4[tx_size][mode][0];
+  const int c1 = filter_intra_taps_4[tx_size][mode][1];
+  const int c2 = filter_intra_taps_4[tx_size][mode][2];
+  const int c3 = filter_intra_taps_4[tx_size][mode][3];
 
   k = 0;
   mean = 0;

av1/common/reconintra.h

diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index 3f53b12..5c21e995 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -57,7 +57,6 @@
 
 #if CONFIG_FILTER_INTRA
 #define FILTER_INTRA_PREC_BITS 10
-extern int av1_filter_intra_taps_4[TX_SIZES][FILTER_INTRA_MODES][4];
 #endif  // CONFIG_FILTER_INTRA
 
 #if CONFIG_EXT_INTRA