diff options
Diffstat (limited to 'third_party/aom/av1/common/filter.h')
-rw-r--r-- | third_party/aom/av1/common/filter.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/aom/av1/common/filter.h b/third_party/aom/av1/common/filter.h index ea7e9cb0b..d791af173 100644 --- a/third_party/aom/av1/common/filter.h +++ b/third_party/aom/av1/common/filter.h @@ -51,16 +51,20 @@ typedef enum { #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 |