annotate aviobuf.c @ 6193:da9998b48dff libavformat

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