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

Merge "New default coefficient/band probabilities." into experimental

Browse Source
This commit is contained in:
Ronald S. Bultje 2012-12-13 09:56:50 -08:00 committed by Gerrit Code Review
commit f4608e3606
2 changed files with 1167 additions and 1309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2415
vp9/common/vp9_default_coef_probs.h
View File

File diff suppressed because it is too large Load Diff

25
vp9/encoder/vp9_tokenize.c
View File

@ -595,14 +595,17 @@ static void print_probs(FILE *f, vp9_coeff_accum *context_counters,
int block_types, const char *header) {
int type, band, pt, t;
fprintf(f, "static const vp9_coeff_probs %s = {\n", header);
fprintf(f, "static const vp9_coeff_probs %s = {", header);
type = 0;
#define Newline(x, spaces) (x ? " " : "\n" spaces)
do {
fprintf(f, "%s\n { /* block Type %d */", Comma(type), type);
fprintf(f, "%s%s{ /* block Type %d */",
Comma(type), Newline(type, " "), type);
band = 0;
do {
fprintf(f, "%s\n { /* Coeff Band %d */", Comma(band), band);
fprintf(f, "%s%s{ /* Coeff Band %d */",
Comma(band), Newline(band, " "), band);
pt = 0;
do {
unsigned int branch_ct[ENTROPY_NODES][2];
@ -618,7 +621,7 @@ static void print_probs(FILE *f, vp9_coeff_accum *context_counters,
t = 0;
do {
fprintf(f, "%s %d", Comma(t), coef_probs[t]);
fprintf(f, "%s %3d", Comma(t), coef_probs[t]);
} while (++t < ENTROPY_NODES);
fprintf(f, " }");
@ -656,20 +659,20 @@ void print_context_counters() {
/* print coefficient probabilities */
print_probs(f, context_counters_4x4, BLOCK_TYPES_4X4,
"vp9_default_coef_probs_4x4[BLOCK_TYPES_4X4]");
"default_coef_probs_4x4[BLOCK_TYPES_4X4]");
print_probs(f, hybrid_context_counters_4x4, BLOCK_TYPES_4X4,
"vp9_default_hybrid_coef_probs_4x4[BLOCK_TYPES_4X4]");
"default_hybrid_coef_probs_4x4[BLOCK_TYPES_4X4]");
print_probs(f, context_counters_8x8, BLOCK_TYPES_8X8,
"vp9_default_coef_probs_8x8[BLOCK_TYPES_8X8]");
"default_coef_probs_8x8[BLOCK_TYPES_8X8]");
print_probs(f, hybrid_context_counters_8x8, BLOCK_TYPES_8X8,
"vp9_default_hybrid_coef_probs_8x8[BLOCK_TYPES_8X8]");
"default_hybrid_coef_probs_8x8[BLOCK_TYPES_8X8]");
print_probs(f, context_counters_16x16, BLOCK_TYPES_16X16,
"vp9_default_coef_probs_16x16[BLOCK_TYPES_16X16]");
"default_coef_probs_16x16[BLOCK_TYPES_16X16]");
print_probs(f, hybrid_context_counters_16x16, BLOCK_TYPES_16X16,
"vp9_default_hybrid_coef_probs_16x16[BLOCK_TYPES_16X16]");
"default_hybrid_coef_probs_16x16[BLOCK_TYPES_16X16]");
#if CONFIG_TX32X32
print_probs(f, context_counters_32x32, BLOCK_TYPES_32X32,
"vp9_default_coef_probs_32x32[BLOCK_TYPES_32X32]");
"default_coef_probs_32x32[BLOCK_TYPES_32X32]");
#endif
fclose(f);