* 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>
293 lines
9.4 KiB
C
293 lines
9.4 KiB
C
/*
|
|
* PNM image format
|
|
* Copyright (c) 2002, 2003 Fabrice Bellard
|
|
*
|
|
* 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 "internal.h"
|
|
#include "put_bits.h"
|
|
#include "pnm.h"
|
|
|
|
|
|
static int pnm_decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame, AVPacket *avpkt)
|
|
{
|
|
const uint8_t *buf = avpkt->data;
|
|
int buf_size = avpkt->size;
|
|
PNMContext * const s = avctx->priv_data;
|
|
AVFrame * const p = data;
|
|
int i, j, n, linesize, h, upgrade = 0, is_mono = 0;
|
|
unsigned char *ptr;
|
|
int components, sample_len, ret;
|
|
|
|
s->bytestream_start =
|
|
s->bytestream = (uint8_t *)buf;
|
|
s->bytestream_end = (uint8_t *)buf + buf_size;
|
|
|
|
if ((ret = ff_pnm_decode_header(avctx, s)) < 0)
|
|
return ret;
|
|
|
|
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
p->pict_type = AV_PICTURE_TYPE_I;
|
|
p->key_frame = 1;
|
|
|
|
switch (avctx->pix_fmt) {
|
|
default:
|
|
return AVERROR(EINVAL);
|
|
case AV_PIX_FMT_RGBA64BE:
|
|
n = avctx->width * 8;
|
|
components=4;
|
|
sample_len=16;
|
|
goto do_read;
|
|
case AV_PIX_FMT_RGB48BE:
|
|
n = avctx->width * 6;
|
|
components=3;
|
|
sample_len=16;
|
|
goto do_read;
|
|
case AV_PIX_FMT_RGBA:
|
|
n = avctx->width * 4;
|
|
components=4;
|
|
sample_len=8;
|
|
goto do_read;
|
|
case AV_PIX_FMT_RGB24:
|
|
n = avctx->width * 3;
|
|
components=3;
|
|
sample_len=8;
|
|
goto do_read;
|
|
case AV_PIX_FMT_GRAY8:
|
|
n = avctx->width;
|
|
components=1;
|
|
sample_len=8;
|
|
if (s->maxval < 255)
|
|
upgrade = 1;
|
|
goto do_read;
|
|
case AV_PIX_FMT_GRAY8A:
|
|
n = avctx->width * 2;
|
|
components=2;
|
|
sample_len=8;
|
|
goto do_read;
|
|
case AV_PIX_FMT_GRAY16BE:
|
|
case AV_PIX_FMT_GRAY16LE:
|
|
n = avctx->width * 2;
|
|
components=1;
|
|
sample_len=16;
|
|
if (s->maxval < 65535)
|
|
upgrade = 2;
|
|
goto do_read;
|
|
case AV_PIX_FMT_MONOWHITE:
|
|
case AV_PIX_FMT_MONOBLACK:
|
|
n = (avctx->width + 7) >> 3;
|
|
components=1;
|
|
sample_len=1;
|
|
is_mono = 1;
|
|
do_read:
|
|
ptr = p->data[0];
|
|
linesize = p->linesize[0];
|
|
if (s->bytestream + n * avctx->height > s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
if(s->type < 4 || (is_mono && s->type==7)){
|
|
for (i=0; i<avctx->height; i++) {
|
|
PutBitContext pb;
|
|
init_put_bits(&pb, ptr, linesize);
|
|
for(j=0; j<avctx->width * components; j++){
|
|
unsigned int c=0;
|
|
int v=0;
|
|
if(s->type < 4)
|
|
while(s->bytestream < s->bytestream_end && (*s->bytestream < '0' || *s->bytestream > '9' ))
|
|
s->bytestream++;
|
|
if(s->bytestream >= s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
if (is_mono) {
|
|
/* read a single digit */
|
|
v = (*s->bytestream++)&1;
|
|
} else {
|
|
/* read a sequence of digits */
|
|
do {
|
|
v = 10*v + c;
|
|
c = (*s->bytestream++) - '0';
|
|
} while (c <= 9);
|
|
}
|
|
put_bits(&pb, sample_len, (((1<<sample_len)-1)*v + (s->maxval>>1))/s->maxval);
|
|
}
|
|
flush_put_bits(&pb);
|
|
ptr+= linesize;
|
|
}
|
|
}else{
|
|
for (i = 0; i < avctx->height; i++) {
|
|
if (!upgrade)
|
|
memcpy(ptr, s->bytestream, n);
|
|
else if (upgrade == 1) {
|
|
unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval;
|
|
for (j = 0; j < n; j++)
|
|
ptr[j] = (s->bytestream[j] * f + 64) >> 7;
|
|
} else if (upgrade == 2) {
|
|
unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval;
|
|
for (j = 0; j < n / 2; j++) {
|
|
v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
|
|
((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
|
|
}
|
|
}
|
|
s->bytestream += n;
|
|
ptr += linesize;
|
|
}
|
|
}
|
|
break;
|
|
case AV_PIX_FMT_YUV420P:
|
|
case AV_PIX_FMT_YUV420P9BE:
|
|
case AV_PIX_FMT_YUV420P10BE:
|
|
{
|
|
unsigned char *ptr1, *ptr2;
|
|
|
|
n = avctx->width;
|
|
ptr = p->data[0];
|
|
linesize = p->linesize[0];
|
|
if (s->maxval >= 256)
|
|
n *= 2;
|
|
if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
for (i = 0; i < avctx->height; i++) {
|
|
memcpy(ptr, s->bytestream, n);
|
|
s->bytestream += n;
|
|
ptr += linesize;
|
|
}
|
|
ptr1 = p->data[1];
|
|
ptr2 = p->data[2];
|
|
n >>= 1;
|
|
h = avctx->height >> 1;
|
|
for (i = 0; i < h; i++) {
|
|
memcpy(ptr1, s->bytestream, n);
|
|
s->bytestream += n;
|
|
memcpy(ptr2, s->bytestream, n);
|
|
s->bytestream += n;
|
|
ptr1 += p->linesize[1];
|
|
ptr2 += p->linesize[2];
|
|
}
|
|
}
|
|
break;
|
|
case AV_PIX_FMT_YUV420P16:
|
|
{
|
|
uint16_t *ptr1, *ptr2;
|
|
const int f = (65535 * 32768 + s->maxval / 2) / s->maxval;
|
|
unsigned int j, v;
|
|
|
|
n = avctx->width * 2;
|
|
ptr = p->data[0];
|
|
linesize = p->linesize[0];
|
|
if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
for (i = 0; i < avctx->height; i++) {
|
|
for (j = 0; j < n / 2; j++) {
|
|
v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
|
|
((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
|
|
}
|
|
s->bytestream += n;
|
|
ptr += linesize;
|
|
}
|
|
ptr1 = (uint16_t*)p->data[1];
|
|
ptr2 = (uint16_t*)p->data[2];
|
|
n >>= 1;
|
|
h = avctx->height >> 1;
|
|
for (i = 0; i < h; i++) {
|
|
for (j = 0; j < n / 2; j++) {
|
|
v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
|
|
ptr1[j] = (v * f + 16384) >> 15;
|
|
}
|
|
s->bytestream += n;
|
|
|
|
for (j = 0; j < n / 2; j++) {
|
|
v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
|
|
ptr2[j] = (v * f + 16384) >> 15;
|
|
}
|
|
s->bytestream += n;
|
|
|
|
ptr1 += p->linesize[1] / 2;
|
|
ptr2 += p->linesize[2] / 2;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
*got_frame = 1;
|
|
|
|
return s->bytestream - s->bytestream_start;
|
|
}
|
|
|
|
|
|
#if CONFIG_PGM_DECODER
|
|
AVCodec ff_pgm_decoder = {
|
|
.name = "pgm",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PGM,
|
|
.priv_data_size = sizeof(PNMContext),
|
|
.decode = pnm_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_PGMYUV_DECODER
|
|
AVCodec ff_pgmyuv_decoder = {
|
|
.name = "pgmyuv",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PGMYUV,
|
|
.priv_data_size = sizeof(PNMContext),
|
|
.decode = pnm_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_PPM_DECODER
|
|
AVCodec ff_ppm_decoder = {
|
|
.name = "ppm",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PPM,
|
|
.priv_data_size = sizeof(PNMContext),
|
|
.decode = pnm_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_PBM_DECODER
|
|
AVCodec ff_pbm_decoder = {
|
|
.name = "pbm",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PBM,
|
|
.priv_data_size = sizeof(PNMContext),
|
|
.decode = pnm_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_PAM_DECODER
|
|
AVCodec ff_pam_decoder = {
|
|
.name = "pam",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_PAM,
|
|
.priv_data_size = sizeof(PNMContext),
|
|
.decode = pnm_decode_frame,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
|
|
};
|
|
#endif
|