ref: bd9706506f06972e43ba4f0a054fc5ba3b1072f3
parent: 91442e1626195f269068447a4d5146ecd487a950
parent: 5d9cdac08709d6343fbd028f280a92bd7fd7d04c
author: Jingning Han <[email protected]>
date: Tue Oct 7 09:42:26 EDT 2014
Merge "Move inter filter defs to vp9_filter.h"
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -20,8 +20,6 @@
#endif
#define TX_SIZE_CONTEXTS 2
-#define SWITCHABLE_FILTERS 3 // number of switchable filters
-#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
struct VP9Common;
--- a/vp9/common/vp9_filter.h
+++ b/vp9/common/vp9_filter.h
@@ -35,6 +35,13 @@
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);
--- a/vp9/encoder/vp9_context_tree.h
+++ b/vp9/encoder/vp9_context_tree.h
@@ -11,9 +11,10 @@
#ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
#define VP9_ENCODER_VP9_CONTEXT_TREE_H_
-#include "vp9/common/vp9_entropymode.h"
+#include "vp9/common/vp9_blockd.h"
struct VP9_COMP;
+struct VP9Common;
// Structure to hold snapshot of coding context during the mode picking process
typedef struct {