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>
353 lines
11 KiB
C
353 lines
11 KiB
C
/*
|
|
* QPEG codec
|
|
* Copyright (c) 2004 Konstantin Shishkov
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* QPEG codec.
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct QpegContext{
|
|
AVCodecContext *avctx;
|
|
AVFrame pic, ref;
|
|
uint32_t pal[256];
|
|
GetByteContext buffer;
|
|
} QpegContext;
|
|
|
|
static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst,
|
|
int stride, int width, int height)
|
|
{
|
|
int i;
|
|
int code;
|
|
int c0, c1;
|
|
int run, copy;
|
|
int filled = 0;
|
|
int rows_to_go;
|
|
|
|
rows_to_go = height;
|
|
height--;
|
|
dst = dst + height * stride;
|
|
|
|
while ((bytestream2_get_bytes_left(&qctx->buffer) > 0) && (rows_to_go > 0)) {
|
|
code = bytestream2_get_byte(&qctx->buffer);
|
|
run = copy = 0;
|
|
if(code == 0xFC) /* end-of-picture code */
|
|
break;
|
|
if(code >= 0xF8) { /* very long run */
|
|
c0 = bytestream2_get_byte(&qctx->buffer);
|
|
c1 = bytestream2_get_byte(&qctx->buffer);
|
|
run = ((code & 0x7) << 16) + (c0 << 8) + c1 + 2;
|
|
} else if (code >= 0xF0) { /* long run */
|
|
c0 = bytestream2_get_byte(&qctx->buffer);
|
|
run = ((code & 0xF) << 8) + c0 + 2;
|
|
} else if (code >= 0xE0) { /* short run */
|
|
run = (code & 0x1F) + 2;
|
|
} else if (code >= 0xC0) { /* very long copy */
|
|
c0 = bytestream2_get_byte(&qctx->buffer);
|
|
c1 = bytestream2_get_byte(&qctx->buffer);
|
|
copy = ((code & 0x3F) << 16) + (c0 << 8) + c1 + 1;
|
|
} else if (code >= 0x80) { /* long copy */
|
|
c0 = bytestream2_get_byte(&qctx->buffer);
|
|
copy = ((code & 0x7F) << 8) + c0 + 1;
|
|
} else { /* short copy */
|
|
copy = code + 1;
|
|
}
|
|
|
|
/* perform actual run or copy */
|
|
if(run) {
|
|
int p;
|
|
|
|
p = bytestream2_get_byte(&qctx->buffer);
|
|
for(i = 0; i < run; i++) {
|
|
dst[filled++] = p;
|
|
if (filled >= width) {
|
|
filled = 0;
|
|
dst -= stride;
|
|
rows_to_go--;
|
|
if(rows_to_go <= 0)
|
|
break;
|
|
}
|
|
}
|
|
} else {
|
|
for(i = 0; i < copy; i++) {
|
|
dst[filled++] = bytestream2_get_byte(&qctx->buffer);
|
|
if (filled >= width) {
|
|
filled = 0;
|
|
dst -= stride;
|
|
rows_to_go--;
|
|
if(rows_to_go <= 0)
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static const int qpeg_table_h[16] =
|
|
{ 0x00, 0x20, 0x20, 0x20, 0x18, 0x10, 0x10, 0x20, 0x10, 0x08, 0x18, 0x08, 0x08, 0x18, 0x10, 0x04};
|
|
static const int qpeg_table_w[16] =
|
|
{ 0x00, 0x20, 0x18, 0x08, 0x18, 0x10, 0x20, 0x10, 0x08, 0x10, 0x20, 0x20, 0x08, 0x10, 0x18, 0x04};
|
|
|
|
/* Decodes delta frames */
|
|
static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
|
|
int stride, int width, int height,
|
|
int delta, const uint8_t *ctable,
|
|
uint8_t *refdata)
|
|
{
|
|
int i, j;
|
|
int code;
|
|
int filled = 0;
|
|
int orig_height;
|
|
|
|
if(!refdata)
|
|
refdata= dst;
|
|
|
|
/* copy prev frame */
|
|
for(i = 0; i < height; i++)
|
|
memcpy(dst + (i * stride), refdata + (i * stride), width);
|
|
|
|
orig_height = height;
|
|
height--;
|
|
dst = dst + height * stride;
|
|
|
|
while ((bytestream2_get_bytes_left(&qctx->buffer) > 0) && (height >= 0)) {
|
|
code = bytestream2_get_byte(&qctx->buffer);
|
|
|
|
if(delta) {
|
|
/* motion compensation */
|
|
while(bytestream2_get_bytes_left(&qctx->buffer) > 0 && (code & 0xF0) == 0xF0) {
|
|
if(delta == 1) {
|
|
int me_idx;
|
|
int me_w, me_h, me_x, me_y;
|
|
uint8_t *me_plane;
|
|
int corr, val;
|
|
|
|
/* get block size by index */
|
|
me_idx = code & 0xF;
|
|
me_w = qpeg_table_w[me_idx];
|
|
me_h = qpeg_table_h[me_idx];
|
|
|
|
/* extract motion vector */
|
|
corr = bytestream2_get_byte(&qctx->buffer);
|
|
|
|
val = corr >> 4;
|
|
if(val > 7)
|
|
val -= 16;
|
|
me_x = val;
|
|
|
|
val = corr & 0xF;
|
|
if(val > 7)
|
|
val -= 16;
|
|
me_y = val;
|
|
|
|
/* check motion vector */
|
|
if ((me_x + filled < 0) || (me_x + me_w + filled > width) ||
|
|
(height - me_y - me_h < 0) || (height - me_y > orig_height) ||
|
|
(filled + me_w > width) || (height - me_h < 0))
|
|
av_log(NULL, AV_LOG_ERROR, "Bogus motion vector (%i,%i), block size %ix%i at %i,%i\n",
|
|
me_x, me_y, me_w, me_h, filled, height);
|
|
else {
|
|
/* do motion compensation */
|
|
me_plane = refdata + (filled + me_x) + (height - me_y) * stride;
|
|
for(j = 0; j < me_h; j++) {
|
|
for(i = 0; i < me_w; i++)
|
|
dst[filled + i - (j * stride)] = me_plane[i - (j * stride)];
|
|
}
|
|
}
|
|
}
|
|
code = bytestream2_get_byte(&qctx->buffer);
|
|
}
|
|
}
|
|
|
|
if(code == 0xE0) /* end-of-picture code */
|
|
break;
|
|
if(code > 0xE0) { /* run code: 0xE1..0xFF */
|
|
int p;
|
|
|
|
code &= 0x1F;
|
|
p = bytestream2_get_byte(&qctx->buffer);
|
|
for(i = 0; i <= code; i++) {
|
|
dst[filled++] = p;
|
|
if(filled >= width) {
|
|
filled = 0;
|
|
dst -= stride;
|
|
height--;
|
|
if(height < 0)
|
|
break;
|
|
}
|
|
}
|
|
} else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
|
|
code &= 0x1F;
|
|
|
|
if(code + 1 > bytestream2_get_bytes_left(&qctx->buffer))
|
|
break;
|
|
|
|
for(i = 0; i <= code; i++) {
|
|
dst[filled++] = bytestream2_get_byte(&qctx->buffer);
|
|
if(filled >= width) {
|
|
filled = 0;
|
|
dst -= stride;
|
|
height--;
|
|
if(height < 0)
|
|
break;
|
|
}
|
|
}
|
|
} else if(code >= 0x80) { /* skip code: 0x80..0xBF */
|
|
int skip;
|
|
|
|
code &= 0x3F;
|
|
/* codes 0x80 and 0x81 are actually escape codes,
|
|
skip value minus constant is in the next byte */
|
|
if(!code)
|
|
skip = bytestream2_get_byte(&qctx->buffer) + 64;
|
|
else if(code == 1)
|
|
skip = bytestream2_get_byte(&qctx->buffer) + 320;
|
|
else
|
|
skip = code;
|
|
filled += skip;
|
|
while( filled >= width) {
|
|
filled -= width;
|
|
dst -= stride;
|
|
height--;
|
|
if(height < 0)
|
|
break;
|
|
}
|
|
} else {
|
|
/* zero code treated as one-pixel skip */
|
|
if(code) {
|
|
dst[filled++] = ctable[code & 0x7F];
|
|
}
|
|
else
|
|
filled++;
|
|
if(filled >= width) {
|
|
filled = 0;
|
|
dst -= stride;
|
|
height--;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
uint8_t ctable[128];
|
|
QpegContext * const a = avctx->priv_data;
|
|
AVFrame * p = &a->pic;
|
|
AVFrame * ref= &a->ref;
|
|
uint8_t* outdata;
|
|
int delta, ret;
|
|
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
|
|
|
|
if (avpkt->size < 0x86) {
|
|
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
bytestream2_init(&a->buffer, avpkt->data, avpkt->size);
|
|
|
|
av_frame_unref(ref);
|
|
av_frame_move_ref(ref, p);
|
|
|
|
if ((ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
outdata = a->pic.data[0];
|
|
bytestream2_skip(&a->buffer, 4);
|
|
bytestream2_get_buffer(&a->buffer, ctable, 128);
|
|
bytestream2_skip(&a->buffer, 1);
|
|
|
|
delta = bytestream2_get_byte(&a->buffer);
|
|
if(delta == 0x10) {
|
|
qpeg_decode_intra(a, outdata, a->pic.linesize[0], avctx->width, avctx->height);
|
|
} else {
|
|
qpeg_decode_inter(a, outdata, a->pic.linesize[0], avctx->width, avctx->height, delta, ctable, a->ref.data[0]);
|
|
}
|
|
|
|
/* make the palette available on the way out */
|
|
if (pal) {
|
|
a->pic.palette_has_changed = 1;
|
|
memcpy(a->pal, pal, AVPALETTE_SIZE);
|
|
}
|
|
memcpy(a->pic.data[1], a->pal, AVPALETTE_SIZE);
|
|
|
|
if ((ret = av_frame_ref(data, &a->pic)) < 0)
|
|
return ret;
|
|
|
|
*got_frame = 1;
|
|
|
|
return avpkt->size;
|
|
}
|
|
|
|
static void decode_flush(AVCodecContext *avctx){
|
|
QpegContext * const a = avctx->priv_data;
|
|
int i, pal_size;
|
|
const uint8_t *pal_src;
|
|
|
|
pal_size = FFMIN(1024U, avctx->extradata_size);
|
|
pal_src = avctx->extradata + avctx->extradata_size - pal_size;
|
|
|
|
for (i=0; i<pal_size/4; i++)
|
|
a->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i);
|
|
}
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx){
|
|
QpegContext * const a = avctx->priv_data;
|
|
|
|
avcodec_get_frame_defaults(&a->pic);
|
|
avcodec_get_frame_defaults(&a->ref);
|
|
a->avctx = avctx;
|
|
avctx->pix_fmt= AV_PIX_FMT_PAL8;
|
|
|
|
decode_flush(avctx);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx){
|
|
QpegContext * const a = avctx->priv_data;
|
|
AVFrame * const p = &a->pic;
|
|
AVFrame * const ref= &a->ref;
|
|
|
|
av_frame_unref(p);
|
|
av_frame_unref(ref);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_qpeg_decoder = {
|
|
.name = "qpeg",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_QPEG,
|
|
.priv_data_size = sizeof(QpegContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.flush = decode_flush,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
|
|
};
|