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

Merge "Reduce size of TOKENEXTRA struct"

Browse Source
This commit is contained in:
John Koleszar 2010-12-13 13:57:55 -08:00 committed by Code Review
commit 398aa81849
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp8/encoder/tokenize.c
View File

@ -131,9 +131,6 @@ static void tokenize2nd_order_b
t->Token = x; t->Token = x;
t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt]; t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
t->section = frametype * BLOCK_TYPES * 2 + 2 * type + (c == 0);
t->skip_eob_node = pt == 0 && ((band > 0 && type > 0) || (band > 1 && type == 0)); t->skip_eob_node = pt == 0 && ((band > 0 && type > 0) || (band > 1 && type == 0));
++cpi->coef_counts [type] [band] [pt] [x]; ++cpi->coef_counts [type] [band] [pt] [x];
@ -184,8 +181,6 @@ static void tokenize1st_order_b
t->Token = x; t->Token = x;
t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt]; t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
t->section = frametype * BLOCK_TYPES * 2 + 2 * type + (c == 0);
t->skip_eob_node = pt == 0 && ((band > 0 && type > 0) || (band > 1 && type == 0)); t->skip_eob_node = pt == 0 && ((band > 0 && type > 0) || (band > 1 && type == 0));
++cpi->coef_counts [type] [band] [pt] [x]; ++cpi->coef_counts [type] [band] [pt] [x];
@ -434,7 +429,6 @@ static __inline void stuff2nd_order_b
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [1] [0] [pt]; t->context_tree = cpi->common.fc.coef_probs [1] [0] [pt];
t->section = 11;
t->skip_eob_node = 0; t->skip_eob_node = 0;
++cpi->coef_counts [1] [0] [pt] [DCT_EOB_TOKEN]; ++cpi->coef_counts [1] [0] [pt] [DCT_EOB_TOKEN];
++t; ++t;
@ -465,7 +459,6 @@ static __inline void stuff1st_order_b
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt]; t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt];
t->section = 8;
t->skip_eob_node = 0; t->skip_eob_node = 0;
++cpi->coef_counts [0] [1] [pt] [DCT_EOB_TOKEN]; ++cpi->coef_counts [0] [1] [pt] [DCT_EOB_TOKEN];
++t; ++t;
@ -495,7 +488,6 @@ void stuff1st_order_buv
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt]; t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
t->section = 13;
t->skip_eob_node = 0; t->skip_eob_node = 0;
++cpi->coef_counts[2] [0] [pt] [DCT_EOB_TOKEN]; ++cpi->coef_counts[2] [0] [pt] [DCT_EOB_TOKEN];
++t; ++t;

7
vp8/encoder/tokenize.h
View File

@ -25,11 +25,10 @@ typedef struct
typedef struct typedef struct
{ {
int Token;
int Extra;
const vp8_prob *context_tree; const vp8_prob *context_tree;
int skip_eob_node; char skip_eob_node;
int section; char Token;
short Extra;
} TOKENEXTRA; } TOKENEXTRA;
int rd_cost_mby(MACROBLOCKD *); int rd_cost_mby(MACROBLOCKD *);