annotate img2.c @ 2293:9aea08e128f9 libavformat

treat NONE as U8 to fix qtNONE/000_0032.MOV, this should not any have side effect since if bps is 16 in stsd, codec will be changed to s16be, just yell if this breaks any sample
author bcoudurier
date Mon, 30 Jul 2007 10:00:42 +0000
parents b21c2af60bc9
children d52c718e83f9
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 *
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 */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
22 #include "avformat.h"
2189
da71207a7cf1 use new string functions
mru
parents: 2074
diff changeset
23 #include "avstring.h"
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
24
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"},
875
0152b49ef2a5 BMP image decoder
mru
parents: 820
diff changeset
54 { CODEC_ID_BMP , "bmp"},
1409
403621d48275 add gif support
bcoudurier
parents: 1358
diff changeset
55 { CODEC_ID_GIF , "gif"},
1416
3e109676d788 Register .tga and .tiff image extensions
kostya
parents: 1409
diff changeset
56 { CODEC_ID_TARGA , "tga"},
3e109676d788 Register .tga and .tiff image extensions
kostya
parents: 1409
diff changeset
57 { CODEC_ID_TIFF , "tiff"},
1985
b5e15030d788 SGI image decoder ported to the new image API.
diego
parents: 1787
diff changeset
58 { CODEC_ID_SGI , "sgi"},
2074
5a9a03da8fba autodetect ptx files
ivo
parents: 2023
diff changeset
59 { CODEC_ID_PTX , "ptx"},
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
60 {0, NULL}
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
61 };
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
62
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
63 static int sizes[][2] = {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
64 { 640, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
65 { 720, 480 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
66 { 720, 576 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
67 { 352, 288 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
68 { 352, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
69 { 160, 128 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
70 { 512, 384 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
71 { 640, 352 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
72 { 640, 240 },
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
73 };
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
74
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
75 static int infer_size(int *width_ptr, int *height_ptr, int size)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
76 {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
77 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
78
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
79 for(i=0;i<sizeof(sizes)/sizeof(sizes[0]);i++) {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
80 if ((sizes[i][0] * sizes[i][1]) == size) {
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
81 *width_ptr = sizes[i][0];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
82 *height_ptr = sizes[i][1];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
83 return 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
84 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
85 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
86 return -1;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
87 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
88 static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
89 {
530
michael
parents: 498
diff changeset
90 str= strrchr(str, '.');
michael
parents: 498
diff changeset
91 if(!str) return CODEC_ID_NONE;
michael
parents: 498
diff changeset
92 str++;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
93
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
94 while (tags->id) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
95 int i;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
96 for(i=0; toupper(tags->str[i]) == toupper(str[i]); i++){
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
97 if(tags->str[i]==0 && str[i]==0)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
98 return tags->id;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
99 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
100
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
101 tags++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
102 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
103 return CODEC_ID_NONE;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
104 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
105
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
106 /* return -1 if no image found */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
107 static int find_image_range(int *pfirst_index, int *plast_index,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
108 const char *path)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
109 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
110 char buf[1024];
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
111 int range, last_index, range1, first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
112
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
113 /* find the first image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
114 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
115 if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
116 *pfirst_index =
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
117 *plast_index = 1;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
118 return 0;
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
119 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
120 if (url_exist(buf))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
121 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
122 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
123 if (first_index == 5)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
124 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
125
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
126 /* find the last image */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
127 last_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
128 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
129 range = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
130 for(;;) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
131 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
132 range1 = 1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
133 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
134 range1 = 2 * range;
1291
185190bdc185 Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents: 1175
diff changeset
135 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
136 last_index + range1) < 0)
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
137 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
138 if (!url_exist(buf))
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 range = range1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
141 /* just in case... */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
142 if (range >= (1 << 30))
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
143 goto fail;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
144 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
145 /* we are sure than image last_index + range exists */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
146 if (!range)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
147 break;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
148 last_index += range;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
149 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
150 *pfirst_index = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
151 *plast_index = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
152 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
153 fail:
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
154 return -1;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
155 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
156
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
157
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
158 static int image_probe(AVProbeData *p)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
159 {
1594
ffb64cb62cc9 Fix a crash when probing img2 format with a NULL filename.
aurel
parents: 1551
diff changeset
160 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
161 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
162 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
163 else
ee4ef413497e probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents: 1416
diff changeset
164 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
165 }
ee4ef413497e probe with some success image files not containing number pattern but having recognized image extension
bcoudurier
parents: 1416
diff changeset
166 return 0;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
167 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
168
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
169 enum CodecID av_guess_image2_codec(const char *filename){
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
170 return av_str2id(img_tags, filename);
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
171 }
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
172
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
173 static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
174 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
175 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
176 int first_index, last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
177 AVStream *st;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
178
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
179 s1->ctx_flags |= AVFMTCTX_NOHEADER;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
180
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
181 st = av_new_stream(s1, 0);
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
182 if (!st) {
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1594
diff changeset
183 return AVERROR(ENOMEM);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
184 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
185
2189
da71207a7cf1 use new string functions
mru
parents: 2074
diff changeset
186 av_strlcpy(s->path, s1->filename, sizeof(s->path));
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
187 s->img_number = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
188 s->img_count = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
189
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
190 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
191 if (s1->iformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
192 s->is_pipe = 0;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
193 else{
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
194 s->is_pipe = 1;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 1985
diff changeset
195 st->need_parsing = AVSTREAM_PARSE_FULL;
574
955ca987adbd image2pipe fix
michael
parents: 530
diff changeset
196 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
197
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
198 if (!ap->time_base.num) {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
199 av_set_pts_info(st, 60, 1, 25);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
200 } else {
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
201 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
202 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
203
1003
2d57ce58f576 simplify AVFormatParameters NULL checks
michael
parents: 903
diff changeset
204 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
205 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
206 st->codec->height= ap->height;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
207 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
208
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
209 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
210 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
211 return AVERROR(EIO);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
212 s->img_first = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
213 s->img_last = last_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
214 s->img_number = first_index;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
215 /* compute duration */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
216 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 737
diff changeset
217 st->duration = last_index - first_index + 1;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
218 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
219
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
220 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
221 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
222 st->codec->codec_id = ap->video_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
223 }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
224 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
225 st->codec->codec_id = ap->audio_codec_id;
583
7793767ffe35 move p*m from image/lavf -> image2/lavc
michael
parents: 581
diff changeset
226 }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
227 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
228 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
229 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 764
diff changeset
230 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
231 st->codec->pix_fmt = ap->pix_fmt;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
232
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
233 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
234 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
235
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
236 static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
237 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
238 VideoData *s = s1->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
239 char filename[1024];
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
240 int i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
241 int size[3]={0}, ret[3]={0};
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
242 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
243 AVCodecContext *codec= s1->streams[0]->codec;
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 if (!s->is_pipe) {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
246 /* loop over input */
1175
8b53c0f3e7ad add loop_input to AVFormatContext, getting rid of old hack
mru
parents: 1169
diff changeset
247 if (s1->loop_input && s->img_number > s->img_last) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
248 s->img_number = s->img_first;
590
a6945dfb69ab loop hack
michael
parents: 585
diff changeset
249 }
1291
185190bdc185 Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
gpoirier
parents: 1175
diff changeset
250 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
251 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
252 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
253 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
254 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
255 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
256 size[i]= url_fsize(f[i]);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
257
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
258 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
259 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
260 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
261 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
262
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
263 if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
264 infer_size(&codec->width, &codec->height, size[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
265 } else {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
266 f[0] = &s1->pb;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
267 if (url_feof(f[0]))
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
268 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
269 size[0]= 4096;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
270 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
271
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
272 av_new_packet(pkt, size[0] + size[1] + size[2]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
273 pkt->stream_index = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
274 pkt->flags |= PKT_FLAG_KEY;
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 pkt->size= 0;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
277 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
278 if(size[i]){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
279 ret[i]= get_buffer(f[i], pkt->data + pkt->size, size[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
280 if (!s->is_pipe)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
281 url_fclose(f[i]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
282 if(ret[i]>0)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
283 pkt->size += ret[i];
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
284 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
285 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
286
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
287 if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
288 av_free_packet(pkt);
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2189
diff changeset
289 return AVERROR(EIO); /* signal EOF */
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
290 } else {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
291 s->img_count++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
292 s->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
293 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
294 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
295 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
296
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
297 static int img_read_close(AVFormatContext *s1)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
298 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
299 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
300 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
301
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
302 #ifdef CONFIG_MUXERS
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
303 /******************************************************/
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
304 /* image output */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
305
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
306 static int img_write_header(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
307 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
308 VideoData *img = s->priv_data;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
309
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
310 img->img_number = 1;
2189
da71207a7cf1 use new string functions
mru
parents: 2074
diff changeset
311 av_strlcpy(img->path, s->filename, sizeof(img->path));
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
312
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
313 /* find format */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
314 if (s->oformat->flags & AVFMT_NOFILE)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
315 img->is_pipe = 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
316 else
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
317 img->is_pipe = 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
318
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
319 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
320 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
321
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
322 static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
323 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
324 VideoData *img = s->priv_data;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
325 ByteIOContext pb1[3], *pb[3]= {&pb1[0], &pb1[1], &pb1[2]};
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
326 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
327 AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
328 int i;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
329
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
330 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
331 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
332 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
333 return AVERROR(EIO);
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
334 for(i=0; i<3; i++){
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
335 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
336 return AVERROR(EIO);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
337
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
338 if(codec->codec_id != CODEC_ID_RAWVIDEO)
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
339 break;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
340 filename[ strlen(filename) - 1 ]= 'U' + i;
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
341 }
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
342 } else {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
343 pb[0] = &s->pb;
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
344 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 875
diff changeset
345
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
346 if(codec->codec_id == CODEC_ID_RAWVIDEO){
731
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
347 int ysize = codec->width * codec->height;
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
348 put_buffer(pb[0], pkt->data , ysize);
12f78073e925 non 4:2:0 foobar.{Y,U,V} support
michael
parents: 683
diff changeset
349 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
350 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
351 put_flush_packet(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
352 put_flush_packet(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
353 url_fclose(pb[1]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
354 url_fclose(pb[2]);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
355 }else{
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
356 put_buffer(pb[0], pkt->data, pkt->size);
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
357 }
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
358 put_flush_packet(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
359 if (!img->is_pipe) {
635
55ff71c8180a .{Y,U,V} image2 support
michael
parents: 622
diff changeset
360 url_fclose(pb[0]);
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
361 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
362
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
363 img->img_number++;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
364 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
365 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
366
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
367 static int img_write_trailer(AVFormatContext *s)
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
368 {
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
369 return 0;
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
370 }
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
371
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
372 #endif /* CONFIG_MUXERS */
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
373
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
374 /* input */
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
375 #ifdef CONFIG_IMAGE2_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
376 AVInputFormat image2_demuxer = {
497
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 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
388 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
389 #ifdef CONFIG_IMAGE2PIPE_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
390 AVInputFormat image2pipe_demuxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
391 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
392 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
393 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
394 NULL, /* no probe */
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
395 img_read_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
396 img_read_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
397 img_read_close,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
398 NULL,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
399 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
400 #endif
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
401
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
402 /* output */
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
403 #ifdef CONFIG_IMAGE2_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
404 AVOutputFormat image2_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
405 "image2",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
406 "image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
407 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
408 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
409 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
410 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
411 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
412 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
413 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
414 img_write_trailer,
498
7c8687cb7f27 support single images, remove copy/paste junk
michael
parents: 497
diff changeset
415 AVFMT_NOFILE,
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
416 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
417 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
418 #ifdef CONFIG_IMAGE2PIPE_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
419 AVOutputFormat image2pipe_muxer = {
497
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
420 "image2pipe",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
421 "piped image2 sequence",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
422 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
423 "",
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
424 sizeof(VideoData),
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
425 CODEC_ID_NONE,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
426 CODEC_ID_MJPEG,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
427 img_write_header,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
428 img_write_packet,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
429 img_write_trailer,
d95e74ef39e0 image2 / image API cleanup phase-1
michael
parents:
diff changeset
430 };
903
68bc3ca12e79 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
diego
parents: 896
diff changeset
431 #endif