From 41f4458a030dfd545078a10c1f5097702d6ccdd1 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Mon, 13 Dec 2010 17:11:48 -0500 Subject: [PATCH] Revert "Reduce size of TOKENEXTRA struct" This reverts commit b7b1e6fb55c6b12ccd078a20cb9855f6734931b5. Previous fix is incomplete, breaks ARM. Itchy submit finger. Change-Id: I939dc0d3bf4173cf951c1d152338ab6ea2184bb9 --- vp8/encoder/tokenize.c | 8 ++++++++ vp8/encoder/tokenize.h | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index 50dabf4a5..e4da83379 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -131,6 +131,9 @@ static void tokenize2nd_order_b 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]; @@ -181,6 +184,8 @@ static void tokenize1st_order_b 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]; @@ -429,6 +434,7 @@ static __inline void stuff2nd_order_b 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; @@ -459,6 +465,7 @@ static __inline void stuff1st_order_b 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; @@ -488,6 +495,7 @@ void stuff1st_order_buv 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; diff --git a/vp8/encoder/tokenize.h b/vp8/encoder/tokenize.h index cb5b15405..01e8ec6d7 100644 --- a/vp8/encoder/tokenize.h +++ b/vp8/encoder/tokenize.h @@ -25,10 +25,11 @@ typedef struct typedef struct { + int Token; + int Extra; const vp8_prob *context_tree; - char skip_eob_node; - char Token; - short Extra; + int skip_eob_node; + int section; } TOKENEXTRA; int rd_cost_mby(MACROBLOCKD *); -- 2.40.0