From b7b1e6fb55c6b12ccd078a20cb9855f6734931b5 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Mon, 13 Dec 2010 10:11:42 -0500
Subject: [PATCH] Reduce size of TOKENEXTRA struct
Change the size of structure elements to reduce memory utilization.
Removed the 'section' member entirely, as it is set but never read.
Change-Id: Iad043830392fb4168cb3cd6075fb0eb70c7f691c
---
vp8/encoder/tokenize.c | 8 --------
vp8/encoder/tokenize.h | 7 +++----
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c
index e4da833791..50dabf4a5f 100644
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -131,9 +131,6 @@ 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];
@@ -184,8 +181,6 @@ 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];
@@ -434,7 +429,6 @@ 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;
@@ -465,7 +459,6 @@ 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;
@@ -495,7 +488,6 @@ 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 01e8ec6d71..cb5b15405c 100644
--- a/vp8/encoder/tokenize.h
+++ b/vp8/encoder/tokenize.h
@@ -25,11 +25,10 @@ typedef struct
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 *);
--
GitLab