From 684ddc61eaa499f04722f39a8a9a7e6091eedc1a Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Fri, 19 Apr 2013 11:14:33 -0700
Subject: [PATCH] Renaming vp9_extra_bit_struct to vp9_extra_bit.
Change-Id: Ie4713da125e954c1d30e1d4cbeb38666fce90ccc
---
vp9/common/vp9_entropy.c | 2 +-
vp9/common/vp9_entropy.h | 6 +++---
vp9/encoder/vp9_bitstream.c | 8 ++++----
vp9/encoder/vp9_tokenize.c | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index 5e6cba2ed9..5b3ddfbc23 100644
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -1310,7 +1310,7 @@ static void init_bit_trees() {
init_bit_tree(cat6, 14);
}
-vp9_extra_bit_struct vp9_extra_bits[12] = {
+vp9_extra_bit vp9_extra_bits[12] = {
{ 0, 0, 0, 0},
{ 0, 0, 0, 1},
{ 0, 0, 0, 2},
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h
index db167420cc..3cae946497 100644
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -45,11 +45,11 @@ extern struct vp9_token vp9_coef_encodings[MAX_ENTROPY_TOKENS];
typedef struct {
vp9_tree_p tree;
const vp9_prob *prob;
- int Len;
+ int len;
int base_val;
-} vp9_extra_bit_struct;
+} vp9_extra_bit;
-extern vp9_extra_bit_struct vp9_extra_bits[12]; /* indexed by token value */
+extern vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */
#define PROB_UPDATE_BASELINE_COST 7
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index d4ccf8ca22..7393102d9f 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -422,7 +422,7 @@ static void pack_mb_tokens(vp9_writer* const bc,
while (p < stop) {
const int t = p->token;
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 *const b = vp9_extra_bits + t;
int i = 0;
const unsigned char *pp = p->context_tree;
int v = a->value;
@@ -448,12 +448,12 @@ static void pack_mb_tokens(vp9_writer* const bc,
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;
int v = e >> 1;
- int n = L; /* number of bits in v, assumed nonzero */
+ int n = l; /* number of bits in v, assumed nonzero */
int i = 0;
do {
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c
index 6b201488fc..398b4bbe61 100644
--- a/vp9/encoder/vp9_tokenize.c
+++ b/vp9/encoder/vp9_tokenize.c
@@ -59,7 +59,7 @@ const int *vp9_dct_value_cost_ptr;
static void fill_value_tokens() {
TOKENVALUE *const t = dct_value_tokens + DCT_MAX_VALUE;
- vp9_extra_bit_struct *const e = vp9_extra_bits;
+ vp9_extra_bit *const e = vp9_extra_bits;
int i = -DCT_MAX_VALUE;
int sign = 1;
@@ -88,14 +88,14 @@ static void fill_value_tokens() {
// initialize the cost for extra bits for all possible coefficient value.
{
int cost = 0;
- vp9_extra_bit_struct *p = vp9_extra_bits + t[i].token;
+ vp9_extra_bit *p = vp9_extra_bits + t[i].token;
if (p->base_val) {
const int extra = t[i].extra;
- const int Length = p->Len;
+ const int length = p->len;
- if (Length)
- cost += treed_cost(p->tree, p->prob, extra >> 1, Length);
+ if (length)
+ cost += treed_cost(p->tree, p->prob, extra >> 1, length);
cost += vp9_cost_bit(vp9_prob_half, extra & 1); /* sign */
dct_value_cost[i + DCT_MAX_VALUE] = cost;
--
GitLab