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/encoder/tokenize.c | |
| 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/encoder/tokenize.c')
| -rw-r--r-- | vp8/encoder/tokenize.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index 673c2dd45..50a31643d 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -630,9 +630,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) { int has_y2_block; int b; int tx_type = x->mode_info_context->mbmi.txfm_size; -#if CONFIG_NEWENTROPY int mb_skip_context = get_pred_context(&cpi->common, x, PRED_MBSKIP); -#endif // If the MB is going to be skipped because of a segment level flag // exclude this from the skip count stats used to calculate the @@ -661,11 +659,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) { mb_is_skippable(x, has_y2_block)); if (x->mode_info_context->mbmi.mb_skip_coeff) { -#if CONFIG_NEWENTROPY cpi->skip_true_count[mb_skip_context] += skip_inc; -#else - cpi->skip_true_count += skip_inc; -#endif if (!cpi->common.mb_no_coeff_skip) { if (tx_type == TX_8X8) @@ -679,11 +673,7 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) { return; } -#if CONFIG_NEWENTROPY cpi->skip_false_count[mb_skip_context] += skip_inc; -#else - cpi->skip_false_count += skip_inc; -#endif plane_type = 3; if (has_y2_block) { |