diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-15 12:16:50 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-15 12:16:50 -0800 |
| commit | a26899ada5e56e5c1308b79827951241864140fa (patch) | |
| tree | b2e35b741582a25e70fa7632c00ac151155f7fc9 | |
| parent | f1cf4058159fde599b14bcfa1f71b6bf6b686d9a (diff) | |
| parent | b9592fa0b3a87a35b15eac1307df515406f28b16 (diff) | |
| download | libvpx-a26899ada5e56e5c1308b79827951241864140fa.tar libvpx-a26899ada5e56e5c1308b79827951241864140fa.tar.gz libvpx-a26899ada5e56e5c1308b79827951241864140fa.tar.bz2 libvpx-a26899ada5e56e5c1308b79827951241864140fa.zip | |
Merge "Removing intra_mode_stats."
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 7 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 41 |
2 files changed, 0 insertions, 48 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 69c569dc6..ec4dc14f4 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -39,11 +39,7 @@ unsigned __int64 Sectionbits[500]; #endif #ifdef ENTROPY_STATS -int intra_mode_stats[INTRA_MODES] - [INTRA_MODES] - [INTRA_MODES]; vp9_coeff_stats tree_update_hist[TX_SIZES][PLANE_TYPES]; - extern unsigned int active_section; #endif @@ -414,9 +410,6 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, MODE_INFO **mi_8x8, const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, i); const MB_PREDICTION_MODE L = left_block_mode(m, left_mi, i); const int bm = m->bmi[i].as_mode; -#ifdef ENTROPY_STATS - ++intra_mode_stats[A][L][bm]; -#endif write_intra_mode(bc, bm, vp9_kf_y_mode_prob[A][L]); } } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index abdcf2f83..3af950548 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -88,12 +88,6 @@ FILE *keyfile; #endif -#ifdef ENTROPY_STATS -extern int intra_mode_stats[INTRA_MODES] - [INTRA_MODES] - [INTRA_MODES]; -#endif - #ifdef MODE_STATS extern void init_tx_count_stats(); extern void write_tx_count_stats(); @@ -1957,41 +1951,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) { } #endif -#ifdef ENTROPY_STATS - { - int i, j, k; - FILE *fmode = fopen("vp9_modecontext.c", "w"); - - fprintf(fmode, "\n#include \"vp9_entropymode.h\"\n\n"); - fprintf(fmode, "const unsigned int vp9_kf_default_bmode_counts "); - fprintf(fmode, "[INTRA_MODES][INTRA_MODES]" - "[INTRA_MODES] =\n{\n"); - - for (i = 0; i < INTRA_MODES; i++) { - fprintf(fmode, " { // Above Mode : %d\n", i); - - for (j = 0; j < INTRA_MODES; j++) { - fprintf(fmode, " {"); - - for (k = 0; k < INTRA_MODES; k++) { - if (!intra_mode_stats[i][j][k]) - fprintf(fmode, " %5d, ", 1); - else - fprintf(fmode, " %5d, ", intra_mode_stats[i][j][k]); - } - - fprintf(fmode, "}, // left_mode %d\n", j); - } - - fprintf(fmode, " },\n"); - } - - fprintf(fmode, "};\n"); - fclose(fmode); - } -#endif - - #if defined(SECTIONBITS_OUTPUT) if (0) { |