* 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>
236 lines
7.8 KiB
C
236 lines
7.8 KiB
C
/*
|
|
* CPiA video decoder.
|
|
* Copyright (c) 2010 Hans de Goede <hdegoede@redhat.com>
|
|
*
|
|
* This decoder is based on the LGPL code available at
|
|
* https://v4l4j.googlecode.com/svn/v4l4j/trunk/libvideo/libv4lconvert/cpia1.c
|
|
*
|
|
* 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 "get_bits.h"
|
|
#include "internal.h"
|
|
|
|
|
|
#define FRAME_HEADER_SIZE 64
|
|
#define MAGIC_0 0x19 /**< First header byte */
|
|
#define MAGIC_1 0x68 /**< Second header byte */
|
|
#define SUBSAMPLE_420 0
|
|
#define SUBSAMPLE_422 1
|
|
#define YUVORDER_YUYV 0
|
|
#define YUVORDER_UYVY 1
|
|
#define NOT_COMPRESSED 0
|
|
#define COMPRESSED 1
|
|
#define NO_DECIMATION 0
|
|
#define DECIMATION_ENAB 1
|
|
#define EOL 0xfd /**< End Of Line marker */
|
|
#define EOI 0xff /**< End Of Image marker */
|
|
|
|
|
|
typedef struct {
|
|
AVFrame *frame;
|
|
} CpiaContext;
|
|
|
|
|
|
static int cpia_decode_frame(AVCodecContext *avctx,
|
|
void *data, int *got_frame, AVPacket* avpkt)
|
|
{
|
|
CpiaContext* const cpia = avctx->priv_data;
|
|
int i,j,ret;
|
|
|
|
uint8_t* const header = avpkt->data;
|
|
uint8_t* src;
|
|
int src_size;
|
|
uint16_t linelength;
|
|
uint8_t skip;
|
|
|
|
AVFrame *frame = cpia->frame;
|
|
uint8_t *y, *u, *v, *y_end, *u_end, *v_end;
|
|
|
|
// Check header
|
|
if ( avpkt->size < FRAME_HEADER_SIZE
|
|
|| header[0] != MAGIC_0 || header[1] != MAGIC_1
|
|
|| (header[17] != SUBSAMPLE_420 && header[17] != SUBSAMPLE_422)
|
|
|| (header[18] != YUVORDER_YUYV && header[18] != YUVORDER_UYVY)
|
|
|| (header[28] != NOT_COMPRESSED && header[28] != COMPRESSED)
|
|
|| (header[29] != NO_DECIMATION && header[29] != DECIMATION_ENAB)
|
|
) {
|
|
av_log(avctx, AV_LOG_ERROR, "Invalid header!\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
// currently unsupported properties
|
|
if (header[17] == SUBSAMPLE_422) {
|
|
av_log(avctx, AV_LOG_ERROR, "Unsupported subsample!\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
if (header[18] == YUVORDER_UYVY) {
|
|
av_log(avctx, AV_LOG_ERROR, "Unsupported YUV byte order!\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
if (header[29] == DECIMATION_ENAB) {
|
|
av_log(avctx, AV_LOG_ERROR, "Decimation unsupported!\n");
|
|
return AVERROR_PATCHWELCOME;
|
|
}
|
|
|
|
src = header + FRAME_HEADER_SIZE;
|
|
src_size = avpkt->size - FRAME_HEADER_SIZE;
|
|
|
|
if (header[28] == NOT_COMPRESSED) {
|
|
frame->pict_type = AV_PICTURE_TYPE_I;
|
|
frame->key_frame = 1;
|
|
} else {
|
|
frame->pict_type = AV_PICTURE_TYPE_P;
|
|
frame->key_frame = 0;
|
|
}
|
|
|
|
// Get buffer filled with previous frame
|
|
if ((ret = ff_reget_buffer(avctx, frame)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed!\n");
|
|
return ret;
|
|
}
|
|
|
|
|
|
for ( i = 0;
|
|
i < frame->height;
|
|
i++, src += linelength, src_size -= linelength
|
|
) {
|
|
// Read line length, two byte little endian
|
|
linelength = AV_RL16(src);
|
|
src += 2;
|
|
|
|
if (src_size < linelength) {
|
|
av_frame_set_decode_error_flags(frame, FF_DECODE_ERROR_INVALID_BITSTREAM);
|
|
av_log(avctx, AV_LOG_WARNING, "Frame ended enexpectedly!\n");
|
|
break;
|
|
}
|
|
if (src[linelength - 1] != EOL) {
|
|
av_frame_set_decode_error_flags(frame, FF_DECODE_ERROR_INVALID_BITSTREAM);
|
|
av_log(avctx, AV_LOG_WARNING, "Wrong line length %d or line not terminated properly (found 0x%02x)!\n", linelength, src[linelength - 1]);
|
|
break;
|
|
}
|
|
|
|
/* Update the data pointers. Y data is on every line.
|
|
* U and V data on every second line
|
|
*/
|
|
y = &frame->data[0][i * frame->linesize[0]];
|
|
u = &frame->data[1][(i >> 1) * frame->linesize[1]];
|
|
v = &frame->data[2][(i >> 1) * frame->linesize[2]];
|
|
y_end = y + frame->linesize[0] - 1;
|
|
u_end = u + frame->linesize[1] - 1;
|
|
v_end = v + frame->linesize[2] - 1;
|
|
|
|
if ((i & 1) && header[17] == SUBSAMPLE_420) {
|
|
/* We are on a odd line and 420 subsample is used.
|
|
* On this line only Y values are specified, one per pixel.
|
|
*/
|
|
for (j = 0; j < linelength - 1; j++) {
|
|
if (y > y_end) {
|
|
av_frame_set_decode_error_flags(frame, FF_DECODE_ERROR_INVALID_BITSTREAM);
|
|
av_log(avctx, AV_LOG_WARNING, "Decoded data exceeded linesize!\n");
|
|
break;
|
|
}
|
|
if ((src[j] & 1) && header[28] == COMPRESSED) {
|
|
/* It seems that odd lines are always uncompressed, but
|
|
* we do it according to specification anyways.
|
|
*/
|
|
skip = src[j] >> 1;
|
|
y += skip;
|
|
} else {
|
|
*(y++) = src[j];
|
|
}
|
|
}
|
|
} else if (header[17] == SUBSAMPLE_420) {
|
|
/* We are on an even line and 420 subsample is used.
|
|
* On this line each pair of pixels is described by four bytes.
|
|
*/
|
|
for (j = 0; j < linelength - 4; ) {
|
|
if (y + 1 > y_end || u > u_end || v > v_end) {
|
|
av_frame_set_decode_error_flags(frame, FF_DECODE_ERROR_INVALID_BITSTREAM);
|
|
av_log(avctx, AV_LOG_WARNING, "Decoded data exceeded linesize!\n");
|
|
break;
|
|
}
|
|
if ((src[j] & 1) && header[28] == COMPRESSED) {
|
|
// Skip amount of pixels and move forward one byte
|
|
skip = src[j] >> 1;
|
|
y += skip;
|
|
u += skip >> 1;
|
|
v += skip >> 1;
|
|
j++;
|
|
} else {
|
|
// Set image data as specified and move forward 4 bytes
|
|
*(y++) = src[j];
|
|
*(u++) = src[j+1];
|
|
*(y++) = src[j+2];
|
|
*(v++) = src[j+3];
|
|
j += 4;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
*got_frame = 1;
|
|
if ((ret = av_frame_ref(data, cpia->frame)) < 0)
|
|
return ret;
|
|
|
|
return avpkt->size;
|
|
}
|
|
|
|
static av_cold int cpia_decode_init(AVCodecContext *avctx)
|
|
{
|
|
CpiaContext *s = avctx->priv_data;
|
|
|
|
// output pixel format
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
|
|
|
|
/* The default timebase set by the v4l2 demuxer leads to probing which is buggy.
|
|
* Set some reasonable time_base to skip this.
|
|
*/
|
|
if (avctx->time_base.num == 1 && avctx->time_base.den == 1000000) {
|
|
avctx->time_base.num = 1;
|
|
avctx->time_base.den = 60;
|
|
}
|
|
|
|
s->frame = av_frame_alloc();
|
|
if (!s->frame)
|
|
return AVERROR(ENOMEM);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int cpia_decode_end(AVCodecContext *avctx)
|
|
{
|
|
CpiaContext *s = avctx->priv_data;
|
|
|
|
av_frame_free(&s->frame);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_cpia_decoder = {
|
|
.name = "cpia",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_CPIA,
|
|
.priv_data_size = sizeof(CpiaContext),
|
|
.init = cpia_decode_init,
|
|
.close = cpia_decode_end,
|
|
.decode = cpia_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("CPiA video format"),
|
|
};
|