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