Commit 407eb03a authored by Deb Mukherjee's avatar Deb Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Build fix when ENTROPY_STATS is defined" into experimental

parents 5c05fbf6 a09707b7
...@@ -40,9 +40,9 @@ unsigned __int64 Sectionbits[500]; ...@@ -40,9 +40,9 @@ unsigned __int64 Sectionbits[500];
#endif #endif
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
int intra_mode_stats[VP9_KF_BINTRAMODES] int intra_mode_stats[VP9_BINTRAMODES]
[VP9_KF_BINTRAMODES] [VP9_BINTRAMODES]
[VP9_KF_BINTRAMODES]; [VP9_BINTRAMODES];
vp9_coeff_stats tree_update_hist_4x4[BLOCK_TYPES]; vp9_coeff_stats tree_update_hist_4x4[BLOCK_TYPES];
vp9_coeff_stats tree_update_hist_8x8[BLOCK_TYPES]; vp9_coeff_stats tree_update_hist_8x8[BLOCK_TYPES];
vp9_coeff_stats tree_update_hist_16x16[BLOCK_TYPES]; vp9_coeff_stats tree_update_hist_16x16[BLOCK_TYPES];
......
...@@ -103,9 +103,9 @@ extern int skip_false_count; ...@@ -103,9 +103,9 @@ extern int skip_false_count;
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
extern int intra_mode_stats[VP9_KF_BINTRAMODES] extern int intra_mode_stats[VP9_BINTRAMODES]
[VP9_KF_BINTRAMODES] [VP9_BINTRAMODES]
[VP9_KF_BINTRAMODES]; [VP9_BINTRAMODES];
#endif #endif
#ifdef NMV_STATS #ifdef NMV_STATS
...@@ -1753,18 +1753,18 @@ void vp9_remove_compressor(VP9_PTR *ptr) { ...@@ -1753,18 +1753,18 @@ void vp9_remove_compressor(VP9_PTR *ptr) {
fprintf(fmode, "\n#include \"vp9_entropymode.h\"\n\n"); fprintf(fmode, "\n#include \"vp9_entropymode.h\"\n\n");
fprintf(fmode, "const unsigned int vp9_kf_default_bmode_counts "); fprintf(fmode, "const unsigned int vp9_kf_default_bmode_counts ");
fprintf(fmode, "[VP9_KF_BINTRAMODES][VP9_KF_BINTRAMODES]" fprintf(fmode, "[VP9_BINTRAMODES][VP9_BINTRAMODES]"
"[VP9_KF_BINTRAMODES] =\n{\n"); "[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); fprintf(fmode, " { // Above Mode : %d\n", i);
for (j = 0; j < VP9_KF_BINTRAMODES; j++) { for (j = 0; j < VP9_BINTRAMODES; j++) {
fprintf(fmode, " {"); fprintf(fmode, " {");
for (k = 0; k < VP9_KF_BINTRAMODES; k++) { for (k = 0; k < VP9_BINTRAMODES; k++) {
if (!intra_mode_stats[i][j][k]) if (!intra_mode_stats[i][j][k])
fprintf(fmode, " %5d, ", 1); fprintf(fmode, " %5d, ", 1);
else else
......
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