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