annotate img2.c @ 622:d4f80b13d981 libavformat

10l (double free)
author michael
date Sun, 19 Dec 2004 20:25:55 +0000
parents a6945dfb69ab
children 55ff71c8180a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
1 /*
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
2 * Image format
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
4 * Copyright (c) 2004 Michael Niedermayer
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
5 *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
6 * This library is free software; you can redistribute it and/or
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
9 * version 2 of the License, or (at your option) any later version.
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
10 *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
11 * This library is distributed in the hope that it will be useful,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
15 *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
17 * License along with this library; if not, write to the Free Software
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
19 */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
20 #include "avformat.h"
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
21
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
22 /* XXX: this is a hack */
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
23 extern int loop_input;
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
24
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
25 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
26 int img_first;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
27 int img_last;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
28 int img_number;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
29 int img_count;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
30 int is_pipe;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
31 char path[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
32 } VideoData;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
33
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
34 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
35 enum CodecID id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
36 const char *str;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
37 } IdStrMap;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
38
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
39 static const IdStrMap img_tags[] = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
40 { CODEC_ID_MJPEG , "jpeg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
41 { CODEC_ID_MJPEG , "jpg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
42 { CODEC_ID_LJPEG , "ljpg"},
581
03377d4de76a porting png support from -f image to -f image2
michael
parents: 574
diff changeset
43 { CODEC_ID_PNG , "png"},
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
44 { CODEC_ID_PPM , "ppm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
45 { CODEC_ID_PGM , "pgm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
46 { CODEC_ID_PGMYUV , "pgmyuv"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
47 { CODEC_ID_PBM , "pbm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
48 { CODEC_ID_PAM , "pam"},
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
49 { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
50 { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
51 { CODEC_ID_MPEG4 , "mpg4-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
52 { CODEC_ID_FFV1 , "ffv1-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
53 {0, NULL}
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
54 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
55
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
56 static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
57 {
530
michael
parents: 498
diff changeset
58 str= strrchr(str, '.');
michael
parents: 498
diff changeset
59 if(!str) return CODEC_ID_NONE;
michael
parents: 498
diff changeset
60 str++;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
61
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
62 while (tags->id) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
63 int i;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
64 for(i=0; toupper(tags->str[i]) == toupper(str[i]); i++){
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
65 if(tags->str[i]==0 && str[i]==0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
66 return tags->id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
67 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
68
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
69 tags++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
70 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
71 return CODEC_ID_NONE;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
72 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
73
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
74 static const char *av_id2str(const IdStrMap *tags, enum CodecID id)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
75 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
76 while (tags->id) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
77 if(tags->id == id)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
78 return tags->str;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
79 tags++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
80 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
81 return NULL;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
82 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
83
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
84 /* return -1 if no image found */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
85 static int find_image_range(int *pfirst_index, int *plast_index,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
86 const char *path)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
87 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
88 char buf[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
89 int range, last_index, range1, first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
90
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
91 /* find the first image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
92 for(first_index = 0; first_index < 5; first_index++) {
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
93 if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
94 *pfirst_index =
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
95 *plast_index = 1;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
96 return 0;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
97 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
98 if (url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
99 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
100 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
101 if (first_index == 5)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
102 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
103
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
104 /* find the last image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
105 last_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
106 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
107 range = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
108 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
109 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
110 range1 = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
111 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
112 range1 = 2 * range;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
113 if (get_frame_filename(buf, sizeof(buf), path,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
114 last_index + range1) < 0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
115 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
116 if (!url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
117 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
118 range = range1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
119 /* just in case... */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
120 if (range >= (1 << 30))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
121 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
122 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
123 /* we are sure than image last_index + range exists */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
124 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
125 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
126 last_index += range;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
127 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
128 *pfirst_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
129 *plast_index = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
130 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
131 fail:
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
132 return -1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
133 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
134
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
135
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
136 static int image_probe(AVProbeData *p)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
137 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
138 if (filename_number_test(p->filename) >= 0 && av_str2id(img_tags, p->filename))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
139 return AVPROBE_SCORE_MAX;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
140 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
141 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
142 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
143
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
144 enum CodecID av_guess_image2_codec(const char *filename){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
145 return av_str2id(img_tags, filename);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
146 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
147
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
148 static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
149 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
150 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
151 int first_index, last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
152 AVStream *st;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
153
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
154 s1->ctx_flags |= AVFMTCTX_NOHEADER;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
155
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
156 st = av_new_stream(s1, 0);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
157 if (!st) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
158 return -ENOMEM;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
159 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
160
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
161 strcpy(s->path, s1->filename);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
162 s->img_number = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
163 s->img_count = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
164
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
165 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
166 if (s1->iformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
167 s->is_pipe = 0;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
168 else{
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
169 s->is_pipe = 1;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
170 st->need_parsing= 1;
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
171 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
172
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
173 if (!ap || !ap->frame_rate) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
174 st->codec.frame_rate = 25;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
175 st->codec.frame_rate_base = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
176 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
177 st->codec.frame_rate = ap->frame_rate;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
178 st->codec.frame_rate_base = ap->frame_rate_base;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
179 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
180
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
181 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
182 if (find_image_range(&first_index, &last_index, s->path) < 0)
622
d4f80b13d981 10l (double free)
michael
parents: 590
diff changeset
183 return AVERROR_IO;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
184 s->img_first = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
185 s->img_last = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
186 s->img_number = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
187 /* compute duration */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
188 st->start_time = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
189 st->duration = ((int64_t)AV_TIME_BASE *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
190 (last_index - first_index + 1) *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
191 st->codec.frame_rate_base) / st->codec.frame_rate;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
192 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
193
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
194 if(ap->video_codec_id){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
195 st->codec.codec_type = CODEC_TYPE_VIDEO;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
196 st->codec.codec_id = ap->video_codec_id;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
197 }else if(ap->audio_codec_id){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
198 st->codec.codec_type = CODEC_TYPE_AUDIO;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
199 st->codec.codec_id = ap->audio_codec_id;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
200 }else{
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
201 st->codec.codec_type = CODEC_TYPE_VIDEO;
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
202 st->codec.codec_id = av_str2id(img_tags, s->path);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
203 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
204
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
205 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
206 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
207
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
208 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
209 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
210 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
211 char filename[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
212 int ret;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
213 ByteIOContext f1, *f;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
214
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
215 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
216 /* loop over input */
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
217 if (loop_input && s->img_number > s->img_last) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
218 s->img_number = s->img_first;
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
219 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
220 if (get_frame_filename(filename, sizeof(filename),
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
221 s->path, s->img_number)<0 && s->img_number > 1)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
222 return AVERROR_IO;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
223 f = &f1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
224 if (url_fopen(f, filename, URL_RDONLY) < 0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
225 return AVERROR_IO;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
226 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
227 f = &s1->pb;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
228 if (url_feof(f))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
229 return AVERROR_IO;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
230 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
231
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
232 if (s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
233 av_new_packet(pkt, 4096);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
234 }else{
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
235 av_new_packet(pkt, url_filesize(url_fileno(f)));
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
236 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
237 pkt->stream_index = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
238 pkt->flags |= PKT_FLAG_KEY;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
239
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
240 ret = get_buffer(f, pkt->data, pkt->size);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
241 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
242 url_fclose(f);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
243 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
244
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
245 if (ret <= 0) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
246 av_free_packet(pkt);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
247 return AVERROR_IO; /* signal EOF */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
248 } else {
585
10ad229f9d00 last packet size fix
michael
parents: 583
diff changeset
249 pkt->size = ret;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
250 s->img_count++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
251 s->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
252 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
253 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
254 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
255
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
256 static int img_read_close(AVFormatContext *s1)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
257 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
258 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
259 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
260
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
261 /******************************************************/
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
262 /* image output */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
263
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
264 static int img_write_header(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
265 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
266 VideoData *img = s->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
267
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
268 img->img_number = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
269 strcpy(img->path, s->filename);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
270
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
271 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
272 if (s->oformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
273 img->is_pipe = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
274 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
275 img->is_pipe = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
276
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
277 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
278 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
279
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
280 static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
281 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
282 VideoData *img = s->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
283 ByteIOContext pb1, *pb;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
284 char filename[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
285
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
286 if (!img->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
287 if (get_frame_filename(filename, sizeof(filename),
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
288 img->path, img->img_number) < 0 && img->img_number>1)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
289 return AVERROR_IO;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
290 pb = &pb1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
291 if (url_fopen(pb, filename, URL_WRONLY) < 0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
292 return AVERROR_IO;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
293 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
294 pb = &s->pb;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
295 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
296
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
297 put_buffer(pb, pkt->data, pkt->size);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
298 put_flush_packet(pb);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
299 if (!img->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
300 url_fclose(pb);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
301 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
302
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
303 img->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
304 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
305 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
306
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
307 static int img_write_trailer(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
308 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
309 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
310 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
311
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
312 /* input */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
313
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
314 static AVInputFormat image2_iformat = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
315 "image2",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
316 "image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
317 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
318 image_probe,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
319 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
320 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
321 img_read_close,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
322 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
323 NULL,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
324 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
325 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
326
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
327 static AVInputFormat image2pipe_iformat = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
328 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
329 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
330 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
331 NULL, /* no probe */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
332 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
333 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
334 img_read_close,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
335 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
336 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
337
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
338
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
339 /* output */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
340
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
341 static AVOutputFormat image2_oformat = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
342 "image2",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
343 "image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
344 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
345 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
346 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
347 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
348 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
349 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
350 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
351 img_write_trailer,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
352 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
353 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
354
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
355 static AVOutputFormat image2pipe_oformat = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
356 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
357 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
358 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
359 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
360 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
361 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
362 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
363 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
364 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
365 img_write_trailer,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
366 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
367
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
368 int img2_init(void)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
369 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
370 av_register_input_format(&image2_iformat);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
371 av_register_output_format(&image2_oformat);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
372
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
373 av_register_input_format(&image2pipe_iformat);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
374 av_register_output_format(&image2pipe_oformat);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
375
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
376 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
377 }