diff options
| author | David Conrad <lessen42@gmail.com> | 2010-07-24 01:47:06 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-26 23:56:34 +0200 |
| commit | ba3830e8a338eee766271fc8c47baaa0d70d7492 (patch) | |
| tree | 8792fe8a3e45053f22a2fcad727c243ff4408fdc /libavcodec | |
| parent | 742d218bf14c93202fdaa1703078c087f8fae0d0 (diff) | |
| download | ffmpeg-ba3830e8a338eee766271fc8c47baaa0d70d7492.tar.gz | |
VP8: Remove no longer used vp8_rac_get_tree_with_offset
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp56.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 7d411f400c..b16a00054b 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -334,15 +334,13 @@ int vp56_rac_get_tree(VP56RangeCoder *c, return -tree->val; } -/** - * This is identical to vp8_rac_get_tree except for the possibility of starting - * on a node other than the root node, needed for coeff decode where this is - * used to save a bit after a 0 token (by disallowing EOB to immediately follow.) - */ -static av_always_inline -int vp8_rac_get_tree_with_offset(VP56RangeCoder *c, const int8_t (*tree)[2], - const uint8_t *probs, int i) +// how probabilities are associated with decisions is different I think +// well, the new scheme fits in the old but this way has one fewer branches per decision +static av_always_inline int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*tree)[2], + const uint8_t *probs) { + int i = 0; + do { i = tree[i][vp56_rac_get_prob(c, probs[i])]; } while (i > 0); @@ -350,15 +348,6 @@ int vp8_rac_get_tree_with_offset(VP56RangeCoder *c, const int8_t (*tree)[2], return -i; } -// how probabilities are associated with decisions is different I think -// well, the new scheme fits in the old but this way has one fewer branches per decision -static av_always_inline -int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*tree)[2], - const uint8_t *probs) -{ - return vp8_rac_get_tree_with_offset(c, tree, probs, 0); -} - // DCTextra static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) { |