generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vble: merge len and val arrays

Browse Source 
There's no reason to use two arrays for this.

Based off commit 2fea60c600
to FFmpeg by Michael Niedermayer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Derek Buitenhuis 2011-11-30 17:28:49 -05:00 committed by Ronald S. Bultje
parent 0dd704dbd4
commit e46abbcf77
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/vble.c
View File

@ -34,8 +34,7 @@ typedef struct {
int size;
int flags;
uint8_t *len;
uint8_t *val;
uint8_t *val; /* First holds the lengths of vlc symbols and then their values */
} VBLEContext;
static uint8_t vble_read_reverse_unary(GetBitContext *gb)
@ -63,23 +62,20 @@ static int vble_unpack(VBLEContext *ctx, GetBitContext *gb)
/* Read all the lengths in first */
for (i = 0; i < ctx->size; i++) {
ctx->len[i] = vble_read_reverse_unary(gb);
ctx->val[i] = vble_read_reverse_unary(gb);
if (ctx->len[i] == UINT8_MAX)
if (ctx->val[i] == UINT8_MAX)
return -1;
}
/* For any values that have length 0 */
memset(ctx->val, 0, ctx->size);
for (i = 0; i < ctx->size; i++) {
/* Check we have enough bits left */
if (get_bits_left(gb) < ctx->len[i])
if (get_bits_left(gb) < ctx->val[i])
return -1;
/* get_bits can't take a length of 0 */
if (ctx->len[i])
ctx->val[i] = (1 << ctx->len[i]) + get_bits(gb, ctx->len[i]) - 1;
if (ctx->val[i])
ctx->val[i] = (1 << ctx->val[i]) + get_bits(gb, ctx->val[i]) - 1;
}
return 0;
@ -188,7 +184,6 @@ static av_cold int vble_decode_close(AVCodecContext *avctx)
avctx->release_buffer(avctx, pic);
av_freep(&avctx->coded_frame);
av_freep(&ctx->len);
av_freep(&ctx->val);
return 0;
@ -214,14 +209,6 @@ static av_cold int vble_decode_init(AVCodecContext *avctx)
ctx->size = avpicture_get_size(avctx->pix_fmt,
avctx->width, avctx->height);
ctx->len = av_malloc(ctx->size * sizeof(*ctx->len));
if (!ctx->len) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate lengths buffer.\n");
vble_decode_close(avctx);
return AVERROR(ENOMEM);
}
ctx->val = av_malloc(ctx->size * sizeof(*ctx->val));
if (!ctx->val) {