generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build fix when ENTROPY_STATS is defined

Browse Source 
Fixes a build issue due to removal of VP9_KF_BINTRAMODES macro,
when ENTROPY_STATS is on.

Change-Id: I75c61702bf626376c942ab49ab887714b43284f0
This commit is contained in:
Deb Mukherjee
2013-05-28 17:07:27 -07:00
parent 3d4e032e16
commit a09707b7be
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_bitstream.c
View File

@@ -38,9 +38,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];

16
vp9/encoder/vp9_onyx_if.c
View File

@@ -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
@@ -1756,18 +1756,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