Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> --- libavcodec/vp56.h | 36 +----------------------------------- libavcodec/vp8.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index d2e6ad3ed0..08172e1987 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -339,7 +339,7 @@ static int vp56_rac_gets(VP56RangeCoder *c, int bits) return value; } -static int vp8_rac_get_uint(VP56RangeCoder *c, int bits) +static av_unused int vp8_rac_get_uint(VP56RangeCoder *c, int bits) { int value = 0; @@ -350,22 +350,6 @@ static int vp8_rac_get_uint(VP56RangeCoder *c, int bits) return value; } -// fixme: add 1 bit to all the calls to this? -static av_unused int vp8_rac_get_sint(VP56RangeCoder *c, int bits) -{ - int v; - - if (!vp8_rac_get(c)) - return 0; - - v = vp8_rac_get_uint(c, bits); - - if (vp8_rac_get(c)) - v = -v; - - return v; -} - // P(7) static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) { @@ -373,12 +357,6 @@ static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) return v + !v; } -static av_unused int vp8_rac_get_nn(VP56RangeCoder *c) -{ - int v = vp8_rac_get_uint(c, 7) << 1; - return v + !v; -} - static av_always_inline int vp56_rac_get_tree(VP56RangeCoder *c, const VP56Tree *tree, @@ -407,16 +385,4 @@ static av_always_inline int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*t return -i; } -// DCTextra -static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) -{ - int v = 0; - - do { - v = (v<<1) + vp56_rac_get_prob(c, *prob++); - } while (*prob); - - return v; -} - #endif /* AVCODEC_VP56_H */ diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 10de962118..9e7616990f 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -52,6 +52,40 @@ #define VPX(vp7, f) vp8_ ## f #endif +// fixme: add 1 bit to all the calls to this? +static int vp8_rac_get_sint(VP56RangeCoder *c, int bits) +{ + int v; + + if (!vp8_rac_get(c)) + return 0; + + v = vp8_rac_get_uint(c, bits); + + if (vp8_rac_get(c)) + v = -v; + + return v; +} + +static int vp8_rac_get_nn(VP56RangeCoder *c) +{ + int v = vp8_rac_get_uint(c, 7) << 1; + return v + !v; +} + +// DCTextra +static int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) +{ + int v = 0; + + do { + v = (v<<1) + vp56_rac_get_prob(c, *prob++); + } while (*prob); + + return v; +} + static void free_buffers(VP8Context *s) { int i; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".