annotate img2.c @ 1287:eb0a8abb507c libavformat

remove redundant declarations
author mru
date Sat, 02 Sep 2006 23:10:28 +0000
parents 8b53c0f3e7ad
children 185190bdc185
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
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
497
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
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
22 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
23 int img_first;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
24 int img_last;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
25 int img_number;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
26 int img_count;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
27 int is_pipe;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
28 char path[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
29 } VideoData;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
30
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
31 typedef struct {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
32 enum CodecID id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
33 const char *str;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
34 } IdStrMap;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
35
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
36 static const IdStrMap img_tags[] = {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
37 { CODEC_ID_MJPEG , "jpeg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
38 { CODEC_ID_MJPEG , "jpg"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
39 { CODEC_ID_LJPEG , "ljpg"},
581
03377d4de76a porting png support from -f image to -f image2
michael
parents: 574
diff changeset
40 { CODEC_ID_PNG , "png"},
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
41 { CODEC_ID_PPM , "ppm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
42 { CODEC_ID_PGM , "pgm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
43 { CODEC_ID_PGMYUV , "pgmyuv"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
44 { CODEC_ID_PBM , "pbm"},
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
45 { CODEC_ID_PAM , "pam"},
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
46 { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
47 { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
48 { CODEC_ID_MPEG4 , "mpg4-img"},
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
49 { CODEC_ID_FFV1 , "ffv1-img"},
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
50 { CODEC_ID_RAWVIDEO , "y"},
875
0152b49ef2a5 BMP image decoder
mru
parents: 820
diff changeset
51 { CODEC_ID_BMP , "bmp"},
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
52 {0, NULL}
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
53 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
54
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
55 static int sizes[][2] = {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
56 { 640, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
57 { 720, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
58 { 720, 576 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
59 { 352, 288 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
60 { 352, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
61 { 160, 128 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
62 { 512, 384 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
63 { 640, 352 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
64 { 640, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
65 };
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
66
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
67 static int infer_size(int *width_ptr, int *height_ptr, int size)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
68 {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
69 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
70
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
71 for(i=0;i<sizeof(sizes)/sizeof(sizes[0]);i++) {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
72 if ((sizes[i][0] * sizes[i][1]) == size) {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
73 *width_ptr = sizes[i][0];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
74 *height_ptr = sizes[i][1];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
75 return 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
76 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
77 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
78 return -1;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
79 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
80 static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
81 {
530
michael
parents: 498
diff changeset
82 str= strrchr(str, '.');
michael
parents: 498
diff changeset
83 if(!str) return CODEC_ID_NONE;
michael
parents: 498
diff changeset
84 str++;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
85
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
86 while (tags->id) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
87 int i;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
88 for(i=0; toupper(tags->str[i]) == toupper(str[i]); i++){
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
89 if(tags->str[i]==0 && str[i]==0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
90 return tags->id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
91 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
92
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
93 tags++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
94 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
95 return CODEC_ID_NONE;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
96 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
97
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
98 /* return -1 if no image found */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
99 static int find_image_range(int *pfirst_index, int *plast_index,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
100 const char *path)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
101 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
102 char buf[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
103 int range, last_index, range1, first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
104
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
105 /* find the first image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
106 for(first_index = 0; first_index < 5; first_index++) {
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
107 if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
108 *pfirst_index =
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
109 *plast_index = 1;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
110 return 0;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
111 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
112 if (url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
113 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
114 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
115 if (first_index == 5)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
116 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
117
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
118 /* find the last image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
119 last_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
120 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
121 range = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
122 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
123 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
124 range1 = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
125 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
126 range1 = 2 * range;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
127 if (get_frame_filename(buf, sizeof(buf), path,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
128 last_index + range1) < 0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
129 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
130 if (!url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
131 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
132 range = range1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
133 /* just in case... */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
134 if (range >= (1 << 30))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
135 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
136 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
137 /* we are sure than image last_index + range exists */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
138 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
139 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
140 last_index += range;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
141 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
142 *pfirst_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
143 *plast_index = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
144 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
145 fail:
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
146 return -1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
147 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
148
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
149
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
150 static int image_probe(AVProbeData *p)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
151 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
152 if (filename_number_test(p->filename) >= 0 && av_str2id(img_tags, p->filename))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
153 return AVPROBE_SCORE_MAX;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
154 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
155 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
156 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
157
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
158 enum CodecID av_guess_image2_codec(const char *filename){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
159 return av_str2id(img_tags, filename);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
160 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
161
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
162 static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
163 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
164 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
165 int first_index, last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
166 AVStream *st;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
167
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
168 s1->ctx_flags |= AVFMTCTX_NOHEADER;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
169
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
170 st = av_new_stream(s1, 0);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
171 if (!st) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
172 return -ENOMEM;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
173 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
174
639
0b52743104ac integer overflows, heap corruption
michael
parents: 635
diff changeset
175 pstrcpy(s->path, sizeof(s->path), s1->filename);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
176 s->img_number = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
177 s->img_count = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
178
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
179 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
180 if (s1->iformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
181 s->is_pipe = 0;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
182 else{
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
183 s->is_pipe = 1;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
184 st->need_parsing= 1;
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
185 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
186
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
187 if (!ap->time_base.num) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
188 av_set_pts_info(st, 60, 1, 25);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
189 } else {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
190 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
191 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
192
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
193 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
194 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
195 st->codec->height= ap->height;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
196 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
197
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
198 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
199 if (find_image_range(&first_index, &last_index, s->path) < 0)
622
d4f80b13d981 10l (double free)
michael
parents: 590
diff changeset
200 return AVERROR_IO;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
201 s->img_first = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
202 s->img_last = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
203 s->img_number = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
204 /* compute duration */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
205 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
206 st->duration = last_index - first_index + 1;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
207 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
208
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
209 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
210 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
211 st->codec->codec_id = ap->video_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
212 }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
213 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
214 st->codec->codec_id = ap->audio_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
215 }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
216 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
217 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
218 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 764
diff changeset
219 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
220 st->codec->pix_fmt = ap->pix_fmt;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
221
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
222 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
223 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
224
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
225 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
226 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
227 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
228 char filename[1024];
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
229 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
230 int size[3]={0}, ret[3]={0};
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
231 ByteIOContext f1[3], *f[3]= {&f1[0], &f1[1], &f1[2]};
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 764
diff changeset
232 AVCodecContext *codec= s1->streams[0]->codec;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
233
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
234 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
235 /* loop over input */
1175
8b53c0f3e7ad add loop_input to AVFormatContext, getting rid of old hack
mru
parents: 1169
diff changeset
236 if (s1->loop_input && s->img_number > s->img_last) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
237 s->img_number = s->img_first;
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
238 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
239 if (get_frame_filename(filename, sizeof(filename),
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
240 s->path, s->img_number)<0 && s->img_number > 1)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
241 return AVERROR_IO;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
242 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
243 if (url_fopen(f[i], filename, URL_RDONLY) < 0)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
244 return AVERROR_IO;
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 743
diff changeset
245 size[i]= url_fsize(f[i]);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
246
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
247 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
248 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
249 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
250 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
251
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
252 if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
253 infer_size(&codec->width, &codec->height, size[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
254 } else {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
255 f[0] = &s1->pb;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
256 if (url_feof(f[0]))
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
257 return AVERROR_IO;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
258 size[0]= 4096;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
259 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
260
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
261 av_new_packet(pkt, size[0] + size[1] + size[2]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
262 pkt->stream_index = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
263 pkt->flags |= PKT_FLAG_KEY;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
264
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
265 pkt->size= 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
266 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
267 if(size[i]){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
268 ret[i]= get_buffer(f[i], pkt->data + pkt->size, size[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
269 if (!s->is_pipe)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
270 url_fclose(f[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
271 if(ret[i]>0)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
272 pkt->size += ret[i];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
273 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
274 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
275
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
276 if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
277 av_free_packet(pkt);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
278 return AVERROR_IO; /* signal EOF */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
279 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
280 s->img_count++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
281 s->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
282 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
283 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
284 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
285
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
286 static int img_read_close(AVFormatContext *s1)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
287 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
288 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
289 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
290
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
291 #ifdef CONFIG_MUXERS
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
292 /******************************************************/
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
293 /* image output */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
294
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
295 static int img_write_header(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
296 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
297 VideoData *img = s->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
298
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
299 img->img_number = 1;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 635
diff changeset
300 pstrcpy(img->path, sizeof(img->path), s->filename);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
301
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
302 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
303 if (s->oformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
304 img->is_pipe = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
305 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
306 img->is_pipe = 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
307
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
308 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
309 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
310
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
311 static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
312 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
313 VideoData *img = s->priv_data;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
314 ByteIOContext pb1[3], *pb[3]= {&pb1[0], &pb1[1], &pb1[2]};
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
315 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
316 AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
317 int i;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
318
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
319 if (!img->is_pipe) {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
320 if (get_frame_filename(filename, sizeof(filename),
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
321 img->path, img->img_number) < 0 && img->img_number>1)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
322 return AVERROR_IO;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
323 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
324 if (url_fopen(pb[i], filename, URL_WRONLY) < 0)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
325 return AVERROR_IO;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
326
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
327 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
328 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
329 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
330 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
331 } else {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
332 pb[0] = &s->pb;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
333 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
334
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
335 if(codec->codec_id == CODEC_ID_RAWVIDEO){
731
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
336 int ysize = codec->width * codec->height;
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
337 put_buffer(pb[0], pkt->data , ysize);
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
338 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
339 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
340 put_flush_packet(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
341 put_flush_packet(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
342 url_fclose(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
343 url_fclose(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
344 }else{
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
345 put_buffer(pb[0], pkt->data, pkt->size);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
346 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
347 put_flush_packet(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
348 if (!img->is_pipe) {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
349 url_fclose(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
350 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
351
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
352 img->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
353 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
354 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
355
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
356 static int img_write_trailer(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
357 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
358 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
359 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
360
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
361 #endif /* CONFIG_MUXERS */
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
362
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
363 /* input */
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
364 #ifdef CONFIG_IMAGE2_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
365 AVInputFormat image2_demuxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
366 "image2",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
367 "image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
368 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
369 image_probe,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
370 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
371 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
372 img_read_close,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
373 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
374 NULL,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
375 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
376 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
377 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
378 #ifdef CONFIG_IMAGE2PIPE_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
379 AVInputFormat image2pipe_demuxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
380 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
381 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
382 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
383 NULL, /* no probe */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
384 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
385 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
386 img_read_close,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
387 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
388 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
389 #endif
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
390
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
391 /* output */
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
392 #ifdef CONFIG_IMAGE2_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
393 AVOutputFormat image2_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
394 "image2",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
395 "image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
396 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
397 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
398 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
399 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
400 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
401 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
402 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
403 img_write_trailer,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
404 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
405 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
406 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
407 #ifdef CONFIG_IMAGE2PIPE_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
408 AVOutputFormat image2pipe_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
409 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
410 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
411 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
412 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
413 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
414 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
415 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
416 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
417 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
418 img_write_trailer,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
419 };
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
420 #endif