RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

vble: move 2nd pass bitreading into vble_restore_plane()

Browse Source 
this improves data cache hits and speeds up grayscale only decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-14 17:19:06 +01:00
parent 6718536ba5
commit 75c0ddc9c2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/vble.c
View File

@ -73,18 +73,11 @@ static int vble_unpack(VBLEContext *ctx, GetBitContext *gb)
/* Check we have enough bits left */
if (get_bits_left(gb) < allbits)
return -1;
for (i = 0; i < ctx->size; i++) {
/* get_bits can't take a length of 0 */
if (ctx->val[i])
ctx->val[i] = (1 << ctx->val[i]) + get_bits(gb, ctx->val[i]) - 1;
}
return 0;
}
static void vble_restore_plane(VBLEContext *ctx, int plane, int offset,
int width, int height)
static void vble_restore_plane(VBLEContext *ctx, GetBitContext *gb, int plane,
int offset, int width, int height)
{
AVFrame *pic = ctx->avctx->coded_frame;
uint8_t *dst = pic->data[plane];
@ -95,7 +88,12 @@ static void vble_restore_plane(VBLEContext *ctx, int plane, int offset,
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
dst[j] = (val[j] >> 1) ^ -(val[j] & 1);
/* get_bits can't take a length of 0 */
if (val[j]) {
int v = (1 << val[j]) + get_bits(gb, val[j]) - 1;
val[j] = (v >> 1) ^ -(v & 1);
}
dst[j] = val[j];
/* Top line and left column are not predicted */
if (!j)
@ -160,15 +158,15 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
/* Restore planes. Should be almost identical to Huffyuv's. */
vble_restore_plane(ctx, 0, offset, avctx->width, avctx->height);
vble_restore_plane(ctx, &gb, 0, offset, avctx->width, avctx->height);
/* Chroma */
if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
offset += avctx->width * avctx->height;
vble_restore_plane(ctx, 1, offset, width_uv, height_uv);
vble_restore_plane(ctx, &gb, 1, offset, width_uv, height_uv);
offset += width_uv * height_uv;
vble_restore_plane(ctx, 2, offset, width_uv, height_uv);
vble_restore_plane(ctx, &gb, 2, offset, width_uv, height_uv);
}
*data_size = sizeof(AVFrame);