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