diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-18 13:43:01 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-30 11:33:43 -0700 |
| commit | 5259744145fe4ff41d3c814514c0744444969ad3 (patch) | |
| tree | 429422064c8a5424f64a2112d4067877e24fb2f7 /vp8/common/entropymode.h | |
| parent | 96f9473866194101807869ef6b0259849d233c77 (diff) | |
| download | libvpx-5259744145fe4ff41d3c814514c0744444969ad3.tar libvpx-5259744145fe4ff41d3c814514c0744444969ad3.tar.gz libvpx-5259744145fe4ff41d3c814514c0744444969ad3.tar.bz2 libvpx-5259744145fe4ff41d3c814514c0744444969ad3.zip | |
Adds support for switchable interpolation filters.
Allows for swtiching/setting interpolation filters at the MB
level. A frame level flag indicates whether to use a specifc
filter for the entire frame or to signal the interpolation
filter for each MB. When switchable filters are used, the
encoder chooses between 8-tap and 8-tap sharp filters. The
code currently has options to explore other variations as well,
which will be cleaned up subsequently.
One issue with the framework is that encoding is slow. I
tried to do some tricks to speed things up but it is still slow.
Decoding speed should not be affected since the number of
filter taps remain unchanged.
With the current version, we are up 0.5% on derf on average but
some videos city/mobile improve by close to 4 and 2% respectively.
If we did a full-search by turning the SEARCH_BEST_FILTER flag
on, the results are somewhat better.
The framework can be combined with filtered prediction, and I
seek feedback regarding that.
Rebased.
Change-Id: I8f632cb2c111e76284140a2bd480945d6d42b77a
Diffstat (limited to 'vp8/common/entropymode.h')
| -rw-r--r-- | vp8/common/entropymode.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index f66c1c859..f9cc263b9 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -12,9 +12,12 @@ #ifndef __INC_ENTROPYMODE_H #define __INC_ENTROPYMODE_H -#include "onyxc_int.h" +#include "blockd.h" #include "treecoder.h" +#define SUBMVREF_COUNT 5 +#define VP8_NUMMBSPLITS 4 + typedef const int vp8_mbsplit[16]; extern vp8_mbsplit vp8_mbsplits [VP8_NUMMBSPLITS]; @@ -56,10 +59,11 @@ extern struct vp8_token_struct vp8_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; void vp8_entropy_mode_init(void); -void vp8_init_mbmode_probs(VP8_COMMON *x); -extern void vp8_init_mode_contexts(VP8_COMMON *pc); -extern void vp8_update_mode_context(VP8_COMMON *pc);; -extern void vp8_accum_mv_refs(VP8_COMMON *pc, +struct VP8Common; +void vp8_init_mbmode_probs(struct VP8Common *x); +extern void vp8_init_mode_contexts(struct VP8Common *pc); +extern void vp8_update_mode_context(struct VP8Common *pc);; +extern void vp8_accum_mv_refs(struct VP8Common *pc, MB_PREDICTION_MODE m, const int ct[4]); @@ -67,4 +71,17 @@ void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]); void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]); void vp8_adapt_mode_probs(struct VP8Common *); + +#if CONFIG_SWITCHABLE_INTERP +#define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */ +extern const INTERPOLATIONFILTERTYPE vp8_switchable_interp + [VP8_SWITCHABLE_FILTERS]; +extern const int vp8_switchable_interp_map[SWITCHABLE+1]; +extern const vp8_tree_index vp8_switchable_interp_tree + [2*(VP8_SWITCHABLE_FILTERS-1)]; +extern struct vp8_token_struct vp8_switchable_interp_encodings + [VP8_SWITCHABLE_FILTERS]; +extern const vp8_prob vp8_switchable_interp_prob + [VP8_SWITCHABLE_FILTERS+1][VP8_SWITCHABLE_FILTERS-1]; +#endif #endif |