diff options
| author | hui su <huisu@google.com> | 2015-03-31 09:20:46 -0700 |
|---|---|---|
| committer | hui su <huisu@google.com> | 2015-03-31 09:20:46 -0700 |
| commit | 302e24cb3ee617c3f238001392a8bf73e447a7a2 (patch) | |
| tree | c93527ccd5923ac329b177ce9d9feb9ee5e5188b /vp9/encoder | |
| parent | 9b99eb2e123c8e30288de73d6722c88672e4e434 (diff) | |
| download | libvpx-302e24cb3ee617c3f238001392a8bf73e447a7a2.tar libvpx-302e24cb3ee617c3f238001392a8bf73e447a7a2.tar.gz libvpx-302e24cb3ee617c3f238001392a8bf73e447a7a2.tar.bz2 libvpx-302e24cb3ee617c3f238001392a8bf73e447a7a2.zip | |
Move vp9_coef_con_tree to common/
This tree should be defined in common/, as it is needed for
both encoder and decoder.
Change-Id: I4f5cbc80025cf2ced14182c98f7c82dc7d0f87db
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 4c8995356..799109b51 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -65,18 +65,6 @@ const vp9_tree_index vp9_coef_tree[TREE_SIZE(ENTROPY_TOKENS)] = { -CATEGORY5_TOKEN, -CATEGORY6_TOKEN // 10 = CAT_FIVE }; -// Unconstrained Node Tree -const vp9_tree_index vp9_coef_con_tree[TREE_SIZE(ENTROPY_TOKENS)] = { - 2, 6, // 0 = LOW_VAL - -TWO_TOKEN, 4, // 1 = TWO - -THREE_TOKEN, -FOUR_TOKEN, // 2 = THREE - 8, 10, // 3 = HIGH_LOW - -CATEGORY1_TOKEN, -CATEGORY2_TOKEN, // 4 = CAT_ONE - 12, 14, // 5 = CAT_THREEFOUR - -CATEGORY3_TOKEN, -CATEGORY4_TOKEN, // 6 = CAT_THREE - -CATEGORY5_TOKEN, -CATEGORY6_TOKEN // 7 = CAT_FIVE -}; - static const vp9_tree_index cat1[2] = {0, 0}; static const vp9_tree_index cat2[4] = {2, 2, 0, 0}; static const vp9_tree_index cat3[6] = {2, 2, 4, 4, 0, 0}; |