virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

tta: use get_unary() instead of a custom implementation

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Anton Khirnov
2016-11-23 13:02:52 +01:00
committed by Diego Biurrun
parent e122b12c88
commit dc4b625028
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/tta.c
View File

@@ -35,6 +35,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "unary.h"
#define FORMAT_SIMPLE 1 #define FORMAT_SIMPLE 1
#define FORMAT_ENCRYPTED 2 #define FORMAT_ENCRYPTED 2
@@ -171,16 +172,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 int tta_check_crc(TTAContext *s, const uint8_t *buf, int buf_size) static int tta_check_crc(TTAContext *s, const uint8_t *buf, int buf_size)
{ {
uint32_t crc, CRC; uint32_t crc, CRC;
@@ -352,7 +343,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;