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