* 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>
205 lines
6.6 KiB
C
205 lines
6.6 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 <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "pnm.h"
|
|
|
|
static inline int pnm_space(int c)
|
|
{
|
|
return c == ' ' || c == '\n' || c == '\r' || c == '\t';
|
|
}
|
|
|
|
static void pnm_get(PNMContext *sc, char *str, int buf_size)
|
|
{
|
|
char *s;
|
|
int c;
|
|
|
|
/* skip spaces and comments */
|
|
while (sc->bytestream < sc->bytestream_end) {
|
|
c = *sc->bytestream++;
|
|
if (c == '#') {
|
|
while (c != '\n' && sc->bytestream < sc->bytestream_end) {
|
|
c = *sc->bytestream++;
|
|
}
|
|
} else if (!pnm_space(c)) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
s = str;
|
|
while (sc->bytestream < sc->bytestream_end && !pnm_space(c)) {
|
|
if ((s - str) < buf_size - 1)
|
|
*s++ = c;
|
|
c = *sc->bytestream++;
|
|
}
|
|
*s = '\0';
|
|
}
|
|
|
|
int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
|
|
{
|
|
char buf1[32], tuple_type[32];
|
|
int h, w, depth, maxval;
|
|
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
s->type= buf1[1]-'0';
|
|
if(buf1[0] != 'P')
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
if (s->type==1 || s->type==4) {
|
|
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
|
|
} else if (s->type==2 || s->type==5) {
|
|
if (avctx->codec_id == AV_CODEC_ID_PGMYUV)
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
|
|
else
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
|
|
} else if (s->type==3 || s->type==6) {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
|
} else if (s->type==7) {
|
|
w = -1;
|
|
h = -1;
|
|
maxval = -1;
|
|
depth = -1;
|
|
tuple_type[0] = '\0';
|
|
for (;;) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
if (!strcmp(buf1, "WIDTH")) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
w = strtol(buf1, NULL, 10);
|
|
} else if (!strcmp(buf1, "HEIGHT")) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
h = strtol(buf1, NULL, 10);
|
|
} else if (!strcmp(buf1, "DEPTH")) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
depth = strtol(buf1, NULL, 10);
|
|
} else if (!strcmp(buf1, "MAXVAL")) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
maxval = strtol(buf1, NULL, 10);
|
|
} else if (!strcmp(buf1, "TUPLTYPE") ||
|
|
/* libavcodec used to write invalid files */
|
|
!strcmp(buf1, "TUPLETYPE")) {
|
|
pnm_get(s, tuple_type, sizeof(tuple_type));
|
|
} else if (!strcmp(buf1, "ENDHDR")) {
|
|
break;
|
|
} else {
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
/* check that all tags are present */
|
|
if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx) || s->bytestream >= s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
avctx->width = w;
|
|
avctx->height = h;
|
|
s->maxval = maxval;
|
|
if (depth == 1) {
|
|
if (maxval == 1) {
|
|
avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
|
|
} else if (maxval == 255) {
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
|
|
} else {
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY16BE;
|
|
}
|
|
} else if (depth == 2) {
|
|
if (maxval == 255)
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY8A;
|
|
} else if (depth == 3) {
|
|
if (maxval < 256) {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB24;
|
|
} else {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
|
|
}
|
|
} else if (depth == 4) {
|
|
if (maxval < 256) {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGBA;
|
|
} else {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGBA64BE;
|
|
}
|
|
} else {
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
return 0;
|
|
} else {
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
w = atoi(buf1);
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
h = atoi(buf1);
|
|
if(w <= 0 || h <= 0 || av_image_check_size(w, h, 0, avctx) || s->bytestream >= s->bytestream_end)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
avctx->width = w;
|
|
avctx->height = h;
|
|
|
|
if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE && avctx->pix_fmt != AV_PIX_FMT_MONOBLACK) {
|
|
pnm_get(s, buf1, sizeof(buf1));
|
|
s->maxval = atoi(buf1);
|
|
if (s->maxval <= 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "Invalid maxval: %d\n", s->maxval);
|
|
s->maxval = 255;
|
|
}
|
|
if (s->maxval >= 256) {
|
|
if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
|
|
avctx->pix_fmt = AV_PIX_FMT_GRAY16BE;
|
|
} else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) {
|
|
avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
|
|
} else if (avctx->pix_fmt == AV_PIX_FMT_YUV420P && s->maxval < 65536) {
|
|
if (s->maxval < 512)
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P9BE;
|
|
else if (s->maxval < 1024)
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P10BE;
|
|
else
|
|
avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
|
|
} else {
|
|
av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n");
|
|
avctx->pix_fmt = AV_PIX_FMT_NONE;
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
}
|
|
}else
|
|
s->maxval=1;
|
|
/* more check if YUV420 */
|
|
if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) {
|
|
if ((avctx->width & 1) != 0)
|
|
return AVERROR_INVALIDDATA;
|
|
h = (avctx->height * 2);
|
|
if ((h % 3) != 0)
|
|
return AVERROR_INVALIDDATA;
|
|
h /= 3;
|
|
avctx->height = h;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
av_cold int ff_pnm_init(AVCodecContext *avctx)
|
|
{
|
|
PNMContext *s = avctx->priv_data;
|
|
|
|
avcodec_get_frame_defaults(&s->picture);
|
|
avctx->coded_frame = &s->picture;
|
|
|
|
return 0;
|
|
}
|