mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +02:00
80e9e63c94
* 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>
393 lines
12 KiB
C
393 lines
12 KiB
C
/*
|
|
* Chronomaster DFA Video Decoder
|
|
* Copyright (c) 2011 Konstantin Shishkov
|
|
* based on work by Vladimir "VAG" Gneushev
|
|
*
|
|
* 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 "libavutil/avassert.h"
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
#include "libavutil/imgutils.h"
|
|
#include "libavutil/mem.h"
|
|
|
|
typedef struct DfaContext {
|
|
uint32_t pal[256];
|
|
uint8_t *frame_buf;
|
|
} DfaContext;
|
|
|
|
static av_cold int dfa_decode_init(AVCodecContext *avctx)
|
|
{
|
|
DfaContext *s = avctx->priv_data;
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
|
|
if (!avctx->width || !avctx->height)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
av_assert0(av_image_check_size(avctx->width, avctx->height, 0, avctx) >= 0);
|
|
|
|
s->frame_buf = av_mallocz(avctx->width * avctx->height);
|
|
if (!s->frame_buf)
|
|
return AVERROR(ENOMEM);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_copy(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
const int size = width * height;
|
|
|
|
if (bytestream2_get_buffer(gb, frame, size) != size)
|
|
return AVERROR_INVALIDDATA;
|
|
return 0;
|
|
}
|
|
|
|
static int decode_tsw1(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
const uint8_t *frame_start = frame;
|
|
const uint8_t *frame_end = frame + width * height;
|
|
int mask = 0x10000, bitbuf = 0;
|
|
int v, count, segments;
|
|
unsigned offset;
|
|
|
|
segments = bytestream2_get_le32(gb);
|
|
offset = bytestream2_get_le32(gb);
|
|
if (segments == 0 && offset == frame_end - frame)
|
|
return 0; // skip frame
|
|
if (frame_end - frame <= offset)
|
|
return AVERROR_INVALIDDATA;
|
|
frame += offset;
|
|
while (segments--) {
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (mask == 0x10000) {
|
|
bitbuf = bytestream2_get_le16u(gb);
|
|
mask = 1;
|
|
}
|
|
if (frame_end - frame < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (bitbuf & mask) {
|
|
v = bytestream2_get_le16(gb);
|
|
offset = (v & 0x1FFF) << 1;
|
|
count = ((v >> 13) + 2) << 1;
|
|
if (frame - frame_start < offset || frame_end - frame < count)
|
|
return AVERROR_INVALIDDATA;
|
|
av_memcpy_backptr(frame, offset, count);
|
|
frame += count;
|
|
} else {
|
|
*frame++ = bytestream2_get_byte(gb);
|
|
*frame++ = bytestream2_get_byte(gb);
|
|
}
|
|
mask <<= 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_dsw1(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
const uint8_t *frame_start = frame;
|
|
const uint8_t *frame_end = frame + width * height;
|
|
int mask = 0x10000, bitbuf = 0;
|
|
int v, offset, count, segments;
|
|
|
|
segments = bytestream2_get_le16(gb);
|
|
while (segments--) {
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (mask == 0x10000) {
|
|
bitbuf = bytestream2_get_le16u(gb);
|
|
mask = 1;
|
|
}
|
|
if (frame_end - frame < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (bitbuf & mask) {
|
|
v = bytestream2_get_le16(gb);
|
|
offset = (v & 0x1FFF) << 1;
|
|
count = ((v >> 13) + 2) << 1;
|
|
if (frame - frame_start < offset || frame_end - frame < count)
|
|
return AVERROR_INVALIDDATA;
|
|
av_memcpy_backptr(frame, offset, count);
|
|
frame += count;
|
|
} else if (bitbuf & (mask << 1)) {
|
|
frame += bytestream2_get_le16(gb);
|
|
} else {
|
|
*frame++ = bytestream2_get_byte(gb);
|
|
*frame++ = bytestream2_get_byte(gb);
|
|
}
|
|
mask <<= 2;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_dds1(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
const uint8_t *frame_start = frame;
|
|
const uint8_t *frame_end = frame + width * height;
|
|
int mask = 0x10000, bitbuf = 0;
|
|
int i, v, offset, count, segments;
|
|
|
|
segments = bytestream2_get_le16(gb);
|
|
while (segments--) {
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (mask == 0x10000) {
|
|
bitbuf = bytestream2_get_le16u(gb);
|
|
mask = 1;
|
|
}
|
|
|
|
if (bitbuf & mask) {
|
|
v = bytestream2_get_le16(gb);
|
|
offset = (v & 0x1FFF) << 2;
|
|
count = ((v >> 13) + 2) << 1;
|
|
if (frame - frame_start < offset || frame_end - frame < count*2 + width)
|
|
return AVERROR_INVALIDDATA;
|
|
for (i = 0; i < count; i++) {
|
|
frame[0] = frame[1] =
|
|
frame[width] = frame[width + 1] = frame[-offset];
|
|
|
|
frame += 2;
|
|
}
|
|
} else if (bitbuf & (mask << 1)) {
|
|
v = bytestream2_get_le16(gb)*2;
|
|
if (frame - frame_end < v)
|
|
return AVERROR_INVALIDDATA;
|
|
frame += v;
|
|
} else {
|
|
if (frame_end - frame < width + 3)
|
|
return AVERROR_INVALIDDATA;
|
|
frame[0] = frame[1] =
|
|
frame[width] = frame[width + 1] = bytestream2_get_byte(gb);
|
|
frame += 2;
|
|
frame[0] = frame[1] =
|
|
frame[width] = frame[width + 1] = bytestream2_get_byte(gb);
|
|
frame += 2;
|
|
}
|
|
mask <<= 2;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_bdlt(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
uint8_t *line_ptr;
|
|
int count, lines, segments;
|
|
|
|
count = bytestream2_get_le16(gb);
|
|
if (count >= height)
|
|
return AVERROR_INVALIDDATA;
|
|
frame += width * count;
|
|
lines = bytestream2_get_le16(gb);
|
|
if (count + lines > height)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
while (lines--) {
|
|
if (bytestream2_get_bytes_left(gb) < 1)
|
|
return AVERROR_INVALIDDATA;
|
|
line_ptr = frame;
|
|
frame += width;
|
|
segments = bytestream2_get_byteu(gb);
|
|
while (segments--) {
|
|
if (frame - line_ptr <= bytestream2_peek_byte(gb))
|
|
return AVERROR_INVALIDDATA;
|
|
line_ptr += bytestream2_get_byte(gb);
|
|
count = (int8_t)bytestream2_get_byte(gb);
|
|
if (count >= 0) {
|
|
if (frame - line_ptr < count)
|
|
return AVERROR_INVALIDDATA;
|
|
if (bytestream2_get_buffer(gb, line_ptr, count) != count)
|
|
return AVERROR_INVALIDDATA;
|
|
} else {
|
|
count = -count;
|
|
if (frame - line_ptr < count)
|
|
return AVERROR_INVALIDDATA;
|
|
memset(line_ptr, bytestream2_get_byte(gb), count);
|
|
}
|
|
line_ptr += count;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
const uint8_t *frame_end = frame + width * height;
|
|
uint8_t *line_ptr;
|
|
int count, i, v, lines, segments;
|
|
int y = 0;
|
|
|
|
lines = bytestream2_get_le16(gb);
|
|
if (lines > height)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
while (lines--) {
|
|
if (bytestream2_get_bytes_left(gb) < 2)
|
|
return AVERROR_INVALIDDATA;
|
|
segments = bytestream2_get_le16u(gb);
|
|
while ((segments & 0xC000) == 0xC000) {
|
|
unsigned skip_lines = -(int16_t)segments;
|
|
unsigned delta = -((int16_t)segments * width);
|
|
if (frame_end - frame <= delta || y + lines + skip_lines > height)
|
|
return AVERROR_INVALIDDATA;
|
|
frame += delta;
|
|
y += skip_lines;
|
|
segments = bytestream2_get_le16(gb);
|
|
}
|
|
if (frame_end <= frame)
|
|
return -1;
|
|
if (segments & 0x8000) {
|
|
frame[width - 1] = segments & 0xFF;
|
|
segments = bytestream2_get_le16(gb);
|
|
}
|
|
line_ptr = frame;
|
|
frame += width;
|
|
y++;
|
|
while (segments--) {
|
|
if (frame - line_ptr <= bytestream2_peek_byte(gb))
|
|
return AVERROR_INVALIDDATA;
|
|
line_ptr += bytestream2_get_byte(gb);
|
|
count = (int8_t)bytestream2_get_byte(gb);
|
|
if (count >= 0) {
|
|
if (frame - line_ptr < count * 2)
|
|
return AVERROR_INVALIDDATA;
|
|
if (bytestream2_get_buffer(gb, line_ptr, count * 2) != count * 2)
|
|
return AVERROR_INVALIDDATA;
|
|
line_ptr += count * 2;
|
|
} else {
|
|
count = -count;
|
|
if (frame - line_ptr < count * 2)
|
|
return AVERROR_INVALIDDATA;
|
|
v = bytestream2_get_le16(gb);
|
|
for (i = 0; i < count; i++)
|
|
bytestream_put_le16(&line_ptr, v);
|
|
}
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height)
|
|
{
|
|
memset(frame, 0, width * height);
|
|
return 0;
|
|
}
|
|
|
|
|
|
typedef int (*chunk_decoder)(GetByteContext *gb, uint8_t *frame, int width, int height);
|
|
|
|
static const chunk_decoder decoder[8] = {
|
|
decode_copy, decode_tsw1, decode_bdlt, decode_wdlt,
|
|
decode_unk6, decode_dsw1, decode_blck, decode_dds1,
|
|
};
|
|
|
|
static const char* chunk_name[8] = {
|
|
"COPY", "TSW1", "BDLT", "WDLT", "????", "DSW1", "BLCK", "DDS1"
|
|
};
|
|
|
|
static int dfa_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
AVFrame *frame = data;
|
|
DfaContext *s = avctx->priv_data;
|
|
GetByteContext gb;
|
|
const uint8_t *buf = avpkt->data;
|
|
uint32_t chunk_type, chunk_size;
|
|
uint8_t *dst;
|
|
int ret;
|
|
int i, pal_elems;
|
|
|
|
if ((ret = ff_get_buffer(avctx, frame, 0))) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
bytestream2_init(&gb, avpkt->data, avpkt->size);
|
|
while (bytestream2_get_bytes_left(&gb) > 0) {
|
|
bytestream2_skip(&gb, 4);
|
|
chunk_size = bytestream2_get_le32(&gb);
|
|
chunk_type = bytestream2_get_le32(&gb);
|
|
if (!chunk_type)
|
|
break;
|
|
if (chunk_type == 1) {
|
|
pal_elems = FFMIN(chunk_size / 3, 256);
|
|
for (i = 0; i < pal_elems; i++) {
|
|
s->pal[i] = bytestream2_get_be24(&gb) << 2;
|
|
s->pal[i] |= 0xFFU << 24 | (s->pal[i] >> 6) & 0x30303;
|
|
}
|
|
frame->palette_has_changed = 1;
|
|
} else if (chunk_type <= 9) {
|
|
if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) {
|
|
av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",
|
|
chunk_name[chunk_type - 2]);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
} else {
|
|
av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n",
|
|
chunk_type);
|
|
}
|
|
buf += chunk_size;
|
|
}
|
|
|
|
buf = s->frame_buf;
|
|
dst = frame->data[0];
|
|
for (i = 0; i < avctx->height; i++) {
|
|
memcpy(dst, buf, avctx->width);
|
|
dst += frame->linesize[0];
|
|
buf += avctx->width;
|
|
}
|
|
memcpy(frame->data[1], s->pal, sizeof(s->pal));
|
|
|
|
*got_frame = 1;
|
|
|
|
return avpkt->size;
|
|
}
|
|
|
|
static av_cold int dfa_decode_end(AVCodecContext *avctx)
|
|
{
|
|
DfaContext *s = avctx->priv_data;
|
|
|
|
av_freep(&s->frame_buf);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_dfa_decoder = {
|
|
.name = "dfa",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_DFA,
|
|
.priv_data_size = sizeof(DfaContext),
|
|
.init = dfa_decode_init,
|
|
.close = dfa_decode_end,
|
|
.decode = dfa_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"),
|
|
};
|