* commit '759001c534287a96dc96d1e274665feb7059145d':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '759001c534287a96dc96d1e274665feb7059145d'
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
346 lines
11 KiB
C
346 lines
11 KiB
C
/*
|
|
* Motion Pixels Video Decoder
|
|
* Copyright (c) 2008 Gregory Montoir (cyx@users.sourceforge.net)
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "get_bits.h"
|
|
#include "dsputil.h"
|
|
#include "internal.h"
|
|
|
|
#define MAX_HUFF_CODES 16
|
|
|
|
#include "motionpixels_tablegen.h"
|
|
|
|
typedef struct HuffCode {
|
|
int code;
|
|
uint8_t size;
|
|
uint8_t delta;
|
|
} HuffCode;
|
|
|
|
typedef struct MotionPixelsContext {
|
|
AVCodecContext *avctx;
|
|
AVFrame frame;
|
|
DSPContext dsp;
|
|
uint8_t *changes_map;
|
|
int offset_bits_len;
|
|
int codes_count, current_codes_count;
|
|
int max_codes_bits;
|
|
HuffCode codes[MAX_HUFF_CODES];
|
|
VLC vlc;
|
|
YuvPixel *vpt, *hpt;
|
|
uint8_t gradient_scale[3];
|
|
uint8_t *bswapbuf;
|
|
int bswapbuf_size;
|
|
} MotionPixelsContext;
|
|
|
|
static av_cold int mp_decode_init(AVCodecContext *avctx)
|
|
{
|
|
MotionPixelsContext *mp = avctx->priv_data;
|
|
int w4 = (avctx->width + 3) & ~3;
|
|
int h4 = (avctx->height + 3) & ~3;
|
|
|
|
if(avctx->extradata_size < 2){
|
|
av_log(avctx, AV_LOG_ERROR, "extradata too small\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
motionpixels_tableinit();
|
|
mp->avctx = avctx;
|
|
ff_dsputil_init(&mp->dsp, avctx);
|
|
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 = AV_PIX_FMT_RGB555;
|
|
avcodec_get_frame_defaults(&mp->frame);
|
|
return 0;
|
|
}
|
|
|
|
static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, 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;
|
|
if (read_color)
|
|
color = get_bits(gb, 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];
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
|
|
static int mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, int code)
|
|
{
|
|
while (get_bits1(gb)) {
|
|
++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 AVERROR_INVALIDDATA;
|
|
}
|
|
code <<= 1;
|
|
if (mp_get_code(mp, gb, size, code + 1) < 0)
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
if (mp->current_codes_count >= MAX_HUFF_CODES) {
|
|
av_log(mp->avctx, AV_LOG_ERROR, "too many codes\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
mp->codes[mp->current_codes_count ].code = code;
|
|
mp->codes[mp->current_codes_count++].size = size;
|
|
return 0;
|
|
}
|
|
|
|
static int mp_read_codes_table(MotionPixelsContext *mp, GetBitContext *gb)
|
|
{
|
|
if (mp->codes_count == 1) {
|
|
mp->codes[0].delta = get_bits(gb, 4);
|
|
} else {
|
|
int i;
|
|
int ret;
|
|
|
|
mp->max_codes_bits = get_bits(gb, 4);
|
|
for (i = 0; i < mp->codes_count; ++i)
|
|
mp->codes[i].delta = get_bits(gb, 4);
|
|
mp->current_codes_count = 0;
|
|
if ((ret = mp_get_code(mp, gb, 0, 0)) < 0)
|
|
return ret;
|
|
if (mp->current_codes_count < mp->codes_count) {
|
|
av_log(mp->avctx, AV_LOG_ERROR, "too few codes\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int mp_gradient(MotionPixelsContext *mp, int component, int v)
|
|
{
|
|
int delta;
|
|
|
|
delta = (v - 7) * mp->gradient_scale[component];
|
|
mp->gradient_scale[component] = (v == 0 || v == 14) ? 2 : 1;
|
|
return delta;
|
|
}
|
|
|
|
static YuvPixel mp_get_yuv_from_rgb(MotionPixelsContext *mp, int x, int y)
|
|
{
|
|
int color;
|
|
|
|
color = *(uint16_t *)&mp->frame.data[0][y * mp->frame.linesize[0] + x * 2];
|
|
return mp_rgb_yuv_table[color];
|
|
}
|
|
|
|
static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const YuvPixel *p)
|
|
{
|
|
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;
|
|
}
|
|
|
|
static int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb)
|
|
{
|
|
int i;
|
|
|
|
i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1);
|
|
return mp->codes[i].delta;
|
|
}
|
|
|
|
static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y)
|
|
{
|
|
YuvPixel p;
|
|
const int y0 = y * mp->avctx->width;
|
|
int w, i, x = 0;
|
|
|
|
p = mp->vpt[y];
|
|
if (mp->changes_map[y0 + x] == 0) {
|
|
memset(mp->gradient_scale, 1, sizeof(mp->gradient_scale));
|
|
++x;
|
|
}
|
|
while (x < mp->avctx->width) {
|
|
w = mp->changes_map[y0 + x];
|
|
if (w != 0) {
|
|
if ((y & 3) == 0) {
|
|
if (mp->changes_map[y0 + x + mp->avctx->width] < w ||
|
|
mp->changes_map[y0 + x + mp->avctx->width * 2] < w ||
|
|
mp->changes_map[y0 + x + mp->avctx->width * 3] < w) {
|
|
for (i = (x + 3) & ~3; i < x + w; i += 4) {
|
|
mp->hpt[((y / 4) * mp->avctx->width + i) / 4] = mp_get_yuv_from_rgb(mp, i, y);
|
|
}
|
|
}
|
|
}
|
|
x += w;
|
|
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 = av_clip(p.y, 0, 31);
|
|
if ((x & 3) == 0) {
|
|
if ((y & 3) == 0) {
|
|
p.v += mp_gradient(mp, 1, mp_get_vlc(mp, gb));
|
|
p.v = av_clip(p.v, -32, 31);
|
|
p.u += mp_gradient(mp, 2, mp_get_vlc(mp, gb));
|
|
p.u = av_clip(p.u, -32, 31);
|
|
mp->hpt[((y / 4) * mp->avctx->width + x) / 4] = p;
|
|
} else {
|
|
p.v = mp->hpt[((y / 4) * mp->avctx->width + x) / 4].v;
|
|
p.u = mp->hpt[((y / 4) * mp->avctx->width + x) / 4].u;
|
|
}
|
|
}
|
|
mp_set_rgb_from_yuv(mp, x, y, &p);
|
|
++x;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb)
|
|
{
|
|
YuvPixel p;
|
|
int y, y0;
|
|
|
|
av_assert1(mp->changes_map[0]);
|
|
|
|
for (y = 0; y < mp->avctx->height; ++y) {
|
|
if (mp->changes_map[y * mp->avctx->width] != 0) {
|
|
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 = av_clip(p.y, 0, 31);
|
|
if ((y & 3) == 0) {
|
|
p.v += mp_gradient(mp, 1, mp_get_vlc(mp, gb));
|
|
p.v = av_clip(p.v, -32, 31);
|
|
p.u += mp_gradient(mp, 2, mp_get_vlc(mp, gb));
|
|
p.u = av_clip(p.u, -32, 31);
|
|
}
|
|
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);
|
|
}
|
|
|
|
static int mp_decode_frame(AVCodecContext *avctx,
|
|
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, ret;
|
|
|
|
if ((ret = ff_reget_buffer(avctx, &mp->frame)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
/* le32 bitstream msb first */
|
|
av_fast_malloc(&mp->bswapbuf, &mp->bswapbuf_size, buf_size + FF_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);
|
|
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->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);
|
|
}
|
|
|
|
mp->codes_count = get_bits(&gb, 4);
|
|
if (mp->codes_count == 0)
|
|
goto end;
|
|
|
|
if (mp->changes_map[0] == 0) {
|
|
*(uint16_t *)mp->frame.data[0] = get_bits(&gb, 15);
|
|
mp->changes_map[0] = 1;
|
|
}
|
|
if (mp_read_codes_table(mp, &gb) < 0)
|
|
goto end;
|
|
|
|
sz = get_bits(&gb, 18);
|
|
if (avctx->extradata[0] != 5)
|
|
sz += get_bits(&gb, 18);
|
|
if (sz == 0)
|
|
goto end;
|
|
|
|
if (mp->max_codes_bits <= 0)
|
|
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);
|
|
ff_free_vlc(&mp->vlc);
|
|
|
|
end:
|
|
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);
|
|
av_frame_unref(&mp->frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_motionpixels_decoder = {
|
|
.name = "motionpixels",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.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"),
|
|
};
|