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

Fixing member names inside TOKENVALUE and TOKENEXTRA structs.

Browse Source 
Change-Id: I183ec5819d4d80966c92db36db75b8c3be0d381d
This commit is contained in:
Dmitry Kovalev 2013-04-18 16:18:08 -07:00
parent 54f843c891
commit 77f4697a13
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp9/encoder/vp9_bitstream.c
View File

@ -469,7 +469,7 @@ static void pack_mb_tokens(vp9_writer* const bc,
TOKENEXTRA *p = *tp; TOKENEXTRA *p = *tp;
while (p < stop) { while (p < stop) {
const int t = p->Token; const int t = p->token;
const struct vp9_token *const a = vp9_coef_encodings + t; const struct vp9_token *const a = vp9_coef_encodings + t;
const vp9_extra_bit_struct *const b = vp9_extra_bits + t; const vp9_extra_bit_struct *const b = vp9_extra_bits + t;
int i = 0; int i = 0;
@ -497,7 +497,7 @@ static void pack_mb_tokens(vp9_writer* const bc,
if (b->base_val) { if (b->base_val) {
const int e = p->Extra, L = b->Len; const int e = p->extra, L = b->Len;
if (L) { if (L) {
const unsigned char *pp = b->prob; const unsigned char *pp = b->prob;

14
vp9/encoder/vp9_encodeframe.c
View File

@ -870,7 +870,7 @@ static void encode_sb(VP9_COMP *cpi,
update_stats(cpi, mb_row, mb_col); update_stats(cpi, mb_row, mb_col);
cpi->partition_count[partition_plane(bsize)][PARTITION_NONE]++; cpi->partition_count[partition_plane(bsize)][PARTITION_NONE]++;
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
#if CONFIG_SBSEGMENT #if CONFIG_SBSEGMENT
@ -888,7 +888,7 @@ static void encode_sb(VP9_COMP *cpi,
if (output_enabled) { if (output_enabled) {
update_stats(cpi, mb_row, mb_col + i); update_stats(cpi, mb_row, mb_col + i);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
} }
@ -906,7 +906,7 @@ static void encode_sb(VP9_COMP *cpi,
if (output_enabled) { if (output_enabled) {
update_stats(cpi, mb_row + i, mb_col); update_stats(cpi, mb_row + i, mb_col);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
} }
@ -937,7 +937,7 @@ static void encode_sb(VP9_COMP *cpi,
if (output_enabled) { if (output_enabled) {
update_stats(cpi, mb_row + y_idx, mb_col + x_idx); update_stats(cpi, mb_row + y_idx, mb_col + x_idx);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
} }
@ -970,7 +970,7 @@ static void encode_sb64(VP9_COMP *cpi,
1, mb_row, mb_col, bsize); 1, mb_row, mb_col, bsize);
update_stats(cpi, mb_row, mb_col); update_stats(cpi, mb_row, mb_col);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
cpi->partition_count[partition_plane(bsize)][PARTITION_NONE]++; cpi->partition_count[partition_plane(bsize)][PARTITION_NONE]++;
#if CONFIG_SBSEGMENT #if CONFIG_SBSEGMENT
@ -985,7 +985,7 @@ static void encode_sb64(VP9_COMP *cpi,
1, mb_row, mb_col + i * 2, BLOCK_SIZE_SB32X64); 1, mb_row, mb_col + i * 2, BLOCK_SIZE_SB32X64);
update_stats(cpi, mb_row, mb_col + i * 2); update_stats(cpi, mb_row, mb_col + i * 2);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
} else if (is_sb[0] == BLOCK_SIZE_SB64X32) { } else if (is_sb[0] == BLOCK_SIZE_SB64X32) {
@ -999,7 +999,7 @@ static void encode_sb64(VP9_COMP *cpi,
1, mb_row + i * 2, mb_col, BLOCK_SIZE_SB64X32); 1, mb_row + i * 2, mb_col, BLOCK_SIZE_SB64X32);
update_stats(cpi, mb_row + i * 2, mb_col); update_stats(cpi, mb_row + i * 2, mb_col);
(*tp)->Token = EOSB_TOKEN; (*tp)->token = EOSB_TOKEN;
(*tp)++; (*tp)++;
} }
#endif #endif

6
vp9/encoder/vp9_encodemb.c
View File

@ -429,7 +429,7 @@ static void optimize_b(VP9_COMMON *const cm,
*(tokens[eob] + 1) = *(tokens[eob] + 0); *(tokens[eob] + 1) = *(tokens[eob] + 0);
next = eob; next = eob;
for (i = 0; i < eob; i++) for (i = 0; i < eob; i++)
token_cache[i] = vp9_dct_value_tokens_ptr[qcoeff_ptr[scan[i]]].Token; token_cache[i] = vp9_dct_value_tokens_ptr[qcoeff_ptr[scan[i]]].token;
nb = vp9_get_coef_neighbors_handle(scan, &pad); nb = vp9_get_coef_neighbors_handle(scan, &pad);
for (i = eob; i-- > i0;) { for (i = eob; i-- > i0;) {
@ -448,7 +448,7 @@ static void optimize_b(VP9_COMMON *const cm,
/* Evaluate the first possibility for this state. */ /* Evaluate the first possibility for this state. */
rate0 = tokens[next][0].rate; rate0 = tokens[next][0].rate;
rate1 = tokens[next][1].rate; rate1 = tokens[next][1].rate;
t0 = (vp9_dct_value_tokens_ptr + x)->Token; t0 = (vp9_dct_value_tokens_ptr + x)->token;
/* Consider both possible successor states. */ /* Consider both possible successor states. */
if (next < default_eob) { if (next < default_eob) {
band = get_coef_band(scan, tx_size, i + 1); band = get_coef_band(scan, tx_size, i + 1);
@ -509,7 +509,7 @@ static void optimize_b(VP9_COMMON *const cm,
} }
#endif #endif
} else { } else {
t0 = t1 = (vp9_dct_value_tokens_ptr + x)->Token; t0 = t1 = (vp9_dct_value_tokens_ptr + x)->token;
} }
if (next < default_eob) { if (next < default_eob) {
band = get_coef_band(scan, tx_size, i + 1); band = get_coef_band(scan, tx_size, i + 1);

2
vp9/encoder/vp9_rdopt.c
View File

@ -516,7 +516,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
#endif #endif
for (; c < eob; c++) { for (; c < eob; c++) {
int v = qcoeff_ptr[scan[c]]; int v = qcoeff_ptr[scan[c]];
int t = vp9_dct_value_tokens_ptr[v].Token; int t = vp9_dct_value_tokens_ptr[v].token;
#if CONFIG_CODE_NONZEROCOUNT #if CONFIG_CODE_NONZEROCOUNT
nzc += (v != 0); nzc += (v != 0);
#endif #endif

20
vp9/encoder/vp9_tokenize.c
View File

@ -77,21 +77,21 @@ static void fill_value_tokens() {
while (++j < 11 && e[j].base_val <= a) {} while (++j < 11 && e[j].base_val <= a) {}
t[i].Token = --j; t[i].token = --j;
eb |= (a - e[j].base_val) << 1; eb |= (a - e[j].base_val) << 1;
} else } else
t[i].Token = a; t[i].token = a;
t[i].Extra = eb; t[i].extra = eb;
} }
// initialize the cost for extra bits for all possible coefficient value. // initialize the cost for extra bits for all possible coefficient value.
{ {
int cost = 0; int cost = 0;
vp9_extra_bit_struct *p = vp9_extra_bits + t[i].Token; vp9_extra_bit_struct *p = vp9_extra_bits + t[i].token;
if (p->base_val) { if (p->base_val) {
const int extra = t[i].Extra; const int extra = t[i].extra;
const int Length = p->Len; const int Length = p->Len;
if (Length) if (Length)
@ -307,8 +307,8 @@ static void tokenize_b(VP9_COMP *cpi,
v = qcoeff_ptr[rc]; v = qcoeff_ptr[rc];
assert(-DCT_MAX_VALUE <= v && v < DCT_MAX_VALUE); assert(-DCT_MAX_VALUE <= v && v < DCT_MAX_VALUE);
t->Extra = vp9_dct_value_tokens_ptr[v].Extra; t->extra = vp9_dct_value_tokens_ptr[v].extra;
token = vp9_dct_value_tokens_ptr[v].Token; token = vp9_dct_value_tokens_ptr[v].token;
} else { } else {
#if CONFIG_CODE_NONZEROCOUNT #if CONFIG_CODE_NONZEROCOUNT
if (nzc_used) if (nzc_used)
@ -318,7 +318,7 @@ static void tokenize_b(VP9_COMP *cpi,
token = DCT_EOB_TOKEN; token = DCT_EOB_TOKEN;
} }
t->Token = token; t->token = token;
t->context_tree = probs[type][ref][band][pt]; t->context_tree = probs[type][ref][band][pt];
#if CONFIG_CODE_NONZEROCOUNT #if CONFIG_CODE_NONZEROCOUNT
// Skip zero node if there are no zeros left // Skip zero node if there are no zeros left
@ -327,7 +327,7 @@ static void tokenize_b(VP9_COMP *cpi,
else else
#endif #endif
t->skip_eob_node = (c > 0) && (token_cache[c - 1] == 0); t->skip_eob_node = (c > 0) && (token_cache[c - 1] == 0);
assert(vp9_coef_encodings[t->Token].len - t->skip_eob_node > 0); assert(vp9_coef_encodings[t->token].len - t->skip_eob_node > 0);
if (!dry_run) { if (!dry_run) {
++counts[type][ref][band][pt][token]; ++counts[type][ref][band][pt][token];
if (!t->skip_eob_node) if (!t->skip_eob_node)
@ -809,7 +809,7 @@ static void stuff_b(VP9_COMP *cpi,
#endif #endif
pt = combine_entropy_contexts(a_ec, l_ec); pt = combine_entropy_contexts(a_ec, l_ec);
band = 0; band = 0;
t->Token = DCT_EOB_TOKEN; t->token = DCT_EOB_TOKEN;
t->context_tree = probs[type][ref][band][pt]; t->context_tree = probs[type][ref][band][pt];
t->skip_eob_node = 0; t->skip_eob_node = 0;
++t; ++t;

8
vp9/encoder/vp9_tokenize.h
View File

@ -17,14 +17,14 @@
void vp9_tokenize_initialize(); void vp9_tokenize_initialize();
typedef struct { typedef struct {
int16_t Token; int16_t token;
int16_t Extra; int16_t extra;
} TOKENVALUE; } TOKENVALUE;
typedef struct { typedef struct {
const vp9_prob *context_tree; const vp9_prob *context_tree;
int16_t Extra; int16_t extra;
uint8_t Token; uint8_t token;
uint8_t skip_eob_node; uint8_t skip_eob_node;
} TOKENEXTRA; } TOKENEXTRA;