* VBLE Decoder
*/
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
+#include "huffyuvdsp.h"
+#include "internal.h"
+#include "mathops.h"
-typedef struct {
+typedef struct VBLEContext {
AVCodecContext *avctx;
+ HuffYUVDSPContext hdsp;
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)
uint8_t val = show_bits(gb, 8);
if (val) {
- val = 7 - av_log2_16bit(av_reverse[val]);
+ val = 7 - av_log2_16bit(ff_reverse[val]);
skip_bits(gb, val + 1);
return val;
} else {
/* 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;
}
-static void vble_restore_plane(VBLEContext *ctx, int plane, int offset,
- int width, int height)
+static void vble_restore_plane(VBLEContext *ctx, AVFrame *pic,
+ int plane, int offset,
+ int width, int height)
{
- AVFrame *pic = ctx->avctx->coded_frame;
uint8_t *dst = pic->data[plane];
uint8_t *val = ctx->val + offset;
- uint8_t a, b, c;
int stride = pic->linesize[plane];
- int i, j;
+ int i, j, left, left_top;
for (i = 0; i < height; i++) {
- for (j = 0; j < width; j++) {
- dst[j] = (val[j] >> 1) ^ -(val[j] & 1);
-
- /* Top line and left column are not predicted */
- if (!j)
- continue;
-
- if (!i) {
- dst[j] += dst[j - 1];
- continue;
- }
-
- a = dst[j - 1];
- b = dst[j - stride];
- c = a + b - dst[j - 1 - stride];
- dst[j] += mid_pred(a, b, c);
+ for (j = 0; j < width; j++)
+ val[j] = (val[j] >> 1) ^ -(val[j] & 1);
+
+ if (i) {
+ left = 0;
+ left_top = dst[-stride];
+ ctx->hdsp.add_hfyu_median_pred(dst, dst - stride, val,
+ width, &left, &left_top);
+ } else {
+ dst[0] = val[0];
+ for (j = 1; j < width; j++)
+ dst[j] = val[j] + dst[j - 1];
}
dst += stride;
val += width;
}
}
-static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+static int vble_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt)
{
VBLEContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
+ AVFrame *pic = data;
GetBitContext gb;
const uint8_t *src = avpkt->data;
int version;
int offset = 0;
int width_uv = avctx->width / 2, height_uv = avctx->height / 2;
- pic->reference = 0;
-
- /* Clear buffer if need be */
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
/* Allocate buffer */
- if (avctx->get_buffer(avctx, pic) < 0) {
+ if (ff_get_buffer(avctx, pic, 0) < 0) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
return AVERROR(ENOMEM);
}
/* Set flags */
pic->key_frame = 1;
- pic->pict_type = FF_I_TYPE;
+ pic->pict_type = AV_PICTURE_TYPE_I;
/* Version should always be 1 */
version = AV_RL32(src);
- if (version != 1) {
- av_log(avctx, AV_LOG_ERROR, "Unsupported VBLE Version: %d\n", version);
- return AVERROR_INVALIDDATA;
- }
+ if (version != 1)
+ av_log(avctx, AV_LOG_WARNING, "Unsupported VBLE Version: %d\n", version);
init_get_bits(&gb, src + 4, (avpkt->size - 4) * 8);
}
/* Restore planes. Should be almost identical to Huffyuv's. */
- vble_restore_plane(ctx, 0, offset, avctx->width, avctx->height);
+ vble_restore_plane(ctx, pic, 0, offset, avctx->width, avctx->height);
/* Chroma */
- if (!(ctx->flags & CODEC_FLAG_GRAY)) {
+ 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, pic, 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, pic, 2, offset, width_uv, height_uv);
}
- *data_size = sizeof(AVFrame);
- *(AVFrame *)data = *pic;
+ *got_frame = 1;
return avpkt->size;
}
static av_cold int vble_decode_close(AVCodecContext *avctx)
{
VBLEContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- av_freep(&avctx->coded_frame);
- av_freep(&ctx->len);
av_freep(&ctx->val);
return 0;
/* Stash for later use */
ctx->avctx = avctx;
- ctx->flags = avctx->flags;
+ ff_huffyuvdsp_init(&ctx->hdsp);
- avctx->pix_fmt = PIX_FMT_YUV420P;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
avctx->bits_per_raw_sample = 8;
- avctx->coded_frame = avcodec_alloc_frame();
-
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
- return AVERROR(ENOMEM);
- }
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) {
AVCodec ff_vble_decoder = {
.name = "vble",
+ .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_VBLE,
+ .id = AV_CODEC_ID_VBLE,
.priv_data_size = sizeof(VBLEContext),
.init = vble_decode_init,
.close = vble_decode_close,
.decode = vble_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
};
projects / ffmpeg / blobdiff