diff options
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_treewriter.h | 15 |
3 files changed, 10 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 886e1fcdc..604fc2d90 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -118,7 +118,7 @@ static int prob_diff_update_cost(vp9_prob newp, vp9_prob oldp) { static void update_mode( vp9_writer *const bc, int n, - vp9_token tok [/* n */], + const struct vp9_token tok[/* n */], vp9_tree tree, vp9_prob Pnew [/* n-1 */], vp9_prob Pcur [/* n-1 */], @@ -458,12 +458,12 @@ static void pack_mb_tokens(vp9_writer* const bc, while (p < stop) { const int t = p->Token; - vp9_token *const a = vp9_coef_encodings + t; + const struct vp9_token *const a = vp9_coef_encodings + t; const vp9_extra_bit_struct *const b = vp9_extra_bits + t; int i = 0; const unsigned char *pp = p->context_tree; int v = a->value; - int n = a->Len; + int n = a->len; if (t == EOSB_TOKEN) { diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index e85f85193..1a8a9f109 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -290,7 +290,7 @@ static void tokenize_b(VP9_COMP *cpi, else #endif t->skip_eob_node = (c > 0) && (token_cache[c - 1] == 0); - assert(vp9_coef_encodings[t->Token].Len - t->skip_eob_node > 0); + assert(vp9_coef_encodings[t->Token].len - t->skip_eob_node > 0); if (!dry_run) { ++counts[type][ref][band][pt][token]; if (!t->skip_eob_node) diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h index 832471aa8..d11a5dd61 100644 --- a/vp9/encoder/vp9_treewriter.h +++ b/vp9/encoder/vp9_treewriter.h @@ -67,11 +67,9 @@ static INLINE void treed_write(vp9_writer *const w, } while (n); } -static INLINE void write_token(vp9_writer *const w, - vp9_tree t, - const vp9_prob *const p, - vp9_token *const x) { - treed_write(w, t, p, x->value, x->Len); +static INLINE void write_token(vp9_writer *w, vp9_tree t, const vp9_prob *p, + const struct vp9_token *x) { + treed_write(w, t, p, x->value, x->len); } static INLINE int treed_cost(vp9_tree t, @@ -91,10 +89,9 @@ static INLINE int treed_cost(vp9_tree t, return c; } -static INLINE int cost_token(vp9_tree t, - const vp9_prob *const p, - vp9_token *const x) { - return treed_cost(t, p, x->value, x->Len); +static INLINE int cost_token(vp9_tree t, const vp9_prob *p, + const struct vp9_token *x) { + return treed_cost(t, p, x->value, x->len); } /* Fill array of costs for all possible token values. */ |