diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-24 15:53:12 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-24 15:53:12 -0800 |
| commit | 03eb63c1148be2c7267a8a01796dce700fe22fb7 (patch) | |
| tree | e79a537f2afb501d4fa47e9c3e48b3909ba5cc03 /vp9 | |
| parent | aed0d8c463032f9e652f0f0a4fe1a84ff27240a2 (diff) | |
| parent | a0010169962663eac4102d6471d098591ed5b596 (diff) | |
| download | libvpx-03eb63c1148be2c7267a8a01796dce700fe22fb7.tar libvpx-03eb63c1148be2c7267a8a01796dce700fe22fb7.tar.gz libvpx-03eb63c1148be2c7267a8a01796dce700fe22fb7.tar.bz2 libvpx-03eb63c1148be2c7267a8a01796dce700fe22fb7.zip | |
Merge "Removing MODE_STATS."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 20 |
3 files changed, 0 insertions, 31 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index edb03961c..deec3f652 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -21,8 +21,6 @@ extern "C" { #define SWITCHABLE_FILTERS 3 // number of switchable filters #define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1) -// #define MODE_STATS - struct VP9Common; struct tx_probs { diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 2ab4c7907..892c4a7ec 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -135,11 +135,6 @@ static void update_switchable_interp_probs(VP9_COMP *cpi, vp9_writer *w) { prob_diff_update(vp9_switchable_interp_tree, cm->fc.switchable_interp_prob[j], cm->counts.switchable_interp[j], SWITCHABLE_FILTERS, w); - -#ifdef MODE_STATS - if (!cpi->dummy_packing) - update_switchable_interp_stats(cm); -#endif } static void pack_mb_tokens(vp9_writer* const w, @@ -912,10 +907,6 @@ static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *w) { vp9_cond_prob_diff_update(w, &cm->fc.tx_probs.p32x32[i][j], ct_32x32p[j]); } -#ifdef MODE_STATS - if (!cpi->dummy_packing) - update_tx_count_stats(cm); -#endif } } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index e620f9ae3..38189edca 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -93,14 +93,6 @@ FILE *kf_list; FILE *keyfile; #endif - -#ifdef MODE_STATS -extern void init_tx_count_stats(); -extern void write_tx_count_stats(); -extern void init_switchable_interp_stats(); -extern void write_switchable_interp_stats(); -#endif - #ifdef SPEEDSTATS unsigned int frames_at_speed[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; @@ -1632,11 +1624,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { init_context_counters(); #endif -#ifdef MODE_STATS - init_tx_count_stats(); - init_switchable_interp_stats(); -#endif - /*Initialize the feed-forward activity masking.*/ cpi->activity_avg = 90 << 12; cpi->key_frame_frequency = cpi->oxcf.key_freq; @@ -1893,13 +1880,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) { vp9_end_second_pass(cpi); } -#ifdef MODE_STATS - if (cpi->pass != 1) { - write_tx_count_stats(); - write_switchable_interp_stats(); - } -#endif - #if CONFIG_INTERNAL_STATS vp9_clear_system_state(); |