ref: a26899ada5e56e5c1308b79827951241864140fa
parent: f1cf4058159fde599b14bcfa1f71b6bf6b686d9a
parent: b9592fa0b3a87a35b15eac1307df515406f28b16
author: Dmitry Kovalev <[email protected]>
date: Wed Jan 15 07:16:50 EST 2014
Merge "Removing intra_mode_stats."
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -39,11 +39,7 @@
#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 @@
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]);
}
}
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -88,12 +88,6 @@
#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();
@@ -1956,41 +1950,6 @@
fclose(f);
}
#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)