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