/*
* Image format
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
* Copyright (c) 2004 Michael Niedermayer
*
* This file is part of FFmpeg.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
#include "libavutil/avstring.h"
#include "avformat.h"
#include <strings.h>
{ CODEC_ID_PNG , "png"},
{ CODEC_ID_PNG , "mng"},
{ CODEC_ID_PPM , "ppm"},
+ { CODEC_ID_PPM , "pnm"},
{ CODEC_ID_PGM , "pgm"},
{ CODEC_ID_PGMYUV , "pgmyuv"},
{ CODEC_ID_PBM , "pbm"},
{ CODEC_ID_SUNRAST , "im8"},
{ CODEC_ID_SUNRAST , "im24"},
{ CODEC_ID_SUNRAST , "sunras"},
+ { CODEC_ID_JPEG2000 , "jp2"},
+ { CODEC_ID_DPX , "dpx"},
{ CODEC_ID_NONE , NULL}
};
if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
*pfirst_index =
*plast_index = 1;
- return 0;
+ if(url_exist(buf))
+ return 0;
+ return -1;
}
if (url_exist(buf))
break;
if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0)
- return AVERROR(EIO);
+ return AVERROR(ENOENT);
s->img_first = first_index;
s->img_last = last_index;
s->img_number = first_index;
if (s1->loop_input && s->img_number > s->img_last) {
s->img_number = s->img_first;
}
+ if (s->img_number > s->img_last)
+ return AVERROR_EOF;
if (av_get_frame_filename(filename, sizeof(filename),
s->path, s->img_number)<0 && s->img_number > 1)
return AVERROR(EIO);
for(i=0; i<3; i++){
- if (url_fopen(&f[i], filename, URL_RDONLY) < 0)
+ if (url_fopen(&f[i], filename, URL_RDONLY) < 0) {
+ av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
return AVERROR(EIO);
+ }
size[i]= url_fsize(f[i]);
if(codec->codec_id != CODEC_ID_RAWVIDEO)
}
}
-#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
+#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER
/******************************************************/
/* image output */
if (!img->is_pipe) {
if (av_get_frame_filename(filename, sizeof(filename),
- img->path, img->img_number) < 0 && img->img_number>1)
+ img->path, img->img_number) < 0 && img->img_number>1) {
+ av_log(s, AV_LOG_ERROR, "Could not get frame filename from pattern\n");
return AVERROR(EIO);
+ }
for(i=0; i<3; i++){
- if (url_fopen(&pb[i], filename, URL_WRONLY) < 0)
+ if (url_fopen(&pb[i], filename, URL_WRONLY) < 0) {
+ av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
return AVERROR(EIO);
+ }
if(codec->codec_id != CODEC_ID_RAWVIDEO)
break;
url_fclose(pb[1]);
url_fclose(pb[2]);
}else{
+ if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
+ AVStream *st = s->streams[0];
+ if(st->codec->extradata_size > 8 &&
+ AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
+ if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c'))
+ goto error;
+ put_be32(pb[0], 12);
+ put_tag (pb[0], "jP ");
+ put_be32(pb[0], 0x0D0A870A); // signature
+ put_be32(pb[0], 20);
+ put_tag (pb[0], "ftyp");
+ put_tag (pb[0], "jp2 ");
+ put_be32(pb[0], 0);
+ put_tag (pb[0], "jp2 ");
+ put_buffer(pb[0], st->codec->extradata, st->codec->extradata_size);
+ }else if(pkt->size < 8 ||
+ (!st->codec->extradata_size &&
+ AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
+ error:
+ av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");
+ return -1;
+ }
+ }
put_buffer(pb[0], pkt->data, pkt->size);
}
put_flush_packet(pb[0]);
return 0;
}
-#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
+#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */
/* input */
-#ifdef CONFIG_IMAGE2_DEMUXER
+#if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = {
"image2",
NULL_IF_CONFIG_SMALL("image2 sequence"),
AVFMT_NOFILE,
};
#endif
-#ifdef CONFIG_IMAGE2PIPE_DEMUXER
+#if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = {
"image2pipe",
NULL_IF_CONFIG_SMALL("piped image2 sequence"),
#endif
/* output */
-#ifdef CONFIG_IMAGE2_MUXER
+#if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
"image2",
NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
- "bmp,jpeg,jpg,ljpg,pam,pbm,pgm,png,ppm,sgi,tif,tiff",
+ "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",
sizeof(VideoData),
CODEC_ID_NONE,
CODEC_ID_MJPEG,
.flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
};
#endif
-#ifdef CONFIG_IMAGE2PIPE_MUXER
+#if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
"image2pipe",
NULL_IF_CONFIG_SMALL("piped image2 sequence"),