commit 7b35d733e96bfccd8feb0ce23b34d27751e25b2c
author Frederic Barbier <frederic.barbier@allegrodvt.com> Tue Jul 11 17:32:39 2017 +0200
committer Fred BARBIER <frederic.barbier@allegrodvt.com> Tue Jul 11 17:53:00 2017 +0000
tree 8802d72c30fdd66adec9dbc6ca5f8c57e623b564
parent 7e243a1f94f1861b74ca3e854f79d6ef89f1a634

Fix LOG_SWITCHABLE_FILTERS

Set LOG_SWITCHABLE_FILTERS accordingly to USE_EXTRA_FILTER

Change-Id: I453fe201a66ec725061899337b17d517c57b9e7a

av1/common/filter.h

diff --git a/av1/common/filter.h b/av1/common/filter.h
index ea7e9cb..d791af1 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -51,16 +51,20 @@
 #endif
 } InterpFilter;
 
-#if CONFIG_DUAL_FILTER
-#define MAX_SUBPEL_TAPS 12
+#if USE_EXTRA_FILTER
 #define LOG_SWITCHABLE_FILTERS \
   3 /* (1 << LOG_SWITCHABLE_FILTERS) > SWITCHABLE_FILTERS */
+#else
+#define LOG_SWITCHABLE_FILTERS \
+  2 /* (1 << LOG_SWITCHABLE_FILTERS) > SWITCHABLE_FILTERS */
+#endif
+
+#if CONFIG_DUAL_FILTER
+#define MAX_SUBPEL_TAPS 12
 #define SWITCHABLE_FILTER_CONTEXTS ((SWITCHABLE_FILTERS + 1) * 4)
 #define INTER_FILTER_COMP_OFFSET (SWITCHABLE_FILTERS + 1)
 #define INTER_FILTER_DIR_OFFSET ((SWITCHABLE_FILTERS + 1) * 2)
 #else  // CONFIG_DUAL_FILTER
-#define LOG_SWITCHABLE_FILTERS \
-  2 /* (1 << LOG_SWITCHABLE_FILTERS) > SWITCHABLE_FILTERS */
 #define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
 #endif  // CONFIG_DUAL_FILTER