diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-07-22 22:08:09 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-07-22 22:08:09 +0000 |
| commit | 2a38c2e99a574ea9097fb3498abbfae597e5cf6e (patch) | |
| tree | 1eacf867c3dc34f5b02ae3920d1db142b194f893 | |
| parent | 8d5fa2baa6fca5177710b7749c4644ee228fde02 (diff) | |
| download | ffmpeg-2a38c2e99a574ea9097fb3498abbfae597e5cf6e.tar.gz | |
Eliminate a LUT in escape decoding in VP8 decode_block_coeffs
Originally committed as revision 24441 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vp8.c | 2 | ||||
| -rw-r--r-- | libavcodec/vp8data.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 65d18ad0f0..947d7c08ca 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -803,7 +803,7 @@ static int decode_block_coeffs(VP56RangeCoder *c, DCTELEM block[16], else if (token >= DCT_CAT1) { int cat = token-DCT_CAT1; token = vp8_rac_get_coeff(c, vp8_dct_cat_prob[cat]); - token += vp8_dct_cat_offset[cat]; + token += 3 + (2<<cat); } // after the first token, the non-zero prediction context becomes diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index e8bd82da79..80fa808484 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -361,8 +361,6 @@ static const uint8_t * const vp8_dct_cat_prob[6] = vp8_dct_cat6_prob, }; -static const uint8_t vp8_dct_cat_offset[6] = { 5, 7, 11, 19, 35, 67 }; - static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS-1] = { { |