annotate img2.c @ 635:55ff71c8180a libavformat

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