Mercurial > libavformat.hg
annotate aviobuf.c @ 4651:2f6e99161450 libavformat
Reorder operations, 20% improved performance, 1 variable less.
author | michael |
---|---|
date | Thu, 05 Mar 2009 23:57:42 +0000 |
parents | 63c721da20e5 |
children | 37da30baa62d |
rev | line source |
---|---|
0 | 1 /* |
2 * Buffered I/O for ffmpeg system | |
3 * Copyright (c) 2000,2001 Fabrice Bellard | |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1326
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1326
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1326
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
0 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * 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:
1326
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
0 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1326
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * 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:
1326
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
3286 | 21 |
22 #include "libavutil/crc.h" | |
4233 | 23 #include "libavutil/intreadwrite.h" |
0 | 24 #include "avformat.h" |
64 | 25 #include "avio.h" |
0 | 26 #include <stdarg.h> |
27 | |
28 #define IO_BUFFER_SIZE 32768 | |
29 | |
1326 | 30 static void fill_buffer(ByteIOContext *s); |
31 | |
0 | 32 int init_put_byte(ByteIOContext *s, |
33 unsigned char *buffer, | |
34 int buffer_size, | |
35 int write_flag, | |
36 void *opaque, | |
65 | 37 int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), |
554 | 38 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
39 int64_t (*seek)(void *opaque, int64_t offset, int whence)) |
0 | 40 { |
41 s->buffer = buffer; | |
42 s->buffer_size = buffer_size; | |
43 s->buf_ptr = buffer; | |
4127
6afa3d7c206e
Initialize s->opaque before calling url_resetbuf().
cehoyos
parents:
4091
diff
changeset
|
44 s->opaque = opaque; |
2598
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
45 url_resetbuf(s, write_flag ? URL_WRONLY : URL_RDONLY); |
0 | 46 s->write_packet = write_packet; |
47 s->read_packet = read_packet; | |
48 s->seek = seek; | |
49 s->pos = 0; | |
50 s->must_flush = 0; | |
51 s->eof_reached = 0; | |
554 | 52 s->error = 0; |
0 | 53 s->is_streamed = 0; |
54 s->max_packet_size = 0; | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
55 s->update_checksum= NULL; |
1403
1973528c6975
move memory reading ByteIOContext init from mov.c to avobuf.c
michael
parents:
1358
diff
changeset
|
56 if(!read_packet && !write_flag){ |
1973528c6975
move memory reading ByteIOContext init from mov.c to avobuf.c
michael
parents:
1358
diff
changeset
|
57 s->pos = buffer_size; |
1973528c6975
move memory reading ByteIOContext init from mov.c to avobuf.c
michael
parents:
1358
diff
changeset
|
58 s->buf_end = s->buffer + buffer_size; |
1973528c6975
move memory reading ByteIOContext init from mov.c to avobuf.c
michael
parents:
1358
diff
changeset
|
59 } |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
60 s->read_pause = NULL; |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
61 s->read_seek = NULL; |
0 | 62 return 0; |
63 } | |
885 | 64 |
2853 | 65 ByteIOContext *av_alloc_put_byte( |
66 unsigned char *buffer, | |
67 int buffer_size, | |
68 int write_flag, | |
69 void *opaque, | |
70 int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), | |
71 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), | |
4091 | 72 int64_t (*seek)(void *opaque, int64_t offset, int whence)) |
73 { | |
2853 | 74 ByteIOContext *s = av_mallocz(sizeof(ByteIOContext)); |
75 init_put_byte(s, buffer, buffer_size, write_flag, opaque, | |
76 read_packet, write_packet, seek); | |
77 return s; | |
78 } | |
79 | |
0 | 80 static void flush_buffer(ByteIOContext *s) |
81 { | |
82 if (s->buf_ptr > s->buffer) { | |
554 | 83 if (s->write_packet && !s->error){ |
84 int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer); | |
85 if(ret < 0){ | |
86 s->error = ret; | |
87 } | |
88 } | |
421 | 89 if(s->update_checksum){ |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
90 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr); |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
91 s->checksum_ptr= s->buffer; |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
92 } |
0 | 93 s->pos += s->buf_ptr - s->buffer; |
94 } | |
95 s->buf_ptr = s->buffer; | |
96 } | |
97 | |
98 void put_byte(ByteIOContext *s, int b) | |
99 { | |
100 *(s->buf_ptr)++ = b; | |
885 | 101 if (s->buf_ptr >= s->buf_end) |
0 | 102 flush_buffer(s); |
103 } | |
104 | |
105 void put_buffer(ByteIOContext *s, const unsigned char *buf, int size) | |
106 { | |
107 int len; | |
108 | |
109 while (size > 0) { | |
110 len = (s->buf_end - s->buf_ptr); | |
111 if (len > size) | |
112 len = size; | |
113 memcpy(s->buf_ptr, buf, len); | |
114 s->buf_ptr += len; | |
115 | |
885 | 116 if (s->buf_ptr >= s->buf_end) |
0 | 117 flush_buffer(s); |
118 | |
119 buf += len; | |
120 size -= len; | |
121 } | |
122 } | |
123 | |
124 void put_flush_packet(ByteIOContext *s) | |
125 { | |
126 flush_buffer(s); | |
127 s->must_flush = 0; | |
128 } | |
129 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
130 int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence) |
0 | 131 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
132 int64_t offset1; |
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
133 int64_t pos; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
134 |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
135 if(!s) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
136 return AVERROR(EINVAL); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
137 |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
138 pos = s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer)); |
0 | 139 |
140 if (whence != SEEK_CUR && whence != SEEK_SET) | |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1747
diff
changeset
|
141 return AVERROR(EINVAL); |
885 | 142 |
1323 | 143 if (whence == SEEK_CUR) { |
144 offset1 = pos + (s->buf_ptr - s->buffer); | |
145 if (offset == 0) | |
146 return offset1; | |
147 offset += offset1; | |
148 } | |
149 offset1 = offset - pos; | |
150 if (!s->must_flush && | |
151 offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) { | |
152 /* can do the seek inside the buffer */ | |
153 s->buf_ptr = s->buffer + offset1; | |
1326 | 154 } else if(s->is_streamed && !s->write_flag && |
155 offset1 >= 0 && offset1 < (s->buf_end - s->buffer) + (1<<16)){ | |
156 while(s->pos < offset && !s->eof_reached) | |
157 fill_buffer(s); | |
2816
1523342b58b3
return error when url_fseek could not read until desired offset in streamed mode
bcoudurier
parents:
2783
diff
changeset
|
158 if (s->eof_reached) |
1523342b58b3
return error when url_fseek could not read until desired offset in streamed mode
bcoudurier
parents:
2783
diff
changeset
|
159 return AVERROR(EPIPE); |
1326 | 160 s->buf_ptr = s->buf_end + offset - s->pos; |
1323 | 161 } else { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
162 int64_t res = AVERROR(EPIPE); |
1747
fa70e732d2db
Fix misbehaviour in url_fseek() when seeking fails.
gpoirier
parents:
1741
diff
changeset
|
163 |
4206 | 164 #if CONFIG_MUXERS || CONFIG_NETWORK |
1323 | 165 if (s->write_flag) { |
0 | 166 flush_buffer(s); |
167 s->must_flush = 1; | |
3614
71fdc3f7c771
Only reset buffer state if seeking is successful; update seek reg ref.
bcoudurier
parents:
3286
diff
changeset
|
168 } |
4206 | 169 #endif /* CONFIG_MUXERS || CONFIG_NETWORK */ |
1747
fa70e732d2db
Fix misbehaviour in url_fseek() when seeking fails.
gpoirier
parents:
1741
diff
changeset
|
170 if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0) |
fa70e732d2db
Fix misbehaviour in url_fseek() when seeking fails.
gpoirier
parents:
1741
diff
changeset
|
171 return res; |
3614
71fdc3f7c771
Only reset buffer state if seeking is successful; update seek reg ref.
bcoudurier
parents:
3286
diff
changeset
|
172 if (!s->write_flag) |
71fdc3f7c771
Only reset buffer state if seeking is successful; update seek reg ref.
bcoudurier
parents:
3286
diff
changeset
|
173 s->buf_end = s->buffer; |
71fdc3f7c771
Only reset buffer state if seeking is successful; update seek reg ref.
bcoudurier
parents:
3286
diff
changeset
|
174 s->buf_ptr = s->buffer; |
1323 | 175 s->pos = offset; |
0 | 176 } |
1323 | 177 s->eof_reached = 0; |
0 | 178 return offset; |
179 } | |
180 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
181 void url_fskip(ByteIOContext *s, int64_t offset) |
0 | 182 { |
183 url_fseek(s, offset, SEEK_CUR); | |
184 } | |
185 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
186 int64_t url_ftell(ByteIOContext *s) |
0 | 187 { |
188 return url_fseek(s, 0, SEEK_CUR); | |
189 } | |
190 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
191 int64_t url_fsize(ByteIOContext *s) |
764
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
719
diff
changeset
|
192 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
193 int64_t size; |
885 | 194 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
195 if(!s) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
196 return AVERROR(EINVAL); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
197 |
764
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
719
diff
changeset
|
198 if (!s->seek) |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1747
diff
changeset
|
199 return AVERROR(EPIPE); |
1612
a6eaa0762191
seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility
michael
parents:
1592
diff
changeset
|
200 size = s->seek(s->opaque, 0, AVSEEK_SIZE); |
a6eaa0762191
seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility
michael
parents:
1592
diff
changeset
|
201 if(size<0){ |
1741
e9c7714b1c34
proper error handling in file size retrieval, patch by Ronald S. Bultje rbultje at ronald bitfreak net
bcoudurier
parents:
1613
diff
changeset
|
202 if ((size = s->seek(s->opaque, -1, SEEK_END)) < 0) |
e9c7714b1c34
proper error handling in file size retrieval, patch by Ronald S. Bultje rbultje at ronald bitfreak net
bcoudurier
parents:
1613
diff
changeset
|
203 return size; |
e9c7714b1c34
proper error handling in file size retrieval, patch by Ronald S. Bultje rbultje at ronald bitfreak net
bcoudurier
parents:
1613
diff
changeset
|
204 size++; |
1613 | 205 s->seek(s->opaque, s->pos, SEEK_SET); |
1612
a6eaa0762191
seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility
michael
parents:
1592
diff
changeset
|
206 } |
764
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
719
diff
changeset
|
207 return size; |
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
719
diff
changeset
|
208 } |
cdb845a57ae4
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents:
719
diff
changeset
|
209 |
0 | 210 int url_feof(ByteIOContext *s) |
211 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
212 if(!s) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
213 return 0; |
0 | 214 return s->eof_reached; |
215 } | |
216 | |
554 | 217 int url_ferror(ByteIOContext *s) |
218 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
219 if(!s) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
220 return 0; |
554 | 221 return s->error; |
222 } | |
223 | |
0 | 224 void put_le32(ByteIOContext *s, unsigned int val) |
225 { | |
226 put_byte(s, val); | |
227 put_byte(s, val >> 8); | |
228 put_byte(s, val >> 16); | |
229 put_byte(s, val >> 24); | |
230 } | |
231 | |
232 void put_be32(ByteIOContext *s, unsigned int val) | |
233 { | |
234 put_byte(s, val >> 24); | |
235 put_byte(s, val >> 16); | |
236 put_byte(s, val >> 8); | |
237 put_byte(s, val); | |
238 } | |
239 | |
240 void put_strz(ByteIOContext *s, const char *str) | |
241 { | |
242 if (str) | |
243 put_buffer(s, (const unsigned char *) str, strlen(str) + 1); | |
244 else | |
245 put_byte(s, 0); | |
246 } | |
247 | |
65 | 248 void put_le64(ByteIOContext *s, uint64_t val) |
0 | 249 { |
65 | 250 put_le32(s, (uint32_t)(val & 0xffffffff)); |
251 put_le32(s, (uint32_t)(val >> 32)); | |
0 | 252 } |
253 | |
65 | 254 void put_be64(ByteIOContext *s, uint64_t val) |
0 | 255 { |
65 | 256 put_be32(s, (uint32_t)(val >> 32)); |
257 put_be32(s, (uint32_t)(val & 0xffffffff)); | |
0 | 258 } |
259 | |
260 void put_le16(ByteIOContext *s, unsigned int val) | |
261 { | |
262 put_byte(s, val); | |
263 put_byte(s, val >> 8); | |
264 } | |
265 | |
266 void put_be16(ByteIOContext *s, unsigned int val) | |
267 { | |
268 put_byte(s, val >> 8); | |
269 put_byte(s, val); | |
270 } | |
271 | |
937 | 272 void put_le24(ByteIOContext *s, unsigned int val) |
273 { | |
274 put_le16(s, val & 0xffff); | |
275 put_byte(s, val >> 16); | |
276 } | |
277 | |
822 | 278 void put_be24(ByteIOContext *s, unsigned int val) |
279 { | |
280 put_be16(s, val >> 8); | |
281 put_byte(s, val); | |
282 } | |
283 | |
0 | 284 void put_tag(ByteIOContext *s, const char *tag) |
285 { | |
286 while (*tag) { | |
287 put_byte(s, *tag++); | |
288 } | |
289 } | |
290 | |
291 /* Input stream */ | |
292 | |
293 static void fill_buffer(ByteIOContext *s) | |
294 { | |
4020
9d94163ca066
always use the whole buffer for reading w/ packetized sources to avoid packet truncation
henry
parents:
3998
diff
changeset
|
295 uint8_t *dst= !s->max_packet_size && s->buf_end - s->buffer < s->buffer_size ? s->buf_ptr : s->buffer; |
3998
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
296 int len= s->buffer_size - (dst - s->buffer); |
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
297 |
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
298 assert(s->buf_ptr == s->buf_end); |
0 | 299 |
300 /* no need to do anything if EOF already reached */ | |
301 if (s->eof_reached) | |
302 return; | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
303 |
3998
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
304 if(s->update_checksum && dst == s->buffer){ |
780 | 305 if(s->buf_end > s->checksum_ptr) |
306 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_end - s->checksum_ptr); | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
307 s->checksum_ptr= s->buffer; |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
308 } |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
309 |
2576 | 310 if(s->read_packet) |
3998
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
311 len = s->read_packet(s->opaque, dst, len); |
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
312 else |
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
313 len = 0; |
0 | 314 if (len <= 0) { |
315 /* do not modify buffer if EOF reached so that a seek back can | |
316 be done without rereading data */ | |
317 s->eof_reached = 1; | |
2082 | 318 if(len<0) |
319 s->error= len; | |
0 | 320 } else { |
321 s->pos += len; | |
3998
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
322 s->buf_ptr = dst; |
692e5298a27a
Append read data onto the buffer instead of overwriting, this ensures
michael
parents:
3982
diff
changeset
|
323 s->buf_end = dst + len; |
0 | 324 } |
325 } | |
326 | |
4091 | 327 unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, |
328 unsigned int len) | |
329 { | |
2893 | 330 return av_crc(av_crc_get_table(AV_CRC_32_IEEE), checksum, buf, len); |
2683
153d6efc05b8
rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents:
2598
diff
changeset
|
331 } |
153d6efc05b8
rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents:
2598
diff
changeset
|
332 |
4091 | 333 unsigned long get_checksum(ByteIOContext *s) |
334 { | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
335 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr); |
421 | 336 s->update_checksum= NULL; |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
337 return s->checksum; |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
338 } |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
339 |
4091 | 340 void init_checksum(ByteIOContext *s, |
341 unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), | |
342 unsigned long checksum) | |
343 { | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
344 s->update_checksum= update_checksum; |
421 | 345 if(s->update_checksum){ |
1184 | 346 s->checksum= checksum; |
421 | 347 s->checksum_ptr= s->buf_ptr; |
348 } | |
418
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
349 } |
41da3366d341
checksuming for nut & nice checksum API for libavformat
michael
parents:
389
diff
changeset
|
350 |
0 | 351 /* XXX: put an inline version */ |
352 int get_byte(ByteIOContext *s) | |
353 { | |
354 if (s->buf_ptr < s->buf_end) { | |
355 return *s->buf_ptr++; | |
356 } else { | |
357 fill_buffer(s); | |
358 if (s->buf_ptr < s->buf_end) | |
359 return *s->buf_ptr++; | |
360 else | |
361 return 0; | |
362 } | |
363 } | |
364 | |
365 int url_fgetc(ByteIOContext *s) | |
366 { | |
367 if (s->buf_ptr < s->buf_end) { | |
368 return *s->buf_ptr++; | |
369 } else { | |
370 fill_buffer(s); | |
371 if (s->buf_ptr < s->buf_end) | |
372 return *s->buf_ptr++; | |
373 else | |
374 return URL_EOF; | |
375 } | |
376 } | |
377 | |
378 int get_buffer(ByteIOContext *s, unsigned char *buf, int size) | |
379 { | |
380 int len, size1; | |
381 | |
382 size1 = size; | |
383 while (size > 0) { | |
384 len = s->buf_end - s->buf_ptr; | |
385 if (len > size) | |
386 len = size; | |
387 if (len == 0) { | |
719 | 388 if(size > s->buffer_size && !s->update_checksum){ |
2576 | 389 if(s->read_packet) |
2577 | 390 len = s->read_packet(s->opaque, buf, size); |
719 | 391 if (len <= 0) { |
392 /* do not modify buffer if EOF reached so that a seek back can | |
393 be done without rereading data */ | |
394 s->eof_reached = 1; | |
395 if(len<0) | |
396 s->error= len; | |
397 break; | |
398 } else { | |
399 s->pos += len; | |
400 size -= len; | |
401 buf += len; | |
402 s->buf_ptr = s->buffer; | |
403 s->buf_end = s->buffer/* + len*/; | |
404 } | |
405 }else{ | |
406 fill_buffer(s); | |
407 len = s->buf_end - s->buf_ptr; | |
408 if (len == 0) | |
409 break; | |
410 } | |
0 | 411 } else { |
412 memcpy(buf, s->buf_ptr, len); | |
413 buf += len; | |
414 s->buf_ptr += len; | |
415 size -= len; | |
416 } | |
417 } | |
418 return size1 - size; | |
419 } | |
420 | |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
421 int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size) |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
422 { |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
423 int len; |
885 | 424 |
643 | 425 if(size<0) |
426 return -1; | |
389
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
427 |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
428 len = s->buf_end - s->buf_ptr; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
429 if (len == 0) { |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
430 fill_buffer(s); |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
431 len = s->buf_end - s->buf_ptr; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
432 } |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
433 if (len > size) |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
434 len = size; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
435 memcpy(buf, s->buf_ptr, len); |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
436 s->buf_ptr += len; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
437 return len; |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
438 } |
e14fcd57ad2f
decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents:
364
diff
changeset
|
439 |
0 | 440 unsigned int get_le16(ByteIOContext *s) |
441 { | |
442 unsigned int val; | |
443 val = get_byte(s); | |
444 val |= get_byte(s) << 8; | |
445 return val; | |
446 } | |
447 | |
937 | 448 unsigned int get_le24(ByteIOContext *s) |
449 { | |
450 unsigned int val; | |
451 val = get_le16(s); | |
452 val |= get_byte(s) << 16; | |
453 return val; | |
454 } | |
455 | |
0 | 456 unsigned int get_le32(ByteIOContext *s) |
457 { | |
458 unsigned int val; | |
822 | 459 val = get_le16(s); |
460 val |= get_le16(s) << 16; | |
0 | 461 return val; |
462 } | |
463 | |
65 | 464 uint64_t get_le64(ByteIOContext *s) |
0 | 465 { |
65 | 466 uint64_t val; |
467 val = (uint64_t)get_le32(s); | |
468 val |= (uint64_t)get_le32(s) << 32; | |
0 | 469 return val; |
470 } | |
471 | |
472 unsigned int get_be16(ByteIOContext *s) | |
473 { | |
474 unsigned int val; | |
475 val = get_byte(s) << 8; | |
476 val |= get_byte(s); | |
477 return val; | |
478 } | |
479 | |
822 | 480 unsigned int get_be24(ByteIOContext *s) |
481 { | |
482 unsigned int val; | |
483 val = get_be16(s) << 8; | |
484 val |= get_byte(s); | |
485 return val; | |
486 } | |
0 | 487 unsigned int get_be32(ByteIOContext *s) |
488 { | |
489 unsigned int val; | |
822 | 490 val = get_be16(s) << 16; |
491 val |= get_be16(s); | |
0 | 492 return val; |
493 } | |
494 | |
495 char *get_strz(ByteIOContext *s, char *buf, int maxlen) | |
496 { | |
497 int i = 0; | |
498 char c; | |
499 | |
500 while ((c = get_byte(s))) { | |
501 if (i < maxlen-1) | |
502 buf[i++] = c; | |
503 } | |
885 | 504 |
0 | 505 buf[i] = 0; /* Ensure null terminated, but may be truncated */ |
506 | |
507 return buf; | |
508 } | |
509 | |
65 | 510 uint64_t get_be64(ByteIOContext *s) |
0 | 511 { |
65 | 512 uint64_t val; |
513 val = (uint64_t)get_be32(s) << 32; | |
514 val |= (uint64_t)get_be32(s); | |
0 | 515 return val; |
516 } | |
517 | |
2700 | 518 uint64_t ff_get_v(ByteIOContext *bc){ |
2699 | 519 uint64_t val = 0; |
520 int tmp; | |
521 | |
522 do{ | |
523 tmp = get_byte(bc); | |
524 val= (val<<7) + (tmp&127); | |
525 }while(tmp&128); | |
526 return val; | |
527 } | |
528 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
529 int url_fdopen(ByteIOContext **s, URLContext *h) |
0 | 530 { |
65 | 531 uint8_t *buffer; |
0 | 532 int buffer_size, max_packet_size; |
533 | |
885 | 534 |
0 | 535 max_packet_size = url_get_max_packet_size(h); |
536 if (max_packet_size) { | |
537 buffer_size = max_packet_size; /* no need to bufferize more than one packet */ | |
538 } else { | |
539 buffer_size = IO_BUFFER_SIZE; | |
540 } | |
541 buffer = av_malloc(buffer_size); | |
542 if (!buffer) | |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1747
diff
changeset
|
543 return AVERROR(ENOMEM); |
0 | 544 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
545 *s = av_mallocz(sizeof(ByteIOContext)); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
546 if(!*s) { |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
547 av_free(buffer); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
548 return AVERROR(ENOMEM); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
549 } |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
550 |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
551 if (init_put_byte(*s, buffer, buffer_size, |
364
0d74e8abcb3d
avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
277
diff
changeset
|
552 (h->flags & URL_WRONLY || h->flags & URL_RDWR), h, |
2831 | 553 url_read, url_write, url_seek) < 0) { |
0 | 554 av_free(buffer); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
555 av_freep(s); |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2082
diff
changeset
|
556 return AVERROR(EIO); |
0 | 557 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
558 (*s)->is_streamed = h->is_streamed; |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
559 (*s)->max_packet_size = max_packet_size; |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
560 if(h->prot) { |
2839
b51319dd86e5
Merge recently added and still unused play and pause functions.
michael
parents:
2831
diff
changeset
|
561 (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
562 (*s)->read_seek = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
563 } |
0 | 564 return 0; |
565 } | |
566 | |
567 int url_setbufsize(ByteIOContext *s, int buf_size) | |
568 { | |
65 | 569 uint8_t *buffer; |
0 | 570 buffer = av_malloc(buf_size); |
571 if (!buffer) | |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1747
diff
changeset
|
572 return AVERROR(ENOMEM); |
0 | 573 |
574 av_free(s->buffer); | |
575 s->buffer = buffer; | |
576 s->buffer_size = buf_size; | |
577 s->buf_ptr = buffer; | |
2598
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
578 url_resetbuf(s, s->write_flag ? URL_WRONLY : URL_RDONLY); |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
579 return 0; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
580 } |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
581 |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
582 int url_resetbuf(ByteIOContext *s, int flags) |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
583 { |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
584 URLContext *h = s->opaque; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
585 if ((flags & URL_RDWR) || (h && h->flags != flags && !h->flags & URL_RDWR)) |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
586 return AVERROR(EINVAL); |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
587 |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
588 if (flags & URL_WRONLY) { |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
589 s->buf_end = s->buffer + s->buffer_size; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
590 s->write_flag = 1; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
591 } else { |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
592 s->buf_end = s->buffer; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
593 s->write_flag = 0; |
fc7f8ee4700b
Add functionality to set the direction of a ByteIOContext buffer.
benoit
parents:
2577
diff
changeset
|
594 } |
0 | 595 return 0; |
596 } | |
597 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
598 int url_fopen(ByteIOContext **s, const char *filename, int flags) |
0 | 599 { |
600 URLContext *h; | |
601 int err; | |
602 | |
603 err = url_open(&h, filename, flags); | |
604 if (err < 0) | |
605 return err; | |
606 err = url_fdopen(s, h); | |
607 if (err < 0) { | |
608 url_close(h); | |
609 return err; | |
610 } | |
611 return 0; | |
612 } | |
613 | |
614 int url_fclose(ByteIOContext *s) | |
615 { | |
616 URLContext *h = s->opaque; | |
885 | 617 |
0 | 618 av_free(s->buffer); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
619 av_free(s); |
0 | 620 return url_close(h); |
621 } | |
622 | |
623 URLContext *url_fileno(ByteIOContext *s) | |
624 { | |
625 return s->opaque; | |
626 } | |
627 | |
4206 | 628 #if CONFIG_MUXERS |
0 | 629 int url_fprintf(ByteIOContext *s, const char *fmt, ...) |
630 { | |
631 va_list ap; | |
632 char buf[4096]; | |
633 int ret; | |
634 | |
635 va_start(ap, fmt); | |
636 ret = vsnprintf(buf, sizeof(buf), fmt, ap); | |
637 va_end(ap); | |
638 put_buffer(s, buf, strlen(buf)); | |
639 return ret; | |
640 } | |
858
66cc656ea404
Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents:
823
diff
changeset
|
641 #endif //CONFIG_MUXERS |
0 | 642 |
643 char *url_fgets(ByteIOContext *s, char *buf, int buf_size) | |
644 { | |
645 int c; | |
646 char *q; | |
647 | |
648 c = url_fgetc(s); | |
649 if (c == EOF) | |
650 return NULL; | |
651 q = buf; | |
652 for(;;) { | |
653 if (c == EOF || c == '\n') | |
654 break; | |
655 if ((q - buf) < buf_size - 1) | |
656 *q++ = c; | |
657 c = url_fgetc(s); | |
658 } | |
659 if (buf_size > 0) | |
660 *q = '\0'; | |
661 return buf; | |
662 } | |
663 | |
664 int url_fget_max_packet_size(ByteIOContext *s) | |
665 { | |
666 return s->max_packet_size; | |
667 } | |
668 | |
2839
b51319dd86e5
Merge recently added and still unused play and pause functions.
michael
parents:
2831
diff
changeset
|
669 int av_url_read_fpause(ByteIOContext *s, int pause) |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
670 { |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
671 if (!s->read_pause) |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
672 return AVERROR(ENOSYS); |
2839
b51319dd86e5
Merge recently added and still unused play and pause functions.
michael
parents:
2831
diff
changeset
|
673 return s->read_pause(s->opaque, pause); |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
674 } |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
675 |
4091 | 676 int64_t av_url_read_fseek(ByteIOContext *s, int stream_index, |
677 int64_t timestamp, int flags) | |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
678 { |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
679 URLContext *h = s->opaque; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
680 int64_t ret; |
2783
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
681 if (!s->read_seek) |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
682 return AVERROR(ENOSYS); |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
683 ret = s->read_seek(h, stream_index, timestamp, flags); |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
684 if(ret >= 0) { |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
685 s->buf_ptr = s->buf_end; // Flush buffer |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
686 s->pos = s->seek(h, 0, SEEK_CUR); |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
687 } |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
688 return ret; |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
689 } |
1a9db30c1d1c
Extend ByteIOContext and add the buffered IO functions:
andoma
parents:
2771
diff
changeset
|
690 |
1546
41356096b2d0
Fix compile with --disable-muxers, patch by Lo«Ác Le Loarer, lll+ffmpeg m4x org.
diego
parents:
1403
diff
changeset
|
691 /* url_open_dyn_buf and url_close_dyn_buf are used in rtp.c to send a response |
4206 | 692 * back to the server even if CONFIG_MUXERS is false. */ |
693 #if CONFIG_MUXERS || CONFIG_NETWORK | |
0 | 694 /* buffer handling */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
695 int url_open_buf(ByteIOContext **s, uint8_t *buf, int buf_size, int flags) |
0 | 696 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
697 int ret; |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
698 *s = av_mallocz(sizeof(ByteIOContext)); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
699 if(!*s) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
700 return AVERROR(ENOMEM); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
701 ret = init_put_byte(*s, buf, buf_size, |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
702 (flags & URL_WRONLY || flags & URL_RDWR), |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
703 NULL, NULL, NULL, NULL); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
704 if(ret != 0) |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
705 av_freep(s); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
706 return ret; |
0 | 707 } |
708 | |
709 int url_close_buf(ByteIOContext *s) | |
710 { | |
711 put_flush_packet(s); | |
712 return s->buf_ptr - s->buffer; | |
713 } | |
714 | |
715 /* output in a dynamic buffer */ | |
716 | |
717 typedef struct DynBuffer { | |
718 int pos, size, allocated_size; | |
65 | 719 uint8_t *buffer; |
0 | 720 int io_buffer_size; |
65 | 721 uint8_t io_buffer[1]; |
0 | 722 } DynBuffer; |
723 | |
554 | 724 static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) |
0 | 725 { |
726 DynBuffer *d = opaque; | |
3982
1505b1ddab11
Make size variables in dyn_buf_write unsigned so gcc will not optimize the
reimar
parents:
3973
diff
changeset
|
727 unsigned new_size, new_allocated_size; |
885 | 728 |
0 | 729 /* reallocate buffer if needed */ |
730 new_size = d->pos + buf_size; | |
731 new_allocated_size = d->allocated_size; | |
639 | 732 if(new_size < d->pos || new_size > INT_MAX/2) |
733 return -1; | |
0 | 734 while (new_size > new_allocated_size) { |
735 if (!new_allocated_size) | |
736 new_allocated_size = new_size; | |
737 else | |
885 | 738 new_allocated_size += new_allocated_size / 2 + 1; |
0 | 739 } |
885 | 740 |
0 | 741 if (new_allocated_size > d->allocated_size) { |
93
69ed49c151bf
ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
65
diff
changeset
|
742 d->buffer = av_realloc(d->buffer, new_allocated_size); |
69ed49c151bf
ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
65
diff
changeset
|
743 if(d->buffer == NULL) |
4231
07ea426be9a3
Replace nonsense -1234 return value in dyn_buf_write by proper AVERROR(ENOMEM)
reimar
parents:
4206
diff
changeset
|
744 return AVERROR(ENOMEM); |
0 | 745 d->allocated_size = new_allocated_size; |
746 } | |
747 memcpy(d->buffer + d->pos, buf, buf_size); | |
748 d->pos = new_size; | |
749 if (d->pos > d->size) | |
750 d->size = d->pos; | |
554 | 751 return buf_size; |
0 | 752 } |
753 | |
554 | 754 static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size) |
0 | 755 { |
756 unsigned char buf1[4]; | |
554 | 757 int ret; |
0 | 758 |
759 /* packetized write: output the header */ | |
4233 | 760 AV_WB32(buf1, buf_size); |
554 | 761 ret= dyn_buf_write(opaque, buf1, 4); |
762 if(ret < 0) | |
763 return ret; | |
0 | 764 |
765 /* then the data */ | |
554 | 766 return dyn_buf_write(opaque, buf, buf_size); |
0 | 767 } |
768 | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3614
diff
changeset
|
769 static int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence) |
0 | 770 { |
771 DynBuffer *d = opaque; | |
772 | |
773 if (whence == SEEK_CUR) | |
774 offset += d->pos; | |
775 else if (whence == SEEK_END) | |
776 offset += d->size; | |
777 if (offset < 0 || offset > 0x7fffffffLL) | |
778 return -1; | |
779 d->pos = offset; | |
780 return 0; | |
781 } | |
782 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
783 static int url_open_dyn_buf_internal(ByteIOContext **s, int max_packet_size) |
0 | 784 { |
785 DynBuffer *d; | |
4235
ce71070e447d
Make io_buffer_size unsigned to avoid a warning about comparing
reimar
parents:
4234
diff
changeset
|
786 int ret; |
4236
63c721da20e5
Merge declaration and initialization of io_buffer_size
reimar
parents:
4235
diff
changeset
|
787 unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; |
885 | 788 |
639 | 789 if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size) |
790 return -1; | |
4232
5defcf4194fb
Use av_mallocz instead of explicitly zeroing in url_open_dyn_buf_internal.
reimar
parents:
4231
diff
changeset
|
791 d = av_mallocz(sizeof(DynBuffer) + io_buffer_size); |
0 | 792 if (!d) |
4234
3d57729868a9
Return AVERROR(ENOMEM) instead of -1 when malloc fails in url_open_dyn_buf_internal
reimar
parents:
4233
diff
changeset
|
793 return AVERROR(ENOMEM); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
794 *s = av_mallocz(sizeof(ByteIOContext)); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
795 if(!*s) { |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
796 av_free(d); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
797 return AVERROR(ENOMEM); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
798 } |
0 | 799 d->io_buffer_size = io_buffer_size; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
800 ret = init_put_byte(*s, d->io_buffer, io_buffer_size, |
885 | 801 1, d, NULL, |
802 max_packet_size ? dyn_packet_buf_write : dyn_buf_write, | |
0 | 803 max_packet_size ? NULL : dyn_buf_seek); |
804 if (ret == 0) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
805 (*s)->max_packet_size = max_packet_size; |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
806 } else { |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
807 av_free(d); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
808 av_freep(s); |
0 | 809 } |
810 return ret; | |
811 } | |
812 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
813 int url_open_dyn_buf(ByteIOContext **s) |
0 | 814 { |
815 return url_open_dyn_buf_internal(s, 0); | |
816 } | |
817 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
818 int url_open_dyn_packet_buf(ByteIOContext **s, int max_packet_size) |
0 | 819 { |
820 if (max_packet_size <= 0) | |
821 return -1; | |
822 return url_open_dyn_buf_internal(s, max_packet_size); | |
823 } | |
824 | |
65 | 825 int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer) |
0 | 826 { |
827 DynBuffer *d = s->opaque; | |
828 int size; | |
829 | |
830 put_flush_packet(s); | |
831 | |
832 *pbuffer = d->buffer; | |
833 size = d->size; | |
834 av_free(d); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2700
diff
changeset
|
835 av_free(s); |
0 | 836 return size; |
837 } | |
1546
41356096b2d0
Fix compile with --disable-muxers, patch by Lo«Ác Le Loarer, lll+ffmpeg m4x org.
diego
parents:
1403
diff
changeset
|
838 #endif /* CONFIG_MUXERS || CONFIG_NETWORK */ |