* 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>
239 lines
7.4 KiB
C
239 lines
7.4 KiB
C
/*
|
|
* Electronic Arts CMV Video Decoder
|
|
* Copyright (c) 2007-2008 Peter Ross
|
|
*
|
|
* 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 St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Electronic Arts CMV Video Decoder
|
|
* by Peter Ross (pross@xvid.org)
|
|
*
|
|
* Technical details here:
|
|
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
|
|
*/
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct CmvContext {
|
|
AVCodecContext *avctx;
|
|
AVFrame *last_frame; ///< last
|
|
AVFrame *last2_frame; ///< second-last
|
|
int width, height;
|
|
unsigned int palette[AVPALETTE_COUNT];
|
|
} CmvContext;
|
|
|
|
static av_cold int cmv_decode_init(AVCodecContext *avctx){
|
|
CmvContext *s = avctx->priv_data;
|
|
|
|
s->avctx = avctx;
|
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
|
|
|
s->last_frame = av_frame_alloc();
|
|
s->last2_frame = av_frame_alloc();
|
|
if (!s->last_frame || !s->last2_frame) {
|
|
av_frame_free(&s->last_frame);
|
|
av_frame_free(&s->last2_frame);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void cmv_decode_intra(CmvContext * s, AVFrame *frame,
|
|
const uint8_t *buf, const uint8_t *buf_end)
|
|
{
|
|
unsigned char *dst = frame->data[0];
|
|
int i;
|
|
|
|
for (i=0; i < s->avctx->height && buf_end - buf >= s->avctx->width; i++) {
|
|
memcpy(dst, buf, s->avctx->width);
|
|
dst += frame->linesize[0];
|
|
buf += s->avctx->width;
|
|
}
|
|
}
|
|
|
|
static void cmv_motcomp(unsigned char *dst, int dst_stride,
|
|
const unsigned char *src, int src_stride,
|
|
int x, int y,
|
|
int xoffset, int yoffset,
|
|
int width, int height){
|
|
int i,j;
|
|
|
|
for(j=y;j<y+4;j++)
|
|
for(i=x;i<x+4;i++)
|
|
{
|
|
if (i+xoffset>=0 && i+xoffset<width &&
|
|
j+yoffset>=0 && j+yoffset<height) {
|
|
dst[j*dst_stride + i] = src[(j+yoffset)*src_stride + i+xoffset];
|
|
}else{
|
|
dst[j*dst_stride + i] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
|
|
const uint8_t *buf_end)
|
|
{
|
|
const uint8_t *raw = buf + (s->avctx->width*s->avctx->height/16);
|
|
int x,y,i;
|
|
|
|
i = 0;
|
|
for(y=0; y<s->avctx->height/4; y++)
|
|
for(x=0; x<s->avctx->width/4 && buf_end - buf > i; x++) {
|
|
if (buf[i]==0xFF) {
|
|
unsigned char *dst = frame->data[0] + (y*4)*frame->linesize[0] + x*4;
|
|
if (raw+16<buf_end && *raw==0xFF) { /* intra */
|
|
raw++;
|
|
memcpy(dst, raw, 4);
|
|
memcpy(dst + frame->linesize[0], raw+4, 4);
|
|
memcpy(dst + 2 * frame->linesize[0], raw+8, 4);
|
|
memcpy(dst + 3 * frame->linesize[0], raw+12, 4);
|
|
raw+=16;
|
|
}else if(raw<buf_end) { /* inter using second-last frame as reference */
|
|
int xoffset = (*raw & 0xF) - 7;
|
|
int yoffset = ((*raw >> 4)) - 7;
|
|
if (s->last2_frame->data[0])
|
|
cmv_motcomp(frame->data[0], frame->linesize[0],
|
|
s->last2_frame->data[0], s->last2_frame->linesize[0],
|
|
x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
|
|
raw++;
|
|
}
|
|
}else{ /* inter using last frame as reference */
|
|
int xoffset = (buf[i] & 0xF) - 7;
|
|
int yoffset = ((buf[i] >> 4)) - 7;
|
|
if (s->last_frame->data[0])
|
|
cmv_motcomp(frame->data[0], frame->linesize[0],
|
|
s->last_frame->data[0], s->last_frame->linesize[0],
|
|
x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
|
|
}
|
|
i++;
|
|
}
|
|
}
|
|
|
|
static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *buf_end)
|
|
{
|
|
int pal_start, pal_count, i;
|
|
|
|
if(buf_end - buf < 16) {
|
|
av_log(s->avctx, AV_LOG_WARNING, "truncated header\n");
|
|
return;
|
|
}
|
|
|
|
s->width = AV_RL16(&buf[4]);
|
|
s->height = AV_RL16(&buf[6]);
|
|
if (s->avctx->width!=s->width || s->avctx->height!=s->height) {
|
|
avcodec_set_dimensions(s->avctx, s->width, s->height);
|
|
av_frame_unref(s->last_frame);
|
|
av_frame_unref(s->last2_frame);
|
|
}
|
|
|
|
s->avctx->time_base.num = 1;
|
|
s->avctx->time_base.den = AV_RL16(&buf[10]);
|
|
|
|
pal_start = AV_RL16(&buf[12]);
|
|
pal_count = AV_RL16(&buf[14]);
|
|
|
|
buf += 16;
|
|
for (i=pal_start; i<pal_start+pal_count && i<AVPALETTE_COUNT && buf_end - buf >= 3; i++) {
|
|
s->palette[i] = 0xFFU << 24 | AV_RB24(buf);
|
|
buf += 3;
|
|
}
|
|
}
|
|
|
|
#define EA_PREAMBLE_SIZE 8
|
|
#define MVIh_TAG MKTAG('M', 'V', 'I', 'h')
|
|
|
|
static int cmv_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame,
|
|
AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
CmvContext *s = avctx->priv_data;
|
|
const uint8_t *buf_end = buf + buf_size;
|
|
AVFrame *frame = data;
|
|
int ret;
|
|
|
|
if (buf_end - buf < EA_PREAMBLE_SIZE)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
|
|
unsigned size = AV_RL32(buf + 4);
|
|
cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
|
|
if (size > buf_end - buf - EA_PREAMBLE_SIZE)
|
|
return -1;
|
|
buf += size;
|
|
}
|
|
|
|
if (av_image_check_size(s->width, s->height, 0, s->avctx))
|
|
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;
|
|
}
|
|
|
|
memcpy(frame->data[1], s->palette, AVPALETTE_SIZE);
|
|
|
|
buf += EA_PREAMBLE_SIZE;
|
|
if ((buf[0]&1)) { // subtype
|
|
cmv_decode_inter(s, frame, buf+2, buf_end);
|
|
frame->key_frame = 0;
|
|
frame->pict_type = AV_PICTURE_TYPE_P;
|
|
}else{
|
|
frame->key_frame = 1;
|
|
frame->pict_type = AV_PICTURE_TYPE_I;
|
|
cmv_decode_intra(s, frame, buf+2, buf_end);
|
|
}
|
|
|
|
av_frame_unref(s->last2_frame);
|
|
av_frame_move_ref(s->last2_frame, s->last_frame);
|
|
if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
|
|
return ret;
|
|
|
|
*got_frame = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int cmv_decode_end(AVCodecContext *avctx){
|
|
CmvContext *s = avctx->priv_data;
|
|
|
|
av_frame_free(&s->last_frame);
|
|
av_frame_free(&s->last2_frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_eacmv_decoder = {
|
|
.name = "eacmv",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_CMV,
|
|
.priv_data_size = sizeof(CmvContext),
|
|
.init = cmv_decode_init,
|
|
.close = cmv_decode_end,
|
|
.decode = cmv_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
|
|
};
|