Mercurial > libavformat.hg
annotate img2.c @ 5756:7c7fe75728dd libavformat
Use ff_url_join for assembling URLs, instead of snprintf
This ensures proper escaping of numerical IPv6 addresses.
The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.
author | mstorsjo |
---|---|
date | Fri, 05 Mar 2010 22:35:21 +0000 |
parents | 25eca7e2cf64 |
children | b5d74258cd23 |
rev | line source |
---|---|
497 | 1 /* |
2 * Image format | |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4247
diff
changeset
|
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard |
497 | 4 * Copyright (c) 2004 Michael Niedermayer |
5 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
6 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
7 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
497 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
497 | 12 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
497 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1291
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
885
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
497 | 21 */ |
3286 | 22 |
4208
af07c3bd3bfa
include intreadwrite.h, fix compilation, img2.c use AV_RL32
bcoudurier
parents:
4206
diff
changeset
|
23 #include "libavutil/intreadwrite.h" |
3286 | 24 #include "libavutil/avstring.h" |
497 | 25 #include "avformat.h" |
3288 | 26 #include <strings.h> |
497 | 27 |
28 typedef struct { | |
29 int img_first; | |
30 int img_last; | |
31 int img_number; | |
32 int img_count; | |
33 int is_pipe; | |
34 char path[1024]; | |
35 } VideoData; | |
36 | |
37 typedef struct { | |
38 enum CodecID id; | |
39 const char *str; | |
40 } IdStrMap; | |
41 | |
42 static const IdStrMap img_tags[] = { | |
43 { CODEC_ID_MJPEG , "jpeg"}, | |
44 { CODEC_ID_MJPEG , "jpg"}, | |
5052 | 45 { CODEC_ID_LJPEG , "ljpg"}, |
581 | 46 { CODEC_ID_PNG , "png"}, |
3080 | 47 { CODEC_ID_PNG , "mng"}, |
583 | 48 { CODEC_ID_PPM , "ppm"}, |
4064 | 49 { CODEC_ID_PPM , "pnm"}, |
583 | 50 { CODEC_ID_PGM , "pgm"}, |
51 { CODEC_ID_PGMYUV , "pgmyuv"}, | |
52 { CODEC_ID_PBM , "pbm"}, | |
53 { CODEC_ID_PAM , "pam"}, | |
497 | 54 { CODEC_ID_MPEG1VIDEO, "mpg1-img"}, |
55 { CODEC_ID_MPEG2VIDEO, "mpg2-img"}, | |
56 { CODEC_ID_MPEG4 , "mpg4-img"}, | |
57 { CODEC_ID_FFV1 , "ffv1-img"}, | |
635 | 58 { CODEC_ID_RAWVIDEO , "y"}, |
875 | 59 { CODEC_ID_BMP , "bmp"}, |
1409 | 60 { CODEC_ID_GIF , "gif"}, |
1416 | 61 { CODEC_ID_TARGA , "tga"}, |
62 { CODEC_ID_TIFF , "tiff"}, | |
3404 | 63 { CODEC_ID_TIFF , "tif"}, |
1985 | 64 { CODEC_ID_SGI , "sgi"}, |
2074 | 65 { CODEC_ID_PTX , "ptx"}, |
2859 | 66 { CODEC_ID_PCX , "pcx"}, |
2867 | 67 { CODEC_ID_SUNRAST , "sun"}, |
68 { CODEC_ID_SUNRAST , "ras"}, | |
69 { CODEC_ID_SUNRAST , "rs"}, | |
70 { CODEC_ID_SUNRAST , "im1"}, | |
71 { CODEC_ID_SUNRAST , "im8"}, | |
72 { CODEC_ID_SUNRAST , "im24"}, | |
73 { CODEC_ID_SUNRAST , "sunras"}, | |
4119 | 74 { CODEC_ID_JPEG2000 , "jp2"}, |
5022 | 75 { CODEC_ID_DPX , "dpx"}, |
3289 | 76 { CODEC_ID_NONE , NULL} |
497 | 77 }; |
78 | |
3769 | 79 static const int sizes[][2] = { |
635 | 80 { 640, 480 }, |
81 { 720, 480 }, | |
82 { 720, 576 }, | |
83 { 352, 288 }, | |
84 { 352, 240 }, | |
85 { 160, 128 }, | |
86 { 512, 384 }, | |
87 { 640, 352 }, | |
88 { 640, 240 }, | |
89 }; | |
90 | |
91 static int infer_size(int *width_ptr, int *height_ptr, int size) | |
92 { | |
93 int i; | |
94 | |
4001 | 95 for(i=0;i<FF_ARRAY_ELEMS(sizes);i++) { |
635 | 96 if ((sizes[i][0] * sizes[i][1]) == size) { |
97 *width_ptr = sizes[i][0]; | |
98 *height_ptr = sizes[i][1]; | |
99 return 0; | |
100 } | |
101 } | |
102 return -1; | |
103 } | |
497 | 104 static enum CodecID av_str2id(const IdStrMap *tags, const char *str) |
105 { | |
530 | 106 str= strrchr(str, '.'); |
107 if(!str) return CODEC_ID_NONE; | |
108 str++; | |
497 | 109 |
110 while (tags->id) { | |
3288 | 111 if (!strcasecmp(str, tags->str)) |
112 return tags->id; | |
497 | 113 |
114 tags++; | |
115 } | |
116 return CODEC_ID_NONE; | |
117 } | |
118 | |
119 /* return -1 if no image found */ | |
885 | 120 static int find_image_range(int *pfirst_index, int *plast_index, |
497 | 121 const char *path) |
122 { | |
123 char buf[1024]; | |
124 int range, last_index, range1, first_index; | |
125 | |
126 /* find the first image */ | |
127 for(first_index = 0; first_index < 5; first_index++) { | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
128 if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ |
885 | 129 *pfirst_index = |
498 | 130 *plast_index = 1; |
5325
feffcbc89904
Fixes detection and error reporting of non-existing files in img2.c.
benoit
parents:
5118
diff
changeset
|
131 if(url_exist(buf)) |
feffcbc89904
Fixes detection and error reporting of non-existing files in img2.c.
benoit
parents:
5118
diff
changeset
|
132 return 0; |
feffcbc89904
Fixes detection and error reporting of non-existing files in img2.c.
benoit
parents:
5118
diff
changeset
|
133 return -1; |
498 | 134 } |
497 | 135 if (url_exist(buf)) |
136 break; | |
137 } | |
138 if (first_index == 5) | |
139 goto fail; | |
885 | 140 |
497 | 141 /* find the last image */ |
142 last_index = first_index; | |
143 for(;;) { | |
144 range = 0; | |
145 for(;;) { | |
146 if (!range) | |
147 range1 = 1; | |
148 else | |
149 range1 = 2 * range; | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
150 if (av_get_frame_filename(buf, sizeof(buf), path, |
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
151 last_index + range1) < 0) |
497 | 152 goto fail; |
153 if (!url_exist(buf)) | |
154 break; | |
155 range = range1; | |
156 /* just in case... */ | |
157 if (range >= (1 << 30)) | |
158 goto fail; | |
159 } | |
160 /* we are sure than image last_index + range exists */ | |
161 if (!range) | |
162 break; | |
163 last_index += range; | |
164 } | |
165 *pfirst_index = first_index; | |
166 *plast_index = last_index; | |
167 return 0; | |
168 fail: | |
169 return -1; | |
170 } | |
171 | |
172 | |
173 static int image_probe(AVProbeData *p) | |
174 { | |
1594
ffb64cb62cc9
Fix a crash when probing img2 format with a NULL filename.
aurel
parents:
1551
diff
changeset
|
175 if (p->filename && av_str2id(img_tags, p->filename)) { |
1551
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
176 if (av_filename_number_test(p->filename)) |
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
177 return AVPROBE_SCORE_MAX; |
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
178 else |
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
179 return AVPROBE_SCORE_MAX/2; |
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
180 } |
ee4ef413497e
probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents:
1416
diff
changeset
|
181 return 0; |
497 | 182 } |
183 | |
583 | 184 enum CodecID av_guess_image2_codec(const char *filename){ |
185 return av_str2id(img_tags, filename); | |
186 } | |
187 | |
497 | 188 static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) |
189 { | |
190 VideoData *s = s1->priv_data; | |
191 int first_index, last_index; | |
192 AVStream *st; | |
193 | |
194 s1->ctx_flags |= AVFMTCTX_NOHEADER; | |
195 | |
196 st = av_new_stream(s1, 0); | |
197 if (!st) { | |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1594
diff
changeset
|
198 return AVERROR(ENOMEM); |
497 | 199 } |
200 | |
2189 | 201 av_strlcpy(s->path, s1->filename, sizeof(s->path)); |
497 | 202 s->img_number = 0; |
203 s->img_count = 0; | |
885 | 204 |
497 | 205 /* find format */ |
206 if (s1->iformat->flags & AVFMT_NOFILE) | |
207 s->is_pipe = 0; | |
574 | 208 else{ |
497 | 209 s->is_pipe = 1; |
2023 | 210 st->need_parsing = AVSTREAM_PARSE_FULL; |
574 | 211 } |
885 | 212 |
1003 | 213 if (!ap->time_base.num) { |
743 | 214 av_set_pts_info(st, 60, 1, 25); |
497 | 215 } else { |
743 | 216 av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den); |
497 | 217 } |
885 | 218 |
1003 | 219 if(ap->width && ap->height){ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
220 st->codec->width = ap->width; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
221 st->codec->height= ap->height; |
635 | 222 } |
885 | 223 |
497 | 224 if (!s->is_pipe) { |
225 if (find_image_range(&first_index, &last_index, s->path) < 0) | |
5325
feffcbc89904
Fixes detection and error reporting of non-existing files in img2.c.
benoit
parents:
5118
diff
changeset
|
226 return AVERROR(ENOENT); |
497 | 227 s->img_first = first_index; |
228 s->img_last = last_index; | |
229 s->img_number = first_index; | |
230 /* compute duration */ | |
231 st->start_time = 0; | |
743 | 232 st->duration = last_index - first_index + 1; |
497 | 233 } |
885 | 234 |
5600
4266e4129b61
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
jai_menon
parents:
5406
diff
changeset
|
235 if(s1->video_codec_id){ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
236 st->codec->codec_type = CODEC_TYPE_VIDEO; |
5600
4266e4129b61
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
jai_menon
parents:
5406
diff
changeset
|
237 st->codec->codec_id = s1->video_codec_id; |
4266e4129b61
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
jai_menon
parents:
5406
diff
changeset
|
238 }else if(s1->audio_codec_id){ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
239 st->codec->codec_type = CODEC_TYPE_AUDIO; |
5600
4266e4129b61
Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
jai_menon
parents:
5406
diff
changeset
|
240 st->codec->codec_id = s1->audio_codec_id; |
583 | 241 }else{ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
242 st->codec->codec_type = CODEC_TYPE_VIDEO; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
243 st->codec->codec_id = av_str2id(img_tags, s->path); |
583 | 244 } |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
245 if(st->codec->codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
246 st->codec->pix_fmt = ap->pix_fmt; |
497 | 247 |
248 return 0; | |
249 } | |
250 | |
251 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) | |
252 { | |
253 VideoData *s = s1->priv_data; | |
254 char filename[1024]; | |
635 | 255 int i; |
256 int size[3]={0}, ret[3]={0}; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2274
diff
changeset
|
257 ByteIOContext *f[3]; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
258 AVCodecContext *codec= s1->streams[0]->codec; |
497 | 259 |
260 if (!s->is_pipe) { | |
261 /* loop over input */ | |
1175
8b53c0f3e7ad
add loop_input to AVFormatContext, getting rid of old hack
mru
parents:
1169
diff
changeset
|
262 if (s1->loop_input && s->img_number > s->img_last) { |
497 | 263 s->img_number = s->img_first; |
590 | 264 } |
5118 | 265 if (s->img_number > s->img_last) |
266 return AVERROR_EOF; | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
267 if (av_get_frame_filename(filename, sizeof(filename), |
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
268 s->path, s->img_number)<0 && s->img_number > 1) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
269 return AVERROR(EIO); |
635 | 270 for(i=0; i<3; i++){ |
5049
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
271 if (url_fopen(&f[i], filename, URL_RDONLY) < 0) { |
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
272 av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename); |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
273 return AVERROR(EIO); |
5049
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
274 } |
764
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
743
diff
changeset
|
275 size[i]= url_fsize(f[i]); |
885 | 276 |
635 | 277 if(codec->codec_id != CODEC_ID_RAWVIDEO) |
278 break; | |
279 filename[ strlen(filename) - 1 ]= 'U' + i; | |
280 } | |
885 | 281 |
635 | 282 if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width) |
283 infer_size(&codec->width, &codec->height, size[0]); | |
497 | 284 } else { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2274
diff
changeset
|
285 f[0] = s1->pb; |
635 | 286 if (url_feof(f[0])) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
287 return AVERROR(EIO); |
635 | 288 size[0]= 4096; |
497 | 289 } |
290 | |
635 | 291 av_new_packet(pkt, size[0] + size[1] + size[2]); |
497 | 292 pkt->stream_index = 0; |
293 pkt->flags |= PKT_FLAG_KEY; | |
294 | |
635 | 295 pkt->size= 0; |
296 for(i=0; i<3; i++){ | |
297 if(size[i]){ | |
298 ret[i]= get_buffer(f[i], pkt->data + pkt->size, size[i]); | |
299 if (!s->is_pipe) | |
300 url_fclose(f[i]); | |
301 if(ret[i]>0) | |
302 pkt->size += ret[i]; | |
303 } | |
497 | 304 } |
305 | |
635 | 306 if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) { |
497 | 307 av_free_packet(pkt); |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
308 return AVERROR(EIO); /* signal EOF */ |
497 | 309 } else { |
310 s->img_count++; | |
311 s->img_number++; | |
312 return 0; | |
313 } | |
314 } | |
315 | |
4206 | 316 #if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER |
497 | 317 /******************************************************/ |
318 /* image output */ | |
319 | |
320 static int img_write_header(AVFormatContext *s) | |
321 { | |
322 VideoData *img = s->priv_data; | |
323 | |
324 img->img_number = 1; | |
2189 | 325 av_strlcpy(img->path, s->filename, sizeof(img->path)); |
497 | 326 |
327 /* find format */ | |
328 if (s->oformat->flags & AVFMT_NOFILE) | |
329 img->is_pipe = 0; | |
330 else | |
331 img->is_pipe = 1; | |
885 | 332 |
497 | 333 return 0; |
334 } | |
335 | |
336 static int img_write_packet(AVFormatContext *s, AVPacket *pkt) | |
337 { | |
338 VideoData *img = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2274
diff
changeset
|
339 ByteIOContext *pb[3]; |
497 | 340 char filename[1024]; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
764
diff
changeset
|
341 AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec; |
635 | 342 int i; |
497 | 343 |
344 if (!img->is_pipe) { | |
1291
185190bdc185
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents:
1175
diff
changeset
|
345 if (av_get_frame_filename(filename, sizeof(filename), |
5406
cef1f2baca9c
print error message when image2 muxer fail to compute frame filename
bcoudurier
parents:
5325
diff
changeset
|
346 img->path, img->img_number) < 0 && img->img_number>1) { |
cef1f2baca9c
print error message when image2 muxer fail to compute frame filename
bcoudurier
parents:
5325
diff
changeset
|
347 av_log(s, AV_LOG_ERROR, "Could not get frame filename from pattern\n"); |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
348 return AVERROR(EIO); |
5406
cef1f2baca9c
print error message when image2 muxer fail to compute frame filename
bcoudurier
parents:
5325
diff
changeset
|
349 } |
635 | 350 for(i=0; i<3; i++){ |
5049
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
351 if (url_fopen(&pb[i], filename, URL_WRONLY) < 0) { |
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
352 av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename); |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2189
diff
changeset
|
353 return AVERROR(EIO); |
5049
d8613bee3863
Print meaningful error messages when url_fopen fails.
jai_menon
parents:
5022
diff
changeset
|
354 } |
885 | 355 |
635 | 356 if(codec->codec_id != CODEC_ID_RAWVIDEO) |
357 break; | |
358 filename[ strlen(filename) - 1 ]= 'U' + i; | |
359 } | |
497 | 360 } else { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2274
diff
changeset
|
361 pb[0] = s->pb; |
497 | 362 } |
885 | 363 |
635 | 364 if(codec->codec_id == CODEC_ID_RAWVIDEO){ |
731 | 365 int ysize = codec->width * codec->height; |
366 put_buffer(pb[0], pkt->data , ysize); | |
367 put_buffer(pb[1], pkt->data + ysize, (pkt->size - ysize)/2); | |
368 put_buffer(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2); | |
635 | 369 put_flush_packet(pb[1]); |
370 put_flush_packet(pb[2]); | |
371 url_fclose(pb[1]); | |
372 url_fclose(pb[2]); | |
373 }else{ | |
4247 | 374 if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){ |
375 AVStream *st = s->streams[0]; | |
376 if(st->codec->extradata_size > 8 && | |
377 AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){ | |
378 if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c')) | |
379 goto error; | |
380 put_be32(pb[0], 12); | |
381 put_tag (pb[0], "jP "); | |
382 put_be32(pb[0], 0x0D0A870A); // signature | |
383 put_be32(pb[0], 20); | |
384 put_tag (pb[0], "ftyp"); | |
385 put_tag (pb[0], "jp2 "); | |
386 put_be32(pb[0], 0); | |
387 put_tag (pb[0], "jp2 "); | |
388 put_buffer(pb[0], st->codec->extradata, st->codec->extradata_size); | |
389 }else if(pkt->size < 8 || | |
390 (!st->codec->extradata_size && | |
391 AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature | |
392 error: | |
393 av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n"); | |
394 return -1; | |
395 } | |
396 } | |
635 | 397 put_buffer(pb[0], pkt->data, pkt->size); |
398 } | |
399 put_flush_packet(pb[0]); | |
497 | 400 if (!img->is_pipe) { |
635 | 401 url_fclose(pb[0]); |
497 | 402 } |
403 | |
404 img->img_number++; | |
405 return 0; | |
406 } | |
407 | |
4206 | 408 #endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */ |
903
68bc3ca12e79
Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents:
896
diff
changeset
|
409 |
497 | 410 /* input */ |
4206 | 411 #if CONFIG_IMAGE2_DEMUXER |
1169 | 412 AVInputFormat image2_demuxer = { |
497 | 413 "image2", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3404
diff
changeset
|
414 NULL_IF_CONFIG_SMALL("image2 sequence"), |
497 | 415 sizeof(VideoData), |
416 image_probe, | |
417 img_read_header, | |
418 img_read_packet, | |
3431 | 419 NULL, |
497 | 420 NULL, |
421 NULL, | |
498 | 422 AVFMT_NOFILE, |
497 | 423 }; |
1169 | 424 #endif |
4206 | 425 #if CONFIG_IMAGE2PIPE_DEMUXER |
1169 | 426 AVInputFormat image2pipe_demuxer = { |
497 | 427 "image2pipe", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3404
diff
changeset
|
428 NULL_IF_CONFIG_SMALL("piped image2 sequence"), |
497 | 429 sizeof(VideoData), |
430 NULL, /* no probe */ | |
431 img_read_header, | |
432 img_read_packet, | |
433 }; | |
1169 | 434 #endif |
497 | 435 |
436 /* output */ | |
4206 | 437 #if CONFIG_IMAGE2_MUXER |
1169 | 438 AVOutputFormat image2_muxer = { |
497 | 439 "image2", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3404
diff
changeset
|
440 NULL_IF_CONFIG_SMALL("image2 sequence"), |
497 | 441 "", |
4759
0c9699c40b66
PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.
cehoyos
parents:
4251
diff
changeset
|
442 "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2", |
497 | 443 sizeof(VideoData), |
444 CODEC_ID_NONE, | |
445 CODEC_ID_MJPEG, | |
446 img_write_header, | |
447 img_write_packet, | |
3140 | 448 NULL, |
5653
25eca7e2cf64
Add flag so muxers not needing width/height can signal this.
michael
parents:
5600
diff
changeset
|
449 .flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE |
497 | 450 }; |
1169 | 451 #endif |
4206 | 452 #if CONFIG_IMAGE2PIPE_MUXER |
1169 | 453 AVOutputFormat image2pipe_muxer = { |
497 | 454 "image2pipe", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3404
diff
changeset
|
455 NULL_IF_CONFIG_SMALL("piped image2 sequence"), |
497 | 456 "", |
457 "", | |
458 sizeof(VideoData), | |
459 CODEC_ID_NONE, | |
460 CODEC_ID_MJPEG, | |
461 img_write_header, | |
462 img_write_packet, | |
5653
25eca7e2cf64
Add flag so muxers not needing width/height can signal this.
michael
parents:
5600
diff
changeset
|
463 .flags= AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS |
497 | 464 }; |
903
68bc3ca12e79
Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents:
896
diff
changeset
|
465 #endif |