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