* 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>
334 lines
10 KiB
C
334 lines
10 KiB
C
/*
|
|
* Feeble Files/ScummVM DXA decoder
|
|
* Copyright (c) 2007 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
|
|
* DXA Video decoder
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "bytestream.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
|
|
#include <zlib.h>
|
|
|
|
/*
|
|
* Decoder context
|
|
*/
|
|
typedef struct DxaDecContext {
|
|
AVFrame prev;
|
|
|
|
int dsize;
|
|
uint8_t *decomp_buf;
|
|
uint32_t pal[256];
|
|
} DxaDecContext;
|
|
|
|
static const int shift1[6] = { 0, 8, 8, 8, 4, 4 };
|
|
static const int shift2[6] = { 0, 0, 8, 4, 0, 4 };
|
|
|
|
static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst,
|
|
int stride, uint8_t *src, uint8_t *ref)
|
|
{
|
|
uint8_t *code, *data, *mv, *msk, *tmp, *tmp2;
|
|
int i, j, k;
|
|
int type, x, y, d, d2;
|
|
uint32_t mask;
|
|
|
|
code = src + 12;
|
|
data = code + ((avctx->width * avctx->height) >> 4);
|
|
mv = data + AV_RB32(src + 0);
|
|
msk = mv + AV_RB32(src + 4);
|
|
|
|
for(j = 0; j < avctx->height; j += 4){
|
|
for(i = 0; i < avctx->width; i += 4){
|
|
tmp = dst + i;
|
|
tmp2 = ref + i;
|
|
type = *code++;
|
|
switch(type){
|
|
case 4: // motion compensation
|
|
x = (*mv) >> 4; if(x & 8) x = 8 - x;
|
|
y = (*mv++) & 0xF; if(y & 8) y = 8 - y;
|
|
tmp2 += x + y*stride;
|
|
case 0: // skip
|
|
case 5: // skip in method 12
|
|
for(y = 0; y < 4; y++){
|
|
memcpy(tmp, tmp2, 4);
|
|
tmp += stride;
|
|
tmp2 += stride;
|
|
}
|
|
break;
|
|
case 1: // masked change
|
|
case 10: // masked change with only half of pixels changed
|
|
case 11: // cases 10-15 are for method 12 only
|
|
case 12:
|
|
case 13:
|
|
case 14:
|
|
case 15:
|
|
if(type == 1){
|
|
mask = AV_RB16(msk);
|
|
msk += 2;
|
|
}else{
|
|
type -= 10;
|
|
mask = ((msk[0] & 0xF0) << shift1[type]) | ((msk[0] & 0xF) << shift2[type]);
|
|
msk++;
|
|
}
|
|
for(y = 0; y < 4; y++){
|
|
for(x = 0; x < 4; x++){
|
|
tmp[x] = (mask & 0x8000) ? *data++ : tmp2[x];
|
|
mask <<= 1;
|
|
}
|
|
tmp += stride;
|
|
tmp2 += stride;
|
|
}
|
|
break;
|
|
case 2: // fill block
|
|
for(y = 0; y < 4; y++){
|
|
memset(tmp, data[0], 4);
|
|
tmp += stride;
|
|
}
|
|
data++;
|
|
break;
|
|
case 3: // raw block
|
|
for(y = 0; y < 4; y++){
|
|
memcpy(tmp, data, 4);
|
|
data += 4;
|
|
tmp += stride;
|
|
}
|
|
break;
|
|
case 8: // subblocks - method 13 only
|
|
mask = *msk++;
|
|
for(k = 0; k < 4; k++){
|
|
d = ((k & 1) << 1) + ((k & 2) * stride);
|
|
d2 = ((k & 1) << 1) + ((k & 2) * stride);
|
|
tmp2 = ref + i + d2;
|
|
switch(mask & 0xC0){
|
|
case 0x80: // motion compensation
|
|
x = (*mv) >> 4; if(x & 8) x = 8 - x;
|
|
y = (*mv++) & 0xF; if(y & 8) y = 8 - y;
|
|
tmp2 += x + y*stride;
|
|
case 0x00: // skip
|
|
tmp[d + 0 ] = tmp2[0];
|
|
tmp[d + 1 ] = tmp2[1];
|
|
tmp[d + 0 + stride] = tmp2[0 + stride];
|
|
tmp[d + 1 + stride] = tmp2[1 + stride];
|
|
break;
|
|
case 0x40: // fill
|
|
tmp[d + 0 ] = data[0];
|
|
tmp[d + 1 ] = data[0];
|
|
tmp[d + 0 + stride] = data[0];
|
|
tmp[d + 1 + stride] = data[0];
|
|
data++;
|
|
break;
|
|
case 0xC0: // raw
|
|
tmp[d + 0 ] = *data++;
|
|
tmp[d + 1 ] = *data++;
|
|
tmp[d + 0 + stride] = *data++;
|
|
tmp[d + 1 + stride] = *data++;
|
|
break;
|
|
}
|
|
mask <<= 2;
|
|
}
|
|
break;
|
|
case 32: // vector quantization - 2 colors
|
|
mask = AV_RB16(msk);
|
|
msk += 2;
|
|
for(y = 0; y < 4; y++){
|
|
for(x = 0; x < 4; x++){
|
|
tmp[x] = data[mask & 1];
|
|
mask >>= 1;
|
|
}
|
|
tmp += stride;
|
|
tmp2 += stride;
|
|
}
|
|
data += 2;
|
|
break;
|
|
case 33: // vector quantization - 3 or 4 colors
|
|
case 34:
|
|
mask = AV_RB32(msk);
|
|
msk += 4;
|
|
for(y = 0; y < 4; y++){
|
|
for(x = 0; x < 4; x++){
|
|
tmp[x] = data[mask & 3];
|
|
mask >>= 2;
|
|
}
|
|
tmp += stride;
|
|
tmp2 += stride;
|
|
}
|
|
data += type - 30;
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown opcode %d\n", type);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
dst += stride * 4;
|
|
ref += stride * 4;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt)
|
|
{
|
|
AVFrame *frame = data;
|
|
DxaDecContext * const c = avctx->priv_data;
|
|
uint8_t *outptr, *srcptr, *tmpptr;
|
|
unsigned long dsize;
|
|
int i, j, compr, ret;
|
|
int stride;
|
|
int pc = 0;
|
|
GetByteContext gb;
|
|
|
|
bytestream2_init(&gb, avpkt->data, avpkt->size);
|
|
|
|
/* make the palette available on the way out */
|
|
if (bytestream2_peek_le32(&gb) == MKTAG('C','M','A','P')) {
|
|
bytestream2_skip(&gb, 4);
|
|
for(i = 0; i < 256; i++){
|
|
c->pal[i] = 0xFFU << 24 | bytestream2_get_be24(&gb);
|
|
}
|
|
pc = 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;
|
|
}
|
|
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
|
|
frame->palette_has_changed = pc;
|
|
|
|
outptr = frame->data[0];
|
|
srcptr = c->decomp_buf;
|
|
tmpptr = c->prev.data[0];
|
|
stride = frame->linesize[0];
|
|
|
|
if (bytestream2_get_le32(&gb) == MKTAG('N','U','L','L'))
|
|
compr = -1;
|
|
else
|
|
compr = bytestream2_get_byte(&gb);
|
|
|
|
dsize = c->dsize;
|
|
if (compr != 4 && compr != -1) {
|
|
bytestream2_skip(&gb, 4);
|
|
if (uncompress(c->decomp_buf, &dsize, avpkt->data + bytestream2_tell(&gb),
|
|
bytestream2_get_bytes_left(&gb)) != Z_OK) {
|
|
av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n");
|
|
return AVERROR_UNKNOWN;
|
|
}
|
|
}
|
|
switch(compr){
|
|
case -1:
|
|
frame->key_frame = 0;
|
|
frame->pict_type = AV_PICTURE_TYPE_P;
|
|
if(c->prev.data[0])
|
|
memcpy(frame->data[0], c->prev.data[0], frame->linesize[0] * avctx->height);
|
|
else{ // Should happen only when first frame is 'NULL'
|
|
memset(frame->data[0], 0, frame->linesize[0] * avctx->height);
|
|
frame->key_frame = 1;
|
|
frame->pict_type = AV_PICTURE_TYPE_I;
|
|
}
|
|
break;
|
|
case 2:
|
|
case 3:
|
|
case 4:
|
|
case 5:
|
|
frame->key_frame = !(compr & 1);
|
|
frame->pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
|
|
for(j = 0; j < avctx->height; j++){
|
|
if((compr & 1) && tmpptr){
|
|
for(i = 0; i < avctx->width; i++)
|
|
outptr[i] = srcptr[i] ^ tmpptr[i];
|
|
tmpptr += stride;
|
|
}else
|
|
memcpy(outptr, srcptr, avctx->width);
|
|
outptr += stride;
|
|
srcptr += avctx->width;
|
|
}
|
|
break;
|
|
case 12: // ScummVM coding
|
|
case 13:
|
|
frame->key_frame = 0;
|
|
frame->pict_type = AV_PICTURE_TYPE_P;
|
|
if (!c->prev.data[0]) {
|
|
av_log(avctx, AV_LOG_ERROR, "Missing reference frame\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
decode_13(avctx, c, frame->data[0], frame->linesize[0], srcptr, c->prev.data[0]);
|
|
break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "Unknown/unsupported compression type %d\n", compr);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
av_frame_unref(&c->prev);
|
|
if ((ret = av_frame_ref(&c->prev, frame)) < 0)
|
|
return ret;
|
|
|
|
*got_frame = 1;
|
|
|
|
/* always report that the buffer was completely consumed */
|
|
return avpkt->size;
|
|
}
|
|
|
|
static av_cold int decode_init(AVCodecContext *avctx)
|
|
{
|
|
DxaDecContext * const c = avctx->priv_data;
|
|
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
|
|
avcodec_get_frame_defaults(&c->prev);
|
|
|
|
c->dsize = avctx->width * avctx->height * 2;
|
|
c->decomp_buf = av_malloc(c->dsize);
|
|
if (!c->decomp_buf) {
|
|
av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext *avctx)
|
|
{
|
|
DxaDecContext * const c = avctx->priv_data;
|
|
|
|
av_freep(&c->decomp_buf);
|
|
av_frame_unref(&c->prev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_dxa_decoder = {
|
|
.name = "dxa",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_DXA,
|
|
.priv_data_size = sizeof(DxaDecContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
|
|
};
|