summaryrefslogtreecommitdiff
path: root/chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h')
-rw-r--r--chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h b/chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h
index 3377d45fc0e..d963ee23569 100644
--- a/chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h
+++ b/chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_filter.h
@@ -31,17 +31,14 @@ typedef enum {
EIGHTTAP = 0,
EIGHTTAP_SMOOTH = 1,
EIGHTTAP_SHARP = 2,
+ SWITCHABLE_FILTERS = 3, /* Number of switchable filters */
BILINEAR = 3,
+ // The codec can operate in four possible inter prediction filter mode:
+ // 8-tap, 8-tap-smooth, 8-tap-sharp, and switching between the three.
+ SWITCHABLE_FILTER_CONTEXTS = SWITCHABLE_FILTERS + 1,
SWITCHABLE = 4 /* should be the last one */
} INTERP_FILTER;
-// Number of switchable filters
-#define SWITCHABLE_FILTERS 3
-
-// The codec can operate in four possible inter prediction filter mode:
-// 8-tap, 8-tap-smooth, 8-tap-sharp, and switching between the three.
-#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
-
typedef int16_t InterpKernel[SUBPEL_TAPS];
const InterpKernel *vp9_get_interp_kernel(INTERP_FILTER filter);