annotate img2.c @ 4861:fe16d44f32d3 libavformat

Set stream type to ac3 if registration descriptor is present. Based on patch by Nico Sabi, nicola dot sabbi at poste dot it
author bcoudurier
date Sun, 12 Apr 2009 02:39:16 +0000
parents 0c9699c40b66
children 003850af7649
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
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
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 *
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
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
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
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
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
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
16 * Lesser General Public License for more details.
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
17 *
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
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
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
21 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3141
diff changeset
22
4208
af07c3bd3bfa include intreadwrite.h, fix compilation, img2.c use AV_RL32
bcoudurier
parents: 4206
diff changeset
23 #include "libavutil/intreadwrite.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3141
diff changeset
24 #include "libavutil/avstring.h"
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
25 #include "avformat.h"
3288
b8f57813338a Use strcasecmp() instead of re-inventing it.
benoit
parents: 3286
diff changeset
26 #include <strings.h>
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
27
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
28 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
29 int img_first;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
30 int img_last;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
31 int img_number;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
32 int img_count;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
33 int is_pipe;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
34 char path[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
35 } VideoData;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
36
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
37 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
38 enum CodecID id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
39 const char *str;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
40 } IdStrMap;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
41
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
42 static const IdStrMap img_tags[] = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
43 { CODEC_ID_MJPEG , "jpeg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
44 { CODEC_ID_MJPEG , "jpg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
45 { CODEC_ID_LJPEG , "ljpg"},
581
03377d4de76a porting png support from -f image to -f image2
michael
parents: 574
diff changeset
46 { CODEC_ID_PNG , "png"},
3080
bde591fe6ddb decode mng color decorrelation
lorenm
parents: 2867
diff changeset
47 { CODEC_ID_PNG , "mng"},
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
48 { CODEC_ID_PPM , "ppm"},
4064
4c641d9f02ea Recognize pnm file as images.
cehoyos
parents: 4047
diff changeset
49 { CODEC_ID_PPM , "pnm"},
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
50 { CODEC_ID_PGM , "pgm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
51 { CODEC_ID_PGMYUV , "pgmyuv"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
52 { CODEC_ID_PBM , "pbm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
53 { CODEC_ID_PAM , "pam"},
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
54 { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
55 { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
56 { CODEC_ID_MPEG4 , "mpg4-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
57 { CODEC_ID_FFV1 , "ffv1-img"},
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
58 { CODEC_ID_RAWVIDEO , "y"},
875
0152b49ef2a5 BMP image decoder
mru
parents: 820
diff changeset
59 { CODEC_ID_BMP , "bmp"},
1409
403621d48275 add gif support
bcoudurier
parents: 1358
diff changeset
60 { CODEC_ID_GIF , "gif"},
1416
3e109676d788 Register .tga and .tiff image extensions
kostya
parents: 1409
diff changeset
61 { CODEC_ID_TARGA , "tga"},
3e109676d788 Register .tga and .tiff image extensions
kostya
parents: 1409
diff changeset
62 { CODEC_ID_TIFF , "tiff"},
3404
99033f7987cb Detect "tif" suffix as TIFF.
benoit
parents: 3289
diff changeset
63 { CODEC_ID_TIFF , "tif"},
1985
b5e15030d788 SGI image decoder ported to the new image API.
diego
parents: 1787
diff changeset
64 { CODEC_ID_SGI , "sgi"},
2074
5a9a03da8fba autodetect ptx files
ivo
parents: 2023
diff changeset
65 { CODEC_ID_PTX , "ptx"},
2859
8490c561d921 PC Paintbrush PCX image decoder
ivo
parents: 2771
diff changeset
66 { CODEC_ID_PCX , "pcx"},
2867
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
67 { CODEC_ID_SUNRAST , "sun"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
68 { CODEC_ID_SUNRAST , "ras"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
69 { CODEC_ID_SUNRAST , "rs"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
70 { CODEC_ID_SUNRAST , "im1"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
71 { CODEC_ID_SUNRAST , "im8"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
72 { CODEC_ID_SUNRAST , "im24"},
57818580a457 Sun Rasterfile decoder
ivo
parents: 2859
diff changeset
73 { CODEC_ID_SUNRAST , "sunras"},
4119
a2cc7cc40810 Add jp2 support to img2 demuxer.
benoit
parents: 4064
diff changeset
74 { CODEC_ID_JPEG2000 , "jp2"},
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3288
diff changeset
75 { CODEC_ID_NONE , NULL}
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
76 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
77
3769
93d4898d9b6e Mark several libavformat arrays const
reimar
parents: 3431
diff changeset
78 static const int sizes[][2] = {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
79 { 640, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
80 { 720, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
81 { 720, 576 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
82 { 352, 288 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
83 { 352, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
84 { 160, 128 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
85 { 512, 384 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
86 { 640, 352 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
87 { 640, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
88 };
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
89
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
90 static int infer_size(int *width_ptr, int *height_ptr, int size)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
91 {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
92 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
93
4001
fcb9de59245f uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 3940
diff changeset
94 for(i=0;i<FF_ARRAY_ELEMS(sizes);i++) {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
95 if ((sizes[i][0] * sizes[i][1]) == size) {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
96 *width_ptr = sizes[i][0];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
97 *height_ptr = sizes[i][1];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
98 return 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
99 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
100 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
101 return -1;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
102 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
103 static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
104 {
530
michael
parents: 498
diff changeset
105 str= strrchr(str, '.');
michael
parents: 498
diff changeset
106 if(!str) return CODEC_ID_NONE;
michael
parents: 498
diff changeset
107 str++;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
108
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
109 while (tags->id) {
3288
b8f57813338a Use strcasecmp() instead of re-inventing it.
benoit
parents: 3286
diff changeset
110 if (!strcasecmp(str, tags->str))
b8f57813338a Use strcasecmp() instead of re-inventing it.
benoit
parents: 3286
diff changeset
111 return tags->id;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
112
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
113 tags++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
114 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
115 return CODEC_ID_NONE;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
116 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
117
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
118 /* return -1 if no image found */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
119 static int find_image_range(int *pfirst_index, int *plast_index,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
120 const char *path)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
121 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
122 char buf[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
123 int range, last_index, range1, first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
124
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
125 /* find the first image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
126 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
127 if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
128 *pfirst_index =
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
129 *plast_index = 1;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
130 return 0;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
131 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
132 if (url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
133 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
134 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
135 if (first_index == 5)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
136 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
137
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
138 /* find the last image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
139 last_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
140 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
141 range = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
142 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
143 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
144 range1 = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
145 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
146 range1 = 2 * range;
1291
185190bdc185 Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents: 1175
diff changeset
147 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
148 last_index + range1) < 0)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
149 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
150 if (!url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
151 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
152 range = range1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
153 /* just in case... */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
154 if (range >= (1 << 30))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
155 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
156 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
157 /* we are sure than image last_index + range exists */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
158 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
159 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
160 last_index += range;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
161 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
162 *pfirst_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
163 *plast_index = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
164 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
165 fail:
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
166 return -1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
167 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
168
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
169
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
170 static int image_probe(AVProbeData *p)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
171 {
1594
ffb64cb62cc9 Fix a crash when probing img2 format with a NULL filename.
aurel
parents: 1551
diff changeset
172 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
173 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
174 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
175 else
ee4ef413497e probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents: 1416
diff changeset
176 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
177 }
ee4ef413497e probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents: 1416
diff changeset
178 return 0;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
179 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
180
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
181 enum CodecID av_guess_image2_codec(const char *filename){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
182 return av_str2id(img_tags, filename);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
183 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
184
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
185 static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
186 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
187 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
188 int first_index, last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
189 AVStream *st;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
190
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
191 s1->ctx_flags |= AVFMTCTX_NOHEADER;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
192
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
193 st = av_new_stream(s1, 0);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
194 if (!st) {
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1594
diff changeset
195 return AVERROR(ENOMEM);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
196 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
197
2189
da71207a7cf1 use new string functions
mru
parents: 2074
diff changeset
198 av_strlcpy(s->path, s1->filename, sizeof(s->path));
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
199 s->img_number = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
200 s->img_count = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
201
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
202 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
203 if (s1->iformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
204 s->is_pipe = 0;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
205 else{
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
206 s->is_pipe = 1;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 1985
diff changeset
207 st->need_parsing = AVSTREAM_PARSE_FULL;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
208 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
209
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
210 if (!ap->time_base.num) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
211 av_set_pts_info(st, 60, 1, 25);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
212 } else {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
213 av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
214 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
215
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
216 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
217 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
218 st->codec->height= ap->height;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
219 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
220
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
221 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
222 if (find_image_range(&first_index, &last_index, s->path) < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
223 return AVERROR(EIO);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
224 s->img_first = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
225 s->img_last = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
226 s->img_number = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
227 /* compute duration */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
228 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
229 st->duration = last_index - first_index + 1;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
230 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
231
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
232 if(ap->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
233 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
234 st->codec->codec_id = ap->video_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
235 }else if(ap->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
236 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 764
diff changeset
237 st->codec->codec_id = ap->audio_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
238 }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
239 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
240 st->codec->codec_id = av_str2id(img_tags, s->path);
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
241 }
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 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
243 st->codec->pix_fmt = ap->pix_fmt;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
244
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
245 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
246 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
247
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
248 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
249 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
250 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
251 char filename[1024];
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
252 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
253 int size[3]={0}, ret[3]={0};
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
254 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
255 AVCodecContext *codec= s1->streams[0]->codec;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
256
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
257 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
258 /* loop over input */
1175
8b53c0f3e7ad add loop_input to AVFormatContext, getting rid of old hack
mru
parents: 1169
diff changeset
259 if (s1->loop_input && s->img_number > s->img_last) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
260 s->img_number = s->img_first;
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
261 }
1291
185190bdc185 Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents: 1175
diff changeset
262 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
263 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
264 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
265 for(i=0; i<3; i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
266 if (url_fopen(&f[i], filename, URL_RDONLY) < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
267 return AVERROR(EIO);
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 743
diff changeset
268 size[i]= url_fsize(f[i]);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
269
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
270 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
271 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
272 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
273 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
274
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
275 if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
276 infer_size(&codec->width, &codec->height, size[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
277 } else {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
278 f[0] = s1->pb;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
279 if (url_feof(f[0]))
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
280 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
281 size[0]= 4096;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
282 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
283
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
284 av_new_packet(pkt, size[0] + size[1] + size[2]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
285 pkt->stream_index = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
286 pkt->flags |= PKT_FLAG_KEY;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
287
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
288 pkt->size= 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
289 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
290 if(size[i]){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
291 ret[i]= get_buffer(f[i], pkt->data + pkt->size, size[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
292 if (!s->is_pipe)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
293 url_fclose(f[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
294 if(ret[i]>0)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
295 pkt->size += ret[i];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
296 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
297 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
298
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
299 if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
300 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
301 return AVERROR(EIO); /* signal EOF */
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
302 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
303 s->img_count++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
304 s->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
305 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
306 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
307 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
308
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
309 #if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
310 /******************************************************/
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
311 /* image output */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
312
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
313 static int img_write_header(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
314 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
315 VideoData *img = s->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
316
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
317 img->img_number = 1;
2189
da71207a7cf1 use new string functions
mru
parents: 2074
diff changeset
318 av_strlcpy(img->path, s->filename, sizeof(img->path));
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
319
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
320 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
321 if (s->oformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
322 img->is_pipe = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
323 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
324 img->is_pipe = 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
325
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
326 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
327 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
328
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
329 static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
330 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
331 VideoData *img = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
332 ByteIOContext *pb[3];
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
333 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
334 AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
335 int i;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
336
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
337 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
338 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
339 img->path, img->img_number) < 0 && img->img_number>1)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
340 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
341 for(i=0; i<3; i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
342 if (url_fopen(&pb[i], filename, URL_WRONLY) < 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
343 return AVERROR(EIO);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
344
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
345 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
346 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
347 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
348 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
349 } else {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2274
diff changeset
350 pb[0] = s->pb;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
351 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
352
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
353 if(codec->codec_id == CODEC_ID_RAWVIDEO){
731
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
354 int ysize = codec->width * codec->height;
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
355 put_buffer(pb[0], pkt->data , ysize);
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
356 put_buffer(pb[1], pkt->data + ysize, (pkt->size - ysize)/2);
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
357 put_buffer(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
358 put_flush_packet(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
359 put_flush_packet(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
360 url_fclose(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
361 url_fclose(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
362 }else{
4247
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
363 if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
364 AVStream *st = s->streams[0];
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
365 if(st->codec->extradata_size > 8 &&
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
366 AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
367 if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c'))
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
368 goto error;
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
369 put_be32(pb[0], 12);
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
370 put_tag (pb[0], "jP ");
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
371 put_be32(pb[0], 0x0D0A870A); // signature
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
372 put_be32(pb[0], 20);
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
373 put_tag (pb[0], "ftyp");
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
374 put_tag (pb[0], "jp2 ");
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
375 put_be32(pb[0], 0);
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
376 put_tag (pb[0], "jp2 ");
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
377 put_buffer(pb[0], st->codec->extradata, st->codec->extradata_size);
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
378 }else if(pkt->size < 8 ||
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
379 (!st->codec->extradata_size &&
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
380 AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
381 error:
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
382 av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
383 return -1;
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
384 }
54271b8b5e00 add jp2 formater in image2 muxer
bcoudurier
parents: 4208
diff changeset
385 }
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
386 put_buffer(pb[0], pkt->data, pkt->size);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
387 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
388 put_flush_packet(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
389 if (!img->is_pipe) {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
390 url_fclose(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
391 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
392
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
393 img->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
394 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
395 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
396
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
397 #endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
398
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
399 /* input */
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
400 #if CONFIG_IMAGE2_DEMUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
401 AVInputFormat image2_demuxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
402 "image2",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3404
diff changeset
403 NULL_IF_CONFIG_SMALL("image2 sequence"),
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
404 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
405 image_probe,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
406 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
407 img_read_packet,
3431
3fe66e65fdff Remove useless img_read_close().
ramiro
parents: 3430
diff changeset
408 NULL,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
409 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
410 NULL,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
411 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
412 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
413 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
414 #if CONFIG_IMAGE2PIPE_DEMUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
415 AVInputFormat image2pipe_demuxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
416 "image2pipe",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3404
diff changeset
417 NULL_IF_CONFIG_SMALL("piped image2 sequence"),
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
418 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
419 NULL, /* no probe */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
420 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
421 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
422 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
423 #endif
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
424
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
425 /* output */
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
426 #if CONFIG_IMAGE2_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
427 AVOutputFormat image2_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
428 "image2",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3404
diff changeset
429 NULL_IF_CONFIG_SMALL("image2 sequence"),
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
430 "",
4759
0c9699c40b66 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.
cehoyos
parents: 4251
diff changeset
431 "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
432 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
433 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
434 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
435 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
436 img_write_packet,
3140
eaf450520726 remove useless img_write_trailer func
bcoudurier
parents: 3080
diff changeset
437 NULL,
3940
77f3d0224ee9 Prevent image2 from complaining about non monotone timestamps as
michael
parents: 3871
diff changeset
438 .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
439 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
440 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4119
diff changeset
441 #if CONFIG_IMAGE2PIPE_MUXER
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
442 AVOutputFormat image2pipe_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
443 "image2pipe",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3404
diff changeset
444 NULL_IF_CONFIG_SMALL("piped image2 sequence"),
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
445 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
446 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
447 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
448 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
449 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
450 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
451 img_write_packet,
3940
77f3d0224ee9 Prevent image2 from complaining about non monotone timestamps as
michael
parents: 3871
diff changeset
452 .flags= AVFMT_NOTIMESTAMPS
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
453 };
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
454 #endif