ref: 398aa81849584ef06216079bb98065b3303fbf27
parent: 136bd2455e0e04298c7478e5a1a15ba4f065338c
parent: b7b1e6fb55c6b12ccd078a20cb9855f6734931b5
author: John Koleszar <jkoleszar@google.com>
date: Mon Dec 13 08:57:55 EST 2010
Merge "Reduce size of TOKENEXTRA struct"
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -131,9 +131,6 @@
t->Token = x;
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));
++cpi->coef_counts [type] [band] [pt] [x];
@@ -184,8 +181,6 @@
t->Token = x;
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));
++cpi->coef_counts [type] [band] [pt] [x];
@@ -434,7 +429,6 @@
t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [1] [0] [pt];
- t->section = 11;
t->skip_eob_node = 0;
++cpi->coef_counts [1] [0] [pt] [DCT_EOB_TOKEN];
++t;
@@ -465,7 +459,6 @@
t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt];
- t->section = 8;
t->skip_eob_node = 0;
++cpi->coef_counts [0] [1] [pt] [DCT_EOB_TOKEN];
++t;
@@ -495,7 +488,6 @@
t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
- t->section = 13;
t->skip_eob_node = 0;
++cpi->coef_counts[2] [0] [pt] [DCT_EOB_TOKEN];
++t;
--- a/vp8/encoder/tokenize.h
+++ b/vp8/encoder/tokenize.h
@@ -25,11 +25,10 @@
typedef struct
{- int Token;
- int Extra;
const vp8_prob *context_tree;
- int skip_eob_node;
- int section;
+ char skip_eob_node;
+ char Token;
+ short Extra;
} TOKENEXTRA;
int rd_cost_mby(MACROBLOCKD *);
--
⑨