ref: 407eb03ad7f65d951a2e89b03a09a118e9e0610f
parent: 5c05fbf6bb85d376713b6feca412357d336243bf
parent: a09707b7be7d92bfae364c96adeb50aed54ce9f9
author: Deb Mukherjee <debargha@google.com>
date: Wed May 29 13:01:43 EDT 2013
Merge "Build fix when ENTROPY_STATS is defined" into experimental
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -40,9 +40,9 @@
#endif
#ifdef ENTROPY_STATS
-int intra_mode_stats[VP9_KF_BINTRAMODES]
- [VP9_KF_BINTRAMODES]
- [VP9_KF_BINTRAMODES];
+int intra_mode_stats[VP9_BINTRAMODES]
+ [VP9_BINTRAMODES]
+ [VP9_BINTRAMODES];
vp9_coeff_stats tree_update_hist_4x4[BLOCK_TYPES];
vp9_coeff_stats tree_update_hist_8x8[BLOCK_TYPES];
vp9_coeff_stats tree_update_hist_16x16[BLOCK_TYPES];
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -103,9 +103,9 @@
#ifdef ENTROPY_STATS
-extern int intra_mode_stats[VP9_KF_BINTRAMODES]
- [VP9_KF_BINTRAMODES]
- [VP9_KF_BINTRAMODES];
+extern int intra_mode_stats[VP9_BINTRAMODES]
+ [VP9_BINTRAMODES]
+ [VP9_BINTRAMODES];
#endif
#ifdef NMV_STATS
@@ -1753,18 +1753,18 @@
fprintf(fmode, "\n#include \"vp9_entropymode.h\"\n\n");
fprintf(fmode, "const unsigned int vp9_kf_default_bmode_counts ");
- fprintf(fmode, "[VP9_KF_BINTRAMODES][VP9_KF_BINTRAMODES]"
- "[VP9_KF_BINTRAMODES] =\n{\n");+ fprintf(fmode, "[VP9_BINTRAMODES][VP9_BINTRAMODES]"
+ "[VP9_BINTRAMODES] =\n{\n");- for (i = 0; i < VP9_KF_BINTRAMODES; i++) {+ for (i = 0; i < VP9_BINTRAMODES; i++) { fprintf(fmode, " { // Above Mode : %d\n", i);- for (j = 0; j < VP9_KF_BINTRAMODES; j++) {+ for (j = 0; j < VP9_BINTRAMODES; j++) { fprintf(fmode, " {");- for (k = 0; k < VP9_KF_BINTRAMODES; k++) {+ for (k = 0; k < VP9_BINTRAMODES; k++) {if (!intra_mode_stats[i][j][k])
fprintf(fmode, " %5d, ", 1);
else