Commit 03eb63c1 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Removing MODE_STATS."

parents aed0d8c4 a0010169
...@@ -21,8 +21,6 @@ extern "C" { ...@@ -21,8 +21,6 @@ extern "C" {
#define SWITCHABLE_FILTERS 3 // number of switchable filters #define SWITCHABLE_FILTERS 3 // number of switchable filters
#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1) #define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
// #define MODE_STATS
struct VP9Common; struct VP9Common;
struct tx_probs { struct tx_probs {
......
...@@ -135,11 +135,6 @@ static void update_switchable_interp_probs(VP9_COMP *cpi, vp9_writer *w) { ...@@ -135,11 +135,6 @@ static void update_switchable_interp_probs(VP9_COMP *cpi, vp9_writer *w) {
prob_diff_update(vp9_switchable_interp_tree, prob_diff_update(vp9_switchable_interp_tree,
cm->fc.switchable_interp_prob[j], cm->fc.switchable_interp_prob[j],
cm->counts.switchable_interp[j], SWITCHABLE_FILTERS, w); 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, static void pack_mb_tokens(vp9_writer* const w,
...@@ -912,10 +907,6 @@ static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *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], vp9_cond_prob_diff_update(w, &cm->fc.tx_probs.p32x32[i][j],
ct_32x32p[j]); ct_32x32p[j]);
} }
#ifdef MODE_STATS
if (!cpi->dummy_packing)
update_tx_count_stats(cm);
#endif
} }
} }
......
...@@ -93,14 +93,6 @@ FILE *kf_list; ...@@ -93,14 +93,6 @@ FILE *kf_list;
FILE *keyfile; FILE *keyfile;
#endif #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 #ifdef SPEEDSTATS
unsigned int frames_at_speed[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unsigned int frames_at_speed[16] = {0, 0, 0, 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) { ...@@ -1632,11 +1624,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
init_context_counters(); init_context_counters();
#endif #endif
#ifdef MODE_STATS
init_tx_count_stats();
init_switchable_interp_stats();
#endif
/*Initialize the feed-forward activity masking.*/ /*Initialize the feed-forward activity masking.*/
cpi->activity_avg = 90 << 12; cpi->activity_avg = 90 << 12;
cpi->key_frame_frequency = cpi->oxcf.key_freq; cpi->key_frame_frequency = cpi->oxcf.key_freq;
...@@ -1893,13 +1880,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) { ...@@ -1893,13 +1880,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) {
vp9_end_second_pass(cpi); 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 #if CONFIG_INTERNAL_STATS
vp9_clear_system_state(); vp9_clear_system_state();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment