* VBLE Decoder
*/
-#define BITSTREAM_READER_LE
+#include "libavutil/imgutils.h"
+#define BITSTREAM_READER_LE
#include "avcodec.h"
-#include "dsputil.h"
-#include "get_bits.h"
+#include "bitstream.h"
+#include "huffyuvdsp.h"
#include "internal.h"
#include "mathops.h"
-typedef struct {
+typedef struct VBLEContext {
AVCodecContext *avctx;
- DSPContext dsp;
+ HuffYUVDSPContext hdsp;
int size;
uint8_t *val; /* First holds the lengths of vlc symbols and then their values */
} VBLEContext;
-static uint8_t vble_read_reverse_unary(GetBitContext *gb)
+static uint8_t vble_read_reverse_unary(BitstreamContext *bc)
{
/* At most we need to read 9 bits total to get indices up to 8 */
- uint8_t val = show_bits(gb, 8);
+ uint8_t val = bitstream_peek(bc, 8);
if (val) {
val = 7 - av_log2_16bit(ff_reverse[val]);
- skip_bits(gb, val + 1);
+ bitstream_skip(bc, val + 1);
return val;
} else {
- skip_bits(gb, 8);
- if (get_bits1(gb))
+ bitstream_skip(bc, 8);
+ if (bitstream_read_bit(bc))
return 8;
}
return UINT8_MAX;
}
-static int vble_unpack(VBLEContext *ctx, GetBitContext *gb)
+static int vble_unpack(VBLEContext *ctx, BitstreamContext *bc)
{
int i;
/* Read all the lengths in first */
for (i = 0; i < ctx->size; i++) {
- ctx->val[i] = vble_read_reverse_unary(gb);
+ ctx->val[i] = vble_read_reverse_unary(bc);
if (ctx->val[i] == UINT8_MAX)
return -1;
for (i = 0; i < ctx->size; i++) {
/* Check we have enough bits left */
- if (get_bits_left(gb) < ctx->val[i])
+ if (bitstream_bits_left(bc) < ctx->val[i])
return -1;
/* 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;
+ ctx->val[i] = (1 << ctx->val[i]) + bitstream_read(bc, 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;
int stride = pic->linesize[plane];
if (i) {
left = 0;
left_top = dst[-stride];
- ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val,
- width, &left, &left_top);
+ 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++)
AVPacket *avpkt)
{
VBLEContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
- GetBitContext gb;
+ AVFrame *pic = data;
+ BitstreamContext bc;
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 (ff_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);
}
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);
+ bitstream_init8(&bc, src + 4, avpkt->size - 4);
/* Unpack */
- if (vble_unpack(ctx, &gb) < 0) {
+ if (vble_unpack(ctx, &bc) < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid Code\n");
return AVERROR_INVALIDDATA;
}
/* 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->avctx->flags & CODEC_FLAG_GRAY)) {
+ if (!(ctx->avctx->flags & AV_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);
}
*got_frame = 1;
- *(AVFrame *)data = *pic;
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->val);
return 0;
/* Stash for later use */
ctx->avctx = avctx;
- ff_dsputil_init(&ctx->dsp, avctx);
+ ff_huffyuvdsp_init(&ctx->hdsp);
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->size = av_image_get_buffer_size(avctx->pix_fmt,
+ avctx->width, avctx->height, 1);
ctx->val = av_malloc(ctx->size * sizeof(*ctx->val));
AVCodec ff_vble_decoder = {
.name = "vble",
+ .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
.type = AVMEDIA_TYPE_VIDEO,
.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"),
+ .capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
projects / ffmpeg / blobdiff