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