diff options
| author | Jingning Han <jingning@google.com> | 2014-10-07 12:13:33 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-10-07 12:16:37 -0700 |
| commit | 5d9cdac08709d6343fbd028f280a92bd7fd7d04c (patch) | |
| tree | 8118028cdb5fc96384fa45347417fd0d7322903d /vp9 | |
| parent | 5e32036b97f8a154acf708a9fecdc19886e60c0e (diff) | |
| download | libvpx-5d9cdac08709d6343fbd028f280a92bd7fd7d04c.tar libvpx-5d9cdac08709d6343fbd028f280a92bd7fd7d04c.tar.gz libvpx-5d9cdac08709d6343fbd028f280a92bd7fd7d04c.tar.bz2 libvpx-5d9cdac08709d6343fbd028f280a92bd7fd7d04c.zip | |
Move inter filter defs to vp9_filter.h
Add comments on the use case of these definitions. Further reduce
the scope of header file in vp9_context_tree.h.
Change-Id: Ic4a7638e838d0ac441b64abfc56e57354c059d75
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_filter.h | 7 | ||||
| -rw-r--r-- | vp9/encoder/vp9_context_tree.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index 533757bef..6831d3f87 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -20,8 +20,6 @@ extern "C" { #endif #define TX_SIZE_CONTEXTS 2 -#define SWITCHABLE_FILTERS 3 // number of switchable filters -#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1) struct VP9Common; diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h index 8c359c717..3377d45fc 100644 --- a/vp9/common/vp9_filter.h +++ b/vp9/common/vp9_filter.h @@ -35,6 +35,13 @@ typedef enum { 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); diff --git a/vp9/encoder/vp9_context_tree.h b/vp9/encoder/vp9_context_tree.h index 991c6e3a5..6b28ee591 100644 --- 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 { |