*/
#include "avcodec.h"
-#include "get_bits.h"
-#include "dsputil.h"
+#include "bitstream.h"
+#include "bswapdsp.h"
+#include "internal.h"
+#include "vlc.h"
#define MAX_HUFF_CODES 16
typedef struct MotionPixelsContext {
AVCodecContext *avctx;
- AVFrame frame;
- DSPContext dsp;
+ AVFrame *frame;
+ BswapDSPContext bdsp;
uint8_t *changes_map;
int offset_bits_len;
int codes_count, current_codes_count;
int bswapbuf_size;
} MotionPixelsContext;
+static av_cold int mp_decode_end(AVCodecContext *avctx)
+{
+ MotionPixelsContext *mp = avctx->priv_data;
+
+ av_freep(&mp->changes_map);
+ av_freep(&mp->vpt);
+ av_freep(&mp->hpt);
+ av_freep(&mp->bswapbuf);
+ av_frame_free(&mp->frame);
+
+ return 0;
+}
+
static av_cold int mp_decode_init(AVCodecContext *avctx)
{
MotionPixelsContext *mp = avctx->priv_data;
motionpixels_tableinit();
mp->avctx = avctx;
- dsputil_init(&mp->dsp, avctx);
+ ff_bswapdsp_init(&mp->bdsp);
mp->changes_map = av_mallocz(avctx->width * h4);
mp->offset_bits_len = av_log2(avctx->width * avctx->height) + 1;
mp->vpt = av_mallocz(avctx->height * sizeof(YuvPixel));
mp->hpt = av_mallocz(h4 * w4 / 16 * sizeof(YuvPixel));
- avctx->pix_fmt = PIX_FMT_RGB555;
+ avctx->pix_fmt = AV_PIX_FMT_RGB555;
+
+ mp->frame = av_frame_alloc();
+ if (!mp->frame) {
+ mp_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
return 0;
}
-static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int count, int bits_len, int read_color)
+static void mp_read_changes_map(MotionPixelsContext *mp, BitstreamContext *bc,
+ int count, int bits_len, int read_color)
{
uint16_t *pixels;
int offset, w, h, color = 0, x, y, i;
while (count--) {
- offset = get_bits_long(gb, mp->offset_bits_len);
- w = get_bits(gb, bits_len) + 1;
- h = get_bits(gb, bits_len) + 1;
+ offset = bitstream_read(bc, mp->offset_bits_len);
+ w = bitstream_read(bc, bits_len) + 1;
+ h = bitstream_read(bc, bits_len) + 1;
if (read_color)
- color = get_bits(gb, 15);
+ color = bitstream_read(bc, 15);
x = offset % mp->avctx->width;
y = offset / mp->avctx->width;
if (y >= mp->avctx->height)
continue;
w = FFMIN(w, mp->avctx->width - x);
h = FFMIN(h, mp->avctx->height - y);
- pixels = (uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2];
+ pixels = (uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2];
while (h--) {
mp->changes_map[offset] = w;
if (read_color)
for (i = 0; i < w; ++i)
pixels[i] = color;
offset += mp->avctx->width;
- pixels += mp->frame.linesize[0] / 2;
+ pixels += mp->frame->linesize[0] / 2;
}
}
}
-static void mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, int code)
+static void mp_get_code(MotionPixelsContext *mp, BitstreamContext *bc,
+ int size, int code)
{
- while (get_bits1(gb)) {
+ while (bitstream_read_bit(bc)) {
++size;
if (size > mp->max_codes_bits) {
av_log(mp->avctx, AV_LOG_ERROR, "invalid code size %d/%d\n", size, mp->max_codes_bits);
return;
}
code <<= 1;
- mp_get_code(mp, gb, size, code + 1);
+ mp_get_code(mp, bc, size, code + 1);
}
if (mp->current_codes_count >= MAX_HUFF_CODES) {
av_log(mp->avctx, AV_LOG_ERROR, "too many codes\n");
mp->codes[mp->current_codes_count++].size = size;
}
-static void mp_read_codes_table(MotionPixelsContext *mp, GetBitContext *gb)
+static void mp_read_codes_table(MotionPixelsContext *mp, BitstreamContext *bc)
{
if (mp->codes_count == 1) {
- mp->codes[0].delta = get_bits(gb, 4);
+ mp->codes[0].delta = bitstream_read(bc, 4);
} else {
int i;
- mp->max_codes_bits = get_bits(gb, 4);
+ mp->max_codes_bits = bitstream_read(bc, 4);
for (i = 0; i < mp->codes_count; ++i)
- mp->codes[i].delta = get_bits(gb, 4);
+ mp->codes[i].delta = bitstream_read(bc, 4);
mp->current_codes_count = 0;
- mp_get_code(mp, gb, 0, 0);
+ mp_get_code(mp, bc, 0, 0);
}
}
{
int color;
- color = *(uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2];
+ color = *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2];
return mp_rgb_yuv_table[color];
}
int color;
color = mp_yuv_to_rgb(p->y, p->v, p->u, 1);
- *(uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2] = color;
+ *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2] = color;
}
-static int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb)
+static int mp_get_vlc(MotionPixelsContext *mp, BitstreamContext *bc)
{
int i;
- i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1);
+ i = (mp->codes_count == 1) ? 0 : bitstream_read_vlc(bc, mp->vlc.table, mp->max_codes_bits, 1);
+ i = FFMIN(i, FF_ARRAY_ELEMS(mp->codes) - 1);
return mp->codes[i].delta;
}
-static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y)
+static void mp_decode_line(MotionPixelsContext *mp, BitstreamContext *bc, int y)
{
YuvPixel p;
const int y0 = y * mp->avctx->width;
memset(mp->gradient_scale, 1, sizeof(mp->gradient_scale));
p = mp_get_yuv_from_rgb(mp, x - 1, y);
} else {
- p.y += mp_gradient(mp, 0, mp_get_vlc(mp, gb));
+ p.y += mp_gradient(mp, 0, mp_get_vlc(mp, bc));
+ p.y = av_clip_uintp2(p.y, 5);
if ((x & 3) == 0) {
if ((y & 3) == 0) {
- p.v += mp_gradient(mp, 1, mp_get_vlc(mp, gb));
- p.u += mp_gradient(mp, 2, mp_get_vlc(mp, gb));
+ p.v += mp_gradient(mp, 1, mp_get_vlc(mp, bc));
+ p.v = av_clip_intp2(p.v, 5);
+ p.u += mp_gradient(mp, 2, mp_get_vlc(mp, bc));
+ p.u = av_clip_intp2(p.u, 5);
mp->hpt[((y / 4) * mp->avctx->width + x) / 4] = p;
} else {
p.v = mp->hpt[((y / 4) * mp->avctx->width + x) / 4].v;
}
}
-static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb)
+static void mp_decode_frame_helper(MotionPixelsContext *mp,
+ BitstreamContext *bc)
{
YuvPixel p;
int y, y0;
memset(mp->gradient_scale, 1, sizeof(mp->gradient_scale));
p = mp_get_yuv_from_rgb(mp, 0, y);
} else {
- p.y += mp_gradient(mp, 0, mp_get_vlc(mp, gb));
+ p.y += mp_gradient(mp, 0, mp_get_vlc(mp, bc));
+ p.y = av_clip_uintp2(p.y, 5);
if ((y & 3) == 0) {
- p.v += mp_gradient(mp, 1, mp_get_vlc(mp, gb));
- p.u += mp_gradient(mp, 2, mp_get_vlc(mp, gb));
+ p.v += mp_gradient(mp, 1, mp_get_vlc(mp, bc));
+ p.v = av_clip_intp2(p.v, 5);
+ p.u += mp_gradient(mp, 2, mp_get_vlc(mp, bc));
+ p.u = av_clip_intp2(p.u, 5);
}
mp->vpt[y] = p;
mp_set_rgb_from_yuv(mp, 0, y, &p);
}
for (y0 = 0; y0 < 2; ++y0)
for (y = y0; y < mp->avctx->height; y += 2)
- mp_decode_line(mp, gb, y);
+ mp_decode_line(mp, bc, y);
}
static int mp_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MotionPixelsContext *mp = avctx->priv_data;
- GetBitContext gb;
- int i, count1, count2, sz;
+ BitstreamContext bc;
+ int i, count1, count2, sz, ret;
- mp->frame.reference = 1;
- mp->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &mp->frame)) {
+ if ((ret = ff_reget_buffer(avctx, mp->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
}
/* le32 bitstream msb first */
- av_fast_malloc(&mp->bswapbuf, &mp->bswapbuf_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ av_fast_malloc(&mp->bswapbuf, &mp->bswapbuf_size, buf_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!mp->bswapbuf)
return AVERROR(ENOMEM);
- mp->dsp.bswap_buf((uint32_t *)mp->bswapbuf, (const uint32_t *)buf, buf_size / 4);
+ mp->bdsp.bswap_buf((uint32_t *) mp->bswapbuf, (const uint32_t *) buf,
+ buf_size / 4);
if (buf_size & 3)
memcpy(mp->bswapbuf + (buf_size & ~3), buf + (buf_size & ~3), buf_size & 3);
- memset(mp->bswapbuf + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
- init_get_bits(&gb, mp->bswapbuf, buf_size * 8);
+ memset(mp->bswapbuf + buf_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ bitstream_init8(&bc, mp->bswapbuf, buf_size);
memset(mp->changes_map, 0, avctx->width * avctx->height);
for (i = !(avctx->extradata[1] & 2); i < 2; ++i) {
- count1 = get_bits(&gb, 12);
- count2 = get_bits(&gb, 12);
- mp_read_changes_map(mp, &gb, count1, 8, i);
- mp_read_changes_map(mp, &gb, count2, 4, i);
+ count1 = bitstream_read(&bc, 12);
+ count2 = bitstream_read(&bc, 12);
+ mp_read_changes_map(mp, &bc, count1, 8, i);
+ mp_read_changes_map(mp, &bc, count2, 4, i);
}
- mp->codes_count = get_bits(&gb, 4);
+ mp->codes_count = bitstream_read(&bc, 4);
if (mp->codes_count == 0)
goto end;
if (mp->changes_map[0] == 0) {
- *(uint16_t *)mp->frame.data[0] = get_bits(&gb, 15);
+ *(uint16_t *)mp->frame->data[0] = bitstream_read(&bc, 15);
mp->changes_map[0] = 1;
}
- mp_read_codes_table(mp, &gb);
+ mp_read_codes_table(mp, &bc);
- sz = get_bits(&gb, 18);
+ sz = bitstream_read(&bc, 18);
if (avctx->extradata[0] != 5)
- sz += get_bits(&gb, 18);
+ sz += bitstream_read(&bc, 18);
if (sz == 0)
goto end;
goto end;
if (init_vlc(&mp->vlc, mp->max_codes_bits, mp->codes_count, &mp->codes[0].size, sizeof(HuffCode), 1, &mp->codes[0].code, sizeof(HuffCode), 4, 0))
goto end;
- mp_decode_frame_helper(mp, &gb);
- free_vlc(&mp->vlc);
+ mp_decode_frame_helper(mp, &bc);
+ ff_free_vlc(&mp->vlc);
end:
- *data_size = sizeof(AVFrame);
- *(AVFrame *)data = mp->frame;
+ if ((ret = av_frame_ref(data, mp->frame)) < 0)
+ return ret;
+ *got_frame = 1;
return buf_size;
}
-static av_cold int mp_decode_end(AVCodecContext *avctx)
-{
- MotionPixelsContext *mp = avctx->priv_data;
-
- av_freep(&mp->changes_map);
- av_freep(&mp->vpt);
- av_freep(&mp->hpt);
- av_freep(&mp->bswapbuf);
- if (mp->frame.data[0])
- avctx->release_buffer(avctx, &mp->frame);
-
- return 0;
-}
-
AVCodec ff_motionpixels_decoder = {
.name = "motionpixels",
+ .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_MOTIONPIXELS,
+ .id = AV_CODEC_ID_MOTIONPIXELS,
.priv_data_size = sizeof(MotionPixelsContext),
.init = mp_decode_init,
.close = mp_decode_end,
.decode = mp_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
+ .capabilities = AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff