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

Merge "Adding missing const to vp9_extra_bits array."

Browse Source
This commit is contained in:
Dmitry Kovalev 2013-08-01 10:19:51 -07:00 committed by Gerrit Code Review
commit ff4bfa726b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_entropy.c
View File

@ -419,7 +419,7 @@ static void init_bit_trees() {
init_bit_tree(cat6, 14); init_bit_tree(cat6, 14);
} }
vp9_extra_bit vp9_extra_bits[12] = { const vp9_extra_bit vp9_extra_bits[12] = {
{ 0, 0, 0, 0}, { 0, 0, 0, 0},
{ 0, 0, 0, 1}, { 0, 0, 0, 1},
{ 0, 0, 0, 2}, { 0, 0, 0, 2},

2
vp9/common/vp9_entropy.h
View File

@ -50,7 +50,7 @@ typedef struct {
int base_val; int base_val;
} vp9_extra_bit; } vp9_extra_bit;
extern vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */ extern const vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */
#define MAX_PROB 255 #define MAX_PROB 255
#define DCT_MAX_VALUE 16384 #define DCT_MAX_VALUE 16384

4
vp9/encoder/vp9_tokenize.c
View File

@ -40,7 +40,7 @@ const int *vp9_dct_value_cost_ptr;
static void fill_value_tokens() { static void fill_value_tokens() {
TOKENVALUE *const t = dct_value_tokens + DCT_MAX_VALUE; TOKENVALUE *const t = dct_value_tokens + DCT_MAX_VALUE;
vp9_extra_bit *const e = vp9_extra_bits; const vp9_extra_bit *const e = vp9_extra_bits;
int i = -DCT_MAX_VALUE; int i = -DCT_MAX_VALUE;
int sign = 1; int sign = 1;
@ -69,7 +69,7 @@ static void fill_value_tokens() {
// initialize the cost for extra bits for all possible coefficient value. // initialize the cost for extra bits for all possible coefficient value.
{ {
int cost = 0; int cost = 0;
vp9_extra_bit *p = vp9_extra_bits + t[i].token; const vp9_extra_bit *p = vp9_extra_bits + t[i].token;
if (p->base_val) { if (p->base_val) {
const int extra = t[i].extra; const int extra = t[i].extra;