From 9984a155d6bb7b81bbe2260e0f5807208fa103e2 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 27 Jul 2012 11:29:46 -0700 Subject: 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 --- vp8/encoder/tokenize.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'vp8/encoder/tokenize.c') 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) { -- cgit v1.2.3