mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
motionpixels: Convert to the new bitstream reader
This commit is contained in:
Alexandra Hájková
Diego Biurrun
parent
00b6a76543
commit
d7fe11634c
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "bitstream.h"
|
||||
#include "bswapdsp.h"
|
||||
#include "internal.h"
|
||||
|
||||
@ -87,17 +87,18 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
|
||||
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)
|
||||
@ -116,16 +117,17 @@ static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int
|
||||
}
|
||||
}
|
||||
|
||||
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");
|
||||
@ -135,18 +137,18 @@ static void mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, in
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -175,16 +177,16 @@ static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const Yuv
|
||||
*(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;
|
||||
@ -211,13 +213,13 @@ static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y)
|
||||
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.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, gb));
|
||||
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 {
|
||||
@ -231,7 +233,8 @@ static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y)
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
@ -241,12 +244,12 @@ static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb)
|
||||
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.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, gb));
|
||||
p.u += mp_gradient(mp, 2, mp_get_vlc(mp, bc));
|
||||
p.u = av_clip_intp2(p.u, 5);
|
||||
}
|
||||
mp->vpt[y] = p;
|
||||
@ -255,7 +258,7 @@ static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb)
|
||||
}
|
||||
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,
|
||||
@ -265,7 +268,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
|
||||
const uint8_t *buf = avpkt->data;
|
||||
int buf_size = avpkt->size;
|
||||
MotionPixelsContext *mp = avctx->priv_data;
|
||||
GetBitContext gb;
|
||||
BitstreamContext bc;
|
||||
int i, count1, count2, sz, ret;
|
||||
|
||||
if ((ret = ff_reget_buffer(avctx, mp->frame)) < 0) {
|
||||
@ -282,29 +285,29 @@ static int mp_decode_frame(AVCodecContext *avctx,
|
||||
if (buf_size & 3)
|
||||
memcpy(mp->bswapbuf + (buf_size & ~3), buf + (buf_size & ~3), buf_size & 3);
|
||||
memset(mp->bswapbuf + buf_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
init_get_bits(&gb, mp->bswapbuf, buf_size * 8);
|
||||
bitstream_init(&bc, mp->bswapbuf, buf_size * 8);
|
||||
|
||||
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;
|
||||
|
||||
@ -312,7 +315,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
|
||||
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);
|
||||
mp_decode_frame_helper(mp, &bc);
|
||||
ff_free_vlc(&mp->vlc);
|
||||
|
||||
end:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user