X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fimg2.c;h=2a08fa7b2471d2b6faed25d21855130f2384d199;hb=6f9e492acfb76767b2ed369f803768338961d053;hp=46d824801760dbf46d17ce9ae80e414beabb7691;hpb=5509bffa88238d1f445a84a32e3791bfb9e532fd;p=ffmpeg diff --git a/libavformat/img2.c b/libavformat/img2.c index 46d82480176..2a08fa7b247 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -3,25 +3,24 @@ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. * Copyright (c) 2004 Michael Niedermayer * - * This library is free software; you can redistribute it and/or + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -/* XXX: this is a hack */ -extern int loop_input; - typedef struct { int img_first; int img_last; @@ -52,6 +51,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_FFV1 , "ffv1-img"}, { CODEC_ID_RAWVIDEO , "y"}, { CODEC_ID_BMP , "bmp"}, + { CODEC_ID_GIF , "gif"}, {0, NULL} }; @@ -107,7 +107,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, /* find the first image */ for(first_index = 0; first_index < 5; first_index++) { - if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ + if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ *pfirst_index = *plast_index = 1; return 0; @@ -127,8 +127,8 @@ static int find_image_range(int *pfirst_index, int *plast_index, range1 = 1; else range1 = 2 * range; - if (get_frame_filename(buf, sizeof(buf), path, - last_index + range1) < 0) + if (av_get_frame_filename(buf, sizeof(buf), path, + last_index + range1) < 0) goto fail; if (!url_exist(buf)) break; @@ -152,7 +152,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, static int image_probe(AVProbeData *p) { - if (filename_number_test(p->filename) >= 0 && av_str2id(img_tags, p->filename)) + if (av_filename_number_test(p->filename) && av_str2id(img_tags, p->filename)) return AVPROBE_SCORE_MAX; else return 0; @@ -187,13 +187,13 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->need_parsing= 1; } - if (!ap || !ap->time_base.num) { + if (!ap->time_base.num) { av_set_pts_info(st, 60, 1, 25); } else { av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den); } - if(ap && ap->width && ap->height){ + if(ap->width && ap->height){ st->codec->width = ap->width; st->codec->height= ap->height; } @@ -236,11 +236,11 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) if (!s->is_pipe) { /* loop over input */ - if (loop_input && s->img_number > s->img_last) { + if (s1->loop_input && s->img_number > s->img_last) { s->img_number = s->img_first; } - if (get_frame_filename(filename, sizeof(filename), - s->path, s->img_number)<0 && s->img_number > 1) + if (av_get_frame_filename(filename, sizeof(filename), + s->path, s->img_number)<0 && s->img_number > 1) return AVERROR_IO; for(i=0; i<3; i++){ if (url_fopen(f[i], filename, URL_RDONLY) < 0) @@ -291,6 +291,7 @@ static int img_read_close(AVFormatContext *s1) return 0; } +#ifdef CONFIG_MUXERS /******************************************************/ /* image output */ @@ -319,8 +320,8 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) int i; if (!img->is_pipe) { - if (get_frame_filename(filename, sizeof(filename), - img->path, img->img_number) < 0 && img->img_number>1) + if (av_get_frame_filename(filename, sizeof(filename), + img->path, img->img_number) < 0 && img->img_number>1) return AVERROR_IO; for(i=0; i<3; i++){ if (url_fopen(pb[i], filename, URL_WRONLY) < 0) @@ -360,9 +361,11 @@ static int img_write_trailer(AVFormatContext *s) return 0; } -/* input */ +#endif /* CONFIG_MUXERS */ -static AVInputFormat image2_iformat = { +/* input */ +#ifdef CONFIG_IMAGE2_DEMUXER +AVInputFormat image2_demuxer = { "image2", "image2 sequence", sizeof(VideoData), @@ -374,8 +377,9 @@ static AVInputFormat image2_iformat = { NULL, AVFMT_NOFILE, }; - -static AVInputFormat image2pipe_iformat = { +#endif +#ifdef CONFIG_IMAGE2PIPE_DEMUXER +AVInputFormat image2pipe_demuxer = { "image2pipe", "piped image2 sequence", sizeof(VideoData), @@ -385,11 +389,11 @@ static AVInputFormat image2pipe_iformat = { img_read_close, NULL, }; - +#endif /* output */ - -static AVOutputFormat image2_oformat = { +#ifdef CONFIG_IMAGE2_MUXER +AVOutputFormat image2_muxer = { "image2", "image2 sequence", "", @@ -402,8 +406,9 @@ static AVOutputFormat image2_oformat = { img_write_trailer, AVFMT_NOFILE, }; - -static AVOutputFormat image2pipe_oformat = { +#endif +#ifdef CONFIG_IMAGE2PIPE_MUXER +AVOutputFormat image2pipe_muxer = { "image2pipe", "piped image2 sequence", "", @@ -415,14 +420,4 @@ static AVOutputFormat image2pipe_oformat = { img_write_packet, img_write_trailer, }; - -int img2_init(void) -{ - av_register_input_format(&image2_iformat); - av_register_output_format(&image2_oformat); - - av_register_input_format(&image2pipe_iformat); - av_register_output_format(&image2pipe_oformat); - - return 0; -} +#endif