diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-25 14:30:33 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-25 14:30:33 -0800 |
| commit | cfd0eeeebbb44e3e1d40b4c7740251b5463cc70c (patch) | |
| tree | a616715d7508f009fbb71486a52734f08874068c /vp9/encoder | |
| parent | 276e568997bd1c1f049a48d92d1d1f4ee1afccd0 (diff) | |
| parent | 1075c49a3f07520f62a86b1811de537cd9d6407f (diff) | |
| download | libvpx-cfd0eeeebbb44e3e1d40b4c7740251b5463cc70c.tar libvpx-cfd0eeeebbb44e3e1d40b4c7740251b5463cc70c.tar.gz libvpx-cfd0eeeebbb44e3e1d40b4c7740251b5463cc70c.tar.bz2 libvpx-cfd0eeeebbb44e3e1d40b4c7740251b5463cc70c.zip | |
Merge "Shrink dct_value_cost[] to int16_t."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tokenize.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 2be00ff62..7ae110707 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -23,8 +23,8 @@ static TOKENVALUE dct_value_tokens[DCT_MAX_VALUE * 2]; const TOKENVALUE *vp9_dct_value_tokens_ptr; -static int dct_value_cost[DCT_MAX_VALUE * 2]; -const int *vp9_dct_value_cost_ptr; +static int16_t dct_value_cost[DCT_MAX_VALUE * 2]; +const int16_t *vp9_dct_value_cost_ptr; // Array indices are identical to previously-existing CONTEXT_NODE indices const vp9_tree_index vp9_coef_tree[TREE_SIZE(ENTROPY_TOKENS)] = { diff --git a/vp9/encoder/vp9_tokenize.h b/vp9/encoder/vp9_tokenize.h index ea86240be..063c0bafe 100644 --- a/vp9/encoder/vp9_tokenize.h +++ b/vp9/encoder/vp9_tokenize.h @@ -47,7 +47,7 @@ struct VP9_COMP; void vp9_tokenize_sb(struct VP9_COMP *cpi, TOKENEXTRA **t, int dry_run, BLOCK_SIZE bsize); -extern const int *vp9_dct_value_cost_ptr; +extern const int16_t *vp9_dct_value_cost_ptr; /* TODO: The Token field should be broken out into a separate char array to * improve cache locality, since it's needed for costing when the rest of the * fields are not. |