diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-20 00:05:09 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-20 00:05:09 -0400 |
| commit | 8e464cc4c2d02e5daa68a45830f053c8a236ab6f (patch) | |
| tree | 9b4a9e62a028aa4abde82b96b2b8eeb2135a350e /vp8/common | |
| parent | bf53e74b7f23cd9e55aaf820d7914b0890a16177 (diff) | |
| parent | b2d9700f5313770957878fa36f9971c367f479df (diff) | |
| download | libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar.gz libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.tar.bz2 libvpx-8e464cc4c2d02e5daa68a45830f053c8a236ab6f.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/entropy.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 14821e72d..5044c25b9 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -26,8 +26,32 @@ typedef vp8_prob Prob; #include "coefupdateprobs.h" -DECLARE_ALIGNED(16, cuchar, vp8_coef_bands[16]) = { 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7}; -DECLARE_ALIGNED(16, cuchar, vp8_prev_token_class[MAX_ENTROPY_TOKENS]) = { 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0}; +DECLARE_ALIGNED(16, const unsigned char, vp8_norm[256]) = +{ + 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +DECLARE_ALIGNED(16, cuchar, vp8_coef_bands[16]) = +{ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7}; + +DECLARE_ALIGNED(16, cuchar, vp8_prev_token_class[MAX_ENTROPY_TOKENS]) = +{ 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0}; + DECLARE_ALIGNED(16, const int, vp8_default_zig_zag1d[16]) = { 0, 1, 4, 8, |