mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-20 14:00:13 +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>
322 lines
9.8 KiB
C
322 lines
9.8 KiB
C
/*
|
|
* Escape 130 Video Decoder
|
|
* Copyright (C) 2008 Eli Friedman (eli.friedman <at> 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"
|
|
|
|
#define BITSTREAM_READER_LE
|
|
#include "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
|
|
typedef struct Escape130Context {
|
|
AVFrame frame;
|
|
uint8_t *bases;
|
|
} Escape130Context;
|
|
|
|
/**
|
|
* Initialize the decoder
|
|
* @param avctx decoder context
|
|
* @return 0 success, negative on error
|
|
*/
|
|
static av_cold int escape130_decode_init(AVCodecContext *avctx)
|
|
{
|
|
Escape130Context *s = avctx->priv_data;
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
|
|
avcodec_get_frame_defaults(&s->frame);
|
|
|
|
if((avctx->width&1) || (avctx->height&1)){
|
|
av_log(avctx, AV_LOG_ERROR, "Dimensions are not a multiple of the block size\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
s->bases= av_malloc(avctx->width * avctx->height /4);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int escape130_decode_close(AVCodecContext *avctx)
|
|
{
|
|
Escape130Context *s = avctx->priv_data;
|
|
|
|
av_frame_unref(&s->frame);
|
|
|
|
av_freep(&s->bases);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static unsigned decode_skip_count(GetBitContext* gb) {
|
|
unsigned value;
|
|
// This function reads a maximum of 27 bits,
|
|
// which is within the padding space
|
|
if (get_bits_left(gb) < 1+3)
|
|
return -1;
|
|
|
|
value = get_bits1(gb);
|
|
if (value)
|
|
return 0;
|
|
|
|
value = get_bits(gb, 3);
|
|
if (value)
|
|
return value;
|
|
|
|
value = get_bits(gb, 8);
|
|
if (value)
|
|
return value + 7;
|
|
|
|
value = get_bits(gb, 15);
|
|
if (value)
|
|
return value + 262;
|
|
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Decode a single frame
|
|
* @param avctx decoder context
|
|
* @param data decoded frame
|
|
* @param got_frame have decoded frame
|
|
* @param buf input buffer
|
|
* @param buf_size input buffer size
|
|
* @return 0 success, -1 on error
|
|
*/
|
|
static int escape130_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
Escape130Context *s = avctx->priv_data;
|
|
|
|
GetBitContext gb;
|
|
unsigned i;
|
|
int ret;
|
|
|
|
uint8_t *old_y, *old_cb, *old_cr,
|
|
*new_y, *new_cb, *new_cr;
|
|
unsigned old_y_stride, old_cb_stride, old_cr_stride,
|
|
new_y_stride, new_cb_stride, new_cr_stride;
|
|
unsigned total_blocks = avctx->width * avctx->height / 4,
|
|
block_index, row_index = 0;
|
|
unsigned y[4] = {0}, cb = 16, cr = 16;
|
|
unsigned skip = -1;
|
|
unsigned y_base = 0;
|
|
uint8_t *yb= s->bases;
|
|
|
|
AVFrame *frame = data;
|
|
|
|
init_get_bits(&gb, buf, buf_size * 8);
|
|
|
|
if (get_bits_left(&gb) < 128)
|
|
return -1;
|
|
|
|
// Header; no useful information in here
|
|
skip_bits_long(&gb, 128);
|
|
|
|
if (ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return -1;
|
|
}
|
|
|
|
new_y = frame->data[0];
|
|
new_cb = frame->data[1];
|
|
new_cr = frame->data[2];
|
|
new_y_stride = frame->linesize[0];
|
|
new_cb_stride = frame->linesize[1];
|
|
new_cr_stride = frame->linesize[2];
|
|
old_y = s->frame.data[0];
|
|
old_cb = s->frame.data[1];
|
|
old_cr = s->frame.data[2];
|
|
old_y_stride = s->frame.linesize[0];
|
|
old_cb_stride = s->frame.linesize[1];
|
|
old_cr_stride = s->frame.linesize[2];
|
|
|
|
av_log(avctx, AV_LOG_DEBUG,
|
|
"Strides: %i, %i\n",
|
|
new_y_stride, new_cb_stride);
|
|
|
|
for (block_index = 0; block_index < total_blocks; block_index++) {
|
|
// Note that this call will make us skip the rest of the blocks
|
|
// if the frame prematurely ends
|
|
if (skip == -1)
|
|
skip = decode_skip_count(&gb);
|
|
|
|
if (skip) {
|
|
if (old_y) {
|
|
y[0] = old_y[0] / 4;
|
|
y[1] = old_y[1] / 4;
|
|
y[2] = old_y[old_y_stride] / 4;
|
|
y[3] = old_y[old_y_stride+1] / 4;
|
|
y_base= yb[0];
|
|
cb = old_cb[0] / 8;
|
|
cr = old_cr[0] / 8;
|
|
} else {
|
|
y_base=y[0] = y[1] = y[2] = y[3] = 0;
|
|
cb = cr = 16;
|
|
}
|
|
} else {
|
|
if (get_bits1(&gb)) {
|
|
static const uint8_t offset_table[] = {2, 4, 10, 20};
|
|
static const int8_t sign_table[64][4] =
|
|
{ {0, 0, 0, 0},
|
|
{-1, 1, 0, 0},
|
|
{1, -1, 0, 0},
|
|
{-1, 0, 1, 0},
|
|
{-1, 1, 1, 0},
|
|
{0, -1, 1, 0},
|
|
{1, -1, 1, 0},
|
|
{-1, -1, 1, 0},
|
|
{1, 0, -1, 0},
|
|
{0, 1, -1, 0},
|
|
{1, 1, -1, 0},
|
|
{-1, 1, -1, 0},
|
|
{1, -1, -1, 0},
|
|
{-1, 0, 0, 1},
|
|
{-1, 1, 0, 1},
|
|
{0, -1, 0, 1},
|
|
|
|
{0, 0, 0, 0},
|
|
{1, -1, 0, 1},
|
|
{-1, -1, 0, 1},
|
|
{-1, 0, 1, 1},
|
|
{-1, 1, 1, 1},
|
|
{0, -1, 1, 1},
|
|
{1, -1, 1, 1},
|
|
{-1, -1, 1, 1},
|
|
{0, 0, -1, 1},
|
|
{1, 0, -1, 1},
|
|
{-1, 0, -1, 1},
|
|
{0, 1, -1, 1},
|
|
{1, 1, -1, 1},
|
|
{-1, 1, -1, 1},
|
|
{0, -1, -1, 1},
|
|
{1, -1, -1, 1},
|
|
|
|
{0, 0, 0, 0},
|
|
{-1, -1, -1, 1},
|
|
{1, 0, 0, -1},
|
|
{0, 1, 0, -1},
|
|
{1, 1, 0, -1},
|
|
{-1, 1, 0, -1},
|
|
{1, -1, 0, -1},
|
|
{0, 0, 1, -1},
|
|
{1, 0, 1, -1},
|
|
{-1, 0, 1, -1},
|
|
{0, 1, 1, -1},
|
|
{1, 1, 1, -1},
|
|
{-1, 1, 1, -1},
|
|
{0, -1, 1, -1},
|
|
{1, -1, 1, -1},
|
|
{-1, -1, 1, -1},
|
|
|
|
{0, 0, 0, 0},
|
|
{1, 0, -1, -1},
|
|
{0, 1, -1, -1},
|
|
{1, 1, -1, -1},
|
|
{-1, 1, -1, -1},
|
|
{1, -1, -1, -1} };
|
|
unsigned sign_selector = get_bits(&gb, 6);
|
|
unsigned difference_selector = get_bits(&gb, 2);
|
|
y_base = 2 * get_bits(&gb, 5);
|
|
for (i = 0; i < 4; i++) {
|
|
y[i] = av_clip((int)y_base + offset_table[difference_selector] *
|
|
sign_table[sign_selector][i], 0, 63);
|
|
}
|
|
} else if (get_bits1(&gb)) {
|
|
if (get_bits1(&gb)) {
|
|
y_base = get_bits(&gb, 6);
|
|
} else {
|
|
unsigned adjust_index = get_bits(&gb, 3);
|
|
static const int8_t adjust[] = {-4, -3, -2, -1, 1, 2, 3, 4};
|
|
y_base = (y_base + adjust[adjust_index]) & 63;
|
|
}
|
|
for (i = 0; i < 4; i++)
|
|
y[i] = y_base;
|
|
}
|
|
|
|
if (get_bits1(&gb)) {
|
|
if (get_bits1(&gb)) {
|
|
cb = get_bits(&gb, 5);
|
|
cr = get_bits(&gb, 5);
|
|
} else {
|
|
unsigned adjust_index = get_bits(&gb, 3);
|
|
static const int8_t adjust[2][8] =
|
|
{ { 1, 1, 0, -1, -1, -1, 0, 1 },
|
|
{ 0, 1, 1, 1, 0, -1, -1, -1 } };
|
|
cb = (cb + adjust[0][adjust_index]) & 31;
|
|
cr = (cr + adjust[1][adjust_index]) & 31;
|
|
}
|
|
}
|
|
}
|
|
*yb++= y_base;
|
|
|
|
new_y[0] = y[0] * 4;
|
|
new_y[1] = y[1] * 4;
|
|
new_y[new_y_stride] = y[2] * 4;
|
|
new_y[new_y_stride + 1] = y[3] * 4;
|
|
*new_cb = cb * 8;
|
|
*new_cr = cr * 8;
|
|
|
|
if (old_y)
|
|
old_y += 2, old_cb++, old_cr++;
|
|
new_y += 2, new_cb++, new_cr++;
|
|
row_index++;
|
|
if (avctx->width / 2 == row_index) {
|
|
row_index = 0;
|
|
if (old_y) {
|
|
old_y += old_y_stride * 2 - avctx->width;
|
|
old_cb += old_cb_stride - avctx->width / 2;
|
|
old_cr += old_cr_stride - avctx->width / 2;
|
|
}
|
|
new_y += new_y_stride * 2 - avctx->width;
|
|
new_cb += new_cb_stride - avctx->width / 2;
|
|
new_cr += new_cr_stride - avctx->width / 2;
|
|
}
|
|
|
|
skip--;
|
|
}
|
|
|
|
av_log(avctx, AV_LOG_DEBUG,
|
|
"Escape sizes: %i, %i\n",
|
|
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 buf_size;
|
|
}
|
|
|
|
|
|
AVCodec ff_escape130_decoder = {
|
|
.name = "escape130",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_ESCAPE130,
|
|
.priv_data_size = sizeof(Escape130Context),
|
|
.init = escape130_decode_init,
|
|
.close = escape130_decode_close,
|
|
.decode = escape130_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
|
|
};
|