Commit 58b36959 authored by Paul B Mahol's avatar Paul B Mahol

tta: use get_unary()

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent c28aafe6
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <limits.h> #include <limits.h>
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "unary.h"
#include "internal.h" #include "internal.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
...@@ -147,16 +148,6 @@ static void rice_init(TTARice *c, uint32_t k0, uint32_t k1) ...@@ -147,16 +148,6 @@ static void rice_init(TTARice *c, uint32_t k0, uint32_t k1)
c->sum1 = shift_16[k1]; c->sum1 = shift_16[k1];
} }
static int tta_get_unary(GetBitContext *gb)
{
int ret = 0;
// count ones
while (get_bits_left(gb) > 0 && get_bits1(gb))
ret++;
return ret;
}
static const int64_t tta_channel_layouts[7] = { static const int64_t tta_channel_layouts[7] = {
AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO,
AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY,
...@@ -341,7 +332,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, ...@@ -341,7 +332,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
uint32_t unary, depth, k; uint32_t unary, depth, k;
int32_t value; int32_t value;
unary = tta_get_unary(&s->gb); unary = get_unary(&s->gb, 0, get_bits_left(&s->gb));
if (unary == 0) { if (unary == 0) {
depth = 0; depth = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment