mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-18 13:00:00 +01:00
* 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>
382 lines
12 KiB
C
382 lines
12 KiB
C
/*
|
|
* Escape 124 Video Decoder
|
|
* Copyright (C) 2008 Eli Friedman (eli.friedman@gmail.com)
|
|
*
|
|
* 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 "internal.h"
|
|
|
|
#define BITSTREAM_READER_LE
|
|
#include "get_bits.h"
|
|
|
|
typedef union MacroBlock {
|
|
uint16_t pixels[4];
|
|
uint32_t pixels32[2];
|
|
} MacroBlock;
|
|
|
|
typedef union SuperBlock {
|
|
uint16_t pixels[64];
|
|
uint32_t pixels32[32];
|
|
} SuperBlock;
|
|
|
|
typedef struct CodeBook {
|
|
unsigned depth;
|
|
unsigned size;
|
|
MacroBlock* blocks;
|
|
} CodeBook;
|
|
|
|
typedef struct Escape124Context {
|
|
AVFrame frame;
|
|
|
|
unsigned num_superblocks;
|
|
|
|
CodeBook codebooks[3];
|
|
} Escape124Context;
|
|
|
|
static int can_safely_read(GetBitContext* gb, uint64_t bits) {
|
|
return get_bits_left(gb) >= bits;
|
|
}
|
|
|
|
/**
|
|
* Initialize the decoder
|
|
* @param avctx decoder context
|
|
* @return 0 success, negative on error
|
|
*/
|
|
static av_cold int escape124_decode_init(AVCodecContext *avctx)
|
|
{
|
|
Escape124Context *s = avctx->priv_data;
|
|
|
|
avcodec_get_frame_defaults(&s->frame);
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB555;
|
|
|
|
s->num_superblocks = ((unsigned)avctx->width / 8) *
|
|
((unsigned)avctx->height / 8);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int escape124_decode_close(AVCodecContext *avctx)
|
|
{
|
|
unsigned i;
|
|
Escape124Context *s = avctx->priv_data;
|
|
|
|
for (i = 0; i < 3; i++)
|
|
av_free(s->codebooks[i].blocks);
|
|
|
|
av_frame_unref(&s->frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth,
|
|
unsigned size)
|
|
{
|
|
unsigned i, j;
|
|
CodeBook cb = { 0 };
|
|
|
|
if (!can_safely_read(gb, (uint64_t)size * 34))
|
|
return cb;
|
|
|
|
if (size >= INT_MAX / sizeof(MacroBlock))
|
|
return cb;
|
|
cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1);
|
|
if (!cb.blocks)
|
|
return cb;
|
|
|
|
cb.depth = depth;
|
|
cb.size = size;
|
|
for (i = 0; i < size; i++) {
|
|
unsigned mask_bits = get_bits(gb, 4);
|
|
unsigned color0 = get_bits(gb, 15);
|
|
unsigned color1 = get_bits(gb, 15);
|
|
|
|
for (j = 0; j < 4; j++) {
|
|
if (mask_bits & (1 << j))
|
|
cb.blocks[i].pixels[j] = color1;
|
|
else
|
|
cb.blocks[i].pixels[j] = color0;
|
|
}
|
|
}
|
|
return cb;
|
|
}
|
|
|
|
static unsigned decode_skip_count(GetBitContext* gb)
|
|
{
|
|
unsigned value;
|
|
// This function reads a maximum of 23 bits,
|
|
// which is within the padding space
|
|
if (!can_safely_read(gb, 1))
|
|
return -1;
|
|
value = get_bits1(gb);
|
|
if (!value)
|
|
return value;
|
|
|
|
value += get_bits(gb, 3);
|
|
if (value != (1 + ((1 << 3) - 1)))
|
|
return value;
|
|
|
|
value += get_bits(gb, 7);
|
|
if (value != (1 + ((1 << 3) - 1)) + ((1 << 7) - 1))
|
|
return value;
|
|
|
|
return value + get_bits(gb, 12);
|
|
}
|
|
|
|
static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb,
|
|
int* codebook_index, int superblock_index)
|
|
{
|
|
// This function reads a maximum of 22 bits; the callers
|
|
// guard this function appropriately
|
|
unsigned block_index, depth;
|
|
|
|
if (get_bits1(gb)) {
|
|
static const char transitions[3][2] = { {2, 1}, {0, 2}, {1, 0} };
|
|
*codebook_index = transitions[*codebook_index][get_bits1(gb)];
|
|
}
|
|
|
|
depth = s->codebooks[*codebook_index].depth;
|
|
|
|
// depth = 0 means that this shouldn't read any bits;
|
|
// in theory, this is the same as get_bits(gb, 0), but
|
|
// that doesn't actually work.
|
|
block_index = depth ? get_bits(gb, depth) : 0;
|
|
|
|
if (*codebook_index == 1) {
|
|
block_index += superblock_index << s->codebooks[1].depth;
|
|
}
|
|
|
|
// This condition can occur with invalid bitstreams and
|
|
// *codebook_index == 2
|
|
if (block_index >= s->codebooks[*codebook_index].size)
|
|
return (MacroBlock) { { 0 } };
|
|
|
|
return s->codebooks[*codebook_index].blocks[block_index];
|
|
}
|
|
|
|
static void insert_mb_into_sb(SuperBlock* sb, MacroBlock mb, unsigned index) {
|
|
// Formula: ((index / 4) * 16 + (index % 4) * 2) / 2
|
|
uint32_t *dst = sb->pixels32 + index + (index & -4);
|
|
|
|
// This technically violates C99 aliasing rules, but it should be safe.
|
|
dst[0] = mb.pixels32[0];
|
|
dst[4] = mb.pixels32[1];
|
|
}
|
|
|
|
static void copy_superblock(uint16_t* dest, unsigned dest_stride,
|
|
uint16_t* src, unsigned src_stride)
|
|
{
|
|
unsigned y;
|
|
if (src)
|
|
for (y = 0; y < 8; y++)
|
|
memcpy(dest + y * dest_stride, src + y * src_stride,
|
|
sizeof(uint16_t) * 8);
|
|
else
|
|
for (y = 0; y < 8; y++)
|
|
memset(dest + y * dest_stride, 0, sizeof(uint16_t) * 8);
|
|
}
|
|
|
|
static const uint16_t mask_matrix[] = {0x1, 0x2, 0x10, 0x20,
|
|
0x4, 0x8, 0x40, 0x80,
|
|
0x100, 0x200, 0x1000, 0x2000,
|
|
0x400, 0x800, 0x4000, 0x8000};
|
|
|
|
static int escape124_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
Escape124Context *s = avctx->priv_data;
|
|
AVFrame *frame = data;
|
|
|
|
GetBitContext gb;
|
|
unsigned frame_flags, frame_size;
|
|
unsigned i;
|
|
|
|
unsigned superblock_index, cb_index = 1,
|
|
superblock_col_index = 0,
|
|
superblocks_per_row = avctx->width / 8, skip = -1;
|
|
|
|
uint16_t* old_frame_data, *new_frame_data;
|
|
unsigned old_stride, new_stride;
|
|
|
|
int ret;
|
|
|
|
init_get_bits(&gb, buf, buf_size * 8);
|
|
|
|
// This call also guards the potential depth reads for the
|
|
// codebook unpacking.
|
|
if (!can_safely_read(&gb, 64))
|
|
return -1;
|
|
|
|
frame_flags = get_bits_long(&gb, 32);
|
|
frame_size = get_bits_long(&gb, 32);
|
|
|
|
// Leave last frame unchanged
|
|
// FIXME: Is this necessary? I haven't seen it in any real samples
|
|
if (!(frame_flags & 0x114) || !(frame_flags & 0x7800000)) {
|
|
if (!s->frame.data[0])
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
av_log(NULL, AV_LOG_DEBUG, "Skipping frame\n");
|
|
|
|
*got_frame = 1;
|
|
if ((ret = av_frame_ref(frame, &s->frame)) < 0)
|
|
return ret;
|
|
|
|
return frame_size;
|
|
}
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
if (frame_flags & (1 << (17 + i))) {
|
|
unsigned cb_depth, cb_size;
|
|
if (i == 2) {
|
|
// This codebook can be cut off at places other than
|
|
// powers of 2, leaving some of the entries undefined.
|
|
cb_size = get_bits_long(&gb, 20);
|
|
cb_depth = av_log2(cb_size - 1) + 1;
|
|
} else {
|
|
cb_depth = get_bits(&gb, 4);
|
|
if (i == 0) {
|
|
// This is the most basic codebook: pow(2,depth) entries
|
|
// for a depth-length key
|
|
cb_size = 1 << cb_depth;
|
|
} else {
|
|
// This codebook varies per superblock
|
|
// FIXME: I don't think this handles integer overflow
|
|
// properly
|
|
cb_size = s->num_superblocks << cb_depth;
|
|
}
|
|
}
|
|
av_free(s->codebooks[i].blocks);
|
|
s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size);
|
|
if (!s->codebooks[i].blocks)
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
new_frame_data = (uint16_t*)frame->data[0];
|
|
new_stride = frame->linesize[0] / 2;
|
|
old_frame_data = (uint16_t*)s->frame.data[0];
|
|
old_stride = s->frame.linesize[0] / 2;
|
|
|
|
for (superblock_index = 0; superblock_index < s->num_superblocks;
|
|
superblock_index++) {
|
|
MacroBlock mb;
|
|
SuperBlock sb;
|
|
unsigned multi_mask = 0;
|
|
|
|
if (skip == -1) {
|
|
// Note that this call will make us skip the rest of the blocks
|
|
// if the frame prematurely ends
|
|
skip = decode_skip_count(&gb);
|
|
}
|
|
|
|
if (skip) {
|
|
copy_superblock(new_frame_data, new_stride,
|
|
old_frame_data, old_stride);
|
|
} else {
|
|
copy_superblock(sb.pixels, 8,
|
|
old_frame_data, old_stride);
|
|
|
|
while (can_safely_read(&gb, 1) && !get_bits1(&gb)) {
|
|
unsigned mask;
|
|
mb = decode_macroblock(s, &gb, &cb_index, superblock_index);
|
|
mask = get_bits(&gb, 16);
|
|
multi_mask |= mask;
|
|
for (i = 0; i < 16; i++) {
|
|
if (mask & mask_matrix[i]) {
|
|
insert_mb_into_sb(&sb, mb, i);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (can_safely_read(&gb, 1) && !get_bits1(&gb)) {
|
|
unsigned inv_mask = get_bits(&gb, 4);
|
|
for (i = 0; i < 4; i++) {
|
|
if (inv_mask & (1 << i)) {
|
|
multi_mask ^= 0xF << i*4;
|
|
} else {
|
|
multi_mask ^= get_bits(&gb, 4) << i*4;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
if (multi_mask & mask_matrix[i]) {
|
|
if (!can_safely_read(&gb, 1))
|
|
break;
|
|
mb = decode_macroblock(s, &gb, &cb_index,
|
|
superblock_index);
|
|
insert_mb_into_sb(&sb, mb, i);
|
|
}
|
|
}
|
|
} else if (frame_flags & (1 << 16)) {
|
|
while (can_safely_read(&gb, 1) && !get_bits1(&gb)) {
|
|
mb = decode_macroblock(s, &gb, &cb_index, superblock_index);
|
|
insert_mb_into_sb(&sb, mb, get_bits(&gb, 4));
|
|
}
|
|
}
|
|
|
|
copy_superblock(new_frame_data, new_stride, sb.pixels, 8);
|
|
}
|
|
|
|
superblock_col_index++;
|
|
new_frame_data += 8;
|
|
if (old_frame_data)
|
|
old_frame_data += 8;
|
|
if (superblock_col_index == superblocks_per_row) {
|
|
new_frame_data += new_stride * 8 - superblocks_per_row * 8;
|
|
if (old_frame_data)
|
|
old_frame_data += old_stride * 8 - superblocks_per_row * 8;
|
|
superblock_col_index = 0;
|
|
}
|
|
skip--;
|
|
}
|
|
|
|
av_log(NULL, AV_LOG_DEBUG,
|
|
"Escape sizes: %i, %i, %i\n",
|
|
frame_size, buf_size, get_bits_count(&gb) / 8);
|
|
|
|
av_frame_unref(&s->frame);
|
|
if ((ret = av_frame_ref(&s->frame, frame)) < 0)
|
|
return ret;
|
|
|
|
*got_frame = 1;
|
|
|
|
return frame_size;
|
|
}
|
|
|
|
|
|
AVCodec ff_escape124_decoder = {
|
|
.name = "escape124",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_ESCAPE124,
|
|
.priv_data_size = sizeof(Escape124Context),
|
|
.init = escape124_decode_init,
|
|
.close = escape124_decode_close,
|
|
.decode = escape124_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
|
|
};
|