X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fimg2.c;h=0610ae1ee5e2351412c1cbee91d442d6576da309;hb=c040badb703e773a98f37392e9bc609e1a0b7439;hp=68fcbc453654c8ba25696118ed88045bf8196248;hpb=82213f68ba82a6f668b3374443dd660b95f3e382;p=ffmpeg diff --git a/libavformat/img2.c b/libavformat/img2.c index 68fcbc45365..0610ae1ee5e 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -1,6 +1,6 @@ /* * 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. @@ -19,8 +19,11 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/intreadwrite.h" +#include "libavutil/avstring.h" #include "avformat.h" -#include "avstring.h" +#include typedef struct { int img_first; @@ -43,6 +46,7 @@ static const IdStrMap img_tags[] = { { 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"}, @@ -56,6 +60,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_GIF , "gif"}, { CODEC_ID_TARGA , "tga"}, { CODEC_ID_TIFF , "tiff"}, + { CODEC_ID_TIFF , "tif"}, { CODEC_ID_SGI , "sgi"}, { CODEC_ID_PTX , "ptx"}, { CODEC_ID_PCX , "pcx"}, @@ -66,10 +71,12 @@ static const IdStrMap img_tags[] = { { CODEC_ID_SUNRAST , "im8"}, { CODEC_ID_SUNRAST , "im24"}, { CODEC_ID_SUNRAST , "sunras"}, - {0, NULL} + { CODEC_ID_JPEG2000 , "jp2"}, + { CODEC_ID_DPX , "dpx"}, + { CODEC_ID_NONE , NULL} }; -static int sizes[][2] = { +static const int sizes[][2] = { { 640, 480 }, { 720, 480 }, { 720, 576 }, @@ -85,7 +92,7 @@ static int infer_size(int *width_ptr, int *height_ptr, int size) { int i; - for(i=0;iid) { - int i; - for(i=0; toupper(tags->str[i]) == toupper(str[i]); i++){ - if(tags->str[i]==0 && str[i]==0) - return tags->id; - } + if (!strcasecmp(str, tags->str)) + return tags->id; tags++; } @@ -124,7 +128,9 @@ static int find_image_range(int *pfirst_index, int *plast_index, 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; @@ -217,7 +223,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) 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; @@ -226,12 +232,12 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->duration = last_index - first_index + 1; } - if(ap->video_codec_id){ + if(s1->video_codec_id){ st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = ap->video_codec_id; - }else if(ap->audio_codec_id){ + st->codec->codec_id = s1->video_codec_id; + }else if(s1->audio_codec_id){ st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = ap->audio_codec_id; + st->codec->codec_id = s1->audio_codec_id; }else{ st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_id = av_str2id(img_tags, s->path); @@ -256,12 +262,16 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) 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) @@ -303,12 +313,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) } } -static int img_read_close(AVFormatContext *s1) -{ - return 0; -} - -#ifdef CONFIG_MUXERS +#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER /******************************************************/ /* image output */ @@ -338,11 +343,15 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) 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; @@ -362,6 +371,29 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) 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]); @@ -373,56 +405,54 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -#endif /* CONFIG_MUXERS */ +#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */ /* input */ -#ifdef CONFIG_IMAGE2_DEMUXER +#if CONFIG_IMAGE2_DEMUXER AVInputFormat image2_demuxer = { "image2", - "image2 sequence", + NULL_IF_CONFIG_SMALL("image2 sequence"), sizeof(VideoData), image_probe, img_read_header, img_read_packet, - img_read_close, + NULL, NULL, NULL, AVFMT_NOFILE, }; #endif -#ifdef CONFIG_IMAGE2PIPE_DEMUXER +#if CONFIG_IMAGE2PIPE_DEMUXER AVInputFormat image2pipe_demuxer = { "image2pipe", - "piped image2 sequence", + NULL_IF_CONFIG_SMALL("piped image2 sequence"), sizeof(VideoData), NULL, /* no probe */ img_read_header, img_read_packet, - img_read_close, - NULL, }; #endif /* output */ -#ifdef CONFIG_IMAGE2_MUXER +#if CONFIG_IMAGE2_MUXER AVOutputFormat image2_muxer = { "image2", - "image2 sequence", - "", + NULL_IF_CONFIG_SMALL("image2 sequence"), "", + "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2", sizeof(VideoData), CODEC_ID_NONE, CODEC_ID_MJPEG, img_write_header, img_write_packet, NULL, - AVFMT_NOFILE, + .flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE }; #endif -#ifdef CONFIG_IMAGE2PIPE_MUXER +#if CONFIG_IMAGE2PIPE_MUXER AVOutputFormat image2pipe_muxer = { "image2pipe", - "piped image2 sequence", + NULL_IF_CONFIG_SMALL("piped image2 sequence"), "", "", sizeof(VideoData), @@ -430,6 +460,6 @@ AVOutputFormat image2pipe_muxer = { CODEC_ID_MJPEG, img_write_header, img_write_packet, - NULL, + .flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS }; #endif