shithub: libvpx

Info  •  Files  •  Log  •  Branches

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 {