diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 11:29:46 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:12:39 -0700 |
| commit | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (patch) | |
| tree | 2918641823325be67304c719165ab25f982ad5e8 /vp8/common/onyxc_int.h | |
| parent | 10a492847f2af49eb8842b17658c5063fae3689b (diff) | |
| download | libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.gz libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.bz2 libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.zip | |
Merges several experiments
The following five experiments are merged:
newentropy
newupdate
adaptive_entropy (also includes a couple of parameter changes
that improves results a little
in common/entropymode.c and encoder/modecosts.c
that were not merged from the internal branch)
newintramodes
expanded_coef_context
Change-Id: I8a142a831786ee9dc936f22be1d42a8bced7d270
Diffstat (limited to 'vp8/common/onyxc_int.h')
| -rw-r--r-- | vp8/common/onyxc_int.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 16f52d697..8f2417f66 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -55,7 +55,6 @@ typedef struct frame_contexts { #if CONFIG_HIGH_PRECISION_MV MV_CONTEXT_HP mvc_hp[2]; #endif -#if CONFIG_ADAPTIVE_ENTROPY MV_CONTEXT pre_mvc[2]; #if CONFIG_HIGH_PRECISION_MV MV_CONTEXT_HP pre_mvc_hp[2]; @@ -83,7 +82,6 @@ typedef struct frame_contexts { #if CONFIG_HIGH_PRECISION_MV unsigned int MVcount_hp [2] [MVvals_hp]; #endif -#endif /* CONFIG_ADAPTIVE_ENTROPY */ int mode_context[6][4]; int mode_context_a[6][4]; int vp8_mode_contexts[6][4]; @@ -249,9 +247,7 @@ typedef struct VP8Common { vp8_prob prob_comppred[COMP_PRED_CONTEXTS]; -#if CONFIG_NEWENTROPY vp8_prob mbskip_pred_probs[MBSKIP_CONTEXTS]; -#endif FRAME_CONTEXT lfc_a; /* last alt ref entropy */ FRAME_CONTEXT lfc; /* last frame entropy */ |