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