annotate aviobuf.c @ 1325:9e739042d95c libavformat

simplify seek() failure check
author michael
date Tue, 26 Sep 2006 16:09:56 +0000
parents e9bf6926aecf
children 142fb755fbf5
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 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 0
diff changeset
20 #include "avio.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include <stdarg.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 #define IO_BUFFER_SIZE 32768
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 int init_put_byte(ByteIOContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 unsigned char *buffer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 int buffer_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 int write_flag,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 void *opaque,
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
30 int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
31 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
778
4fbe04f998bf Fix url_fsize for large files patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents: 764
diff changeset
32 offset_t (*seek)(void *opaque, offset_t offset, int whence))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 s->buffer = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 s->buffer_size = buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 s->buf_ptr = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 s->write_flag = write_flag;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
38 if (!s->write_flag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 s->buf_end = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 s->buf_end = buffer + buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 s->opaque = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 s->write_packet = write_packet;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 s->read_packet = read_packet;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 s->seek = seek;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 s->pos = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 s->must_flush = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 s->eof_reached = 0;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
49 s->error = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 s->is_streamed = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 s->max_packet_size = 0;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
52 s->update_checksum= NULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
55
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 static void flush_buffer(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 if (s->buf_ptr > s->buffer) {
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
59 if (s->write_packet && !s->error){
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
60 int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
61 if(ret < 0){
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
62 s->error = ret;
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
63 }
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
64 }
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
65 if(s->update_checksum){
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
66 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
67 s->checksum_ptr= s->buffer;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
68 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 s->pos += s->buf_ptr - s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 void put_byte(ByteIOContext *s, int b)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 *(s->buf_ptr)++ = b;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
77 if (s->buf_ptr >= s->buf_end)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 void put_buffer(ByteIOContext *s, const unsigned char *buf, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 len = (s->buf_end - s->buf_ptr);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 memcpy(s->buf_ptr, buf, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 s->buf_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
92 if (s->buf_ptr >= s->buf_end)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 void put_flush_packet(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 s->must_flush = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 offset_t offset1;
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
109 offset_t pos= s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 if (whence != SEEK_CUR && whence != SEEK_SET)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 return -EINVAL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
113
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
114 if (whence == SEEK_CUR) {
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
115 offset1 = pos + (s->buf_ptr - s->buffer);
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
116 if (offset == 0)
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
117 return offset1;
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
118 offset += offset1;
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
119 }
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
120 offset1 = offset - pos;
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
121 if (!s->must_flush &&
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
122 offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) {
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
123 /* can do the seek inside the buffer */
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
124 s->buf_ptr = s->buffer + offset1;
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
125 } else {
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
126 #ifdef CONFIG_MUXERS
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
127 if (s->write_flag) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 s->must_flush = 1;
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
130 } else
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
131 #endif //CONFIG_MUXERS
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
132 {
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
133 s->buf_end = s->buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 }
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
135 s->buf_ptr = s->buffer;
1325
9e739042d95c simplify seek() failure check
michael
parents: 1323
diff changeset
136 if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
137 return -EPIPE;
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
138 s->pos = offset;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 }
1323
e9bf6926aecf simplify url_fseek()
michael
parents: 1184
diff changeset
140 s->eof_reached = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 return offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 void url_fskip(ByteIOContext *s, offset_t offset)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 url_fseek(s, offset, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 offset_t url_ftell(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 return url_fseek(s, 0, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
154 offset_t url_fsize(ByteIOContext *s)
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
155 {
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
156 offset_t size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
157
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
158 if (!s->seek)
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
159 return -EPIPE;
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
160 size = s->seek(s->opaque, -1, SEEK_END) + 1;
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
161 s->seek(s->opaque, s->pos, SEEK_SET);
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
162 return size;
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
163 }
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 719
diff changeset
164
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 int url_feof(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 return s->eof_reached;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
170 int url_ferror(ByteIOContext *s)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
171 {
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
172 return s->error;
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
173 }
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
174
905
dbc0145bbf11 Add --disable-protocols option to configure to disable I/O protocol from
diego
parents: 896
diff changeset
175 #if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 void put_le32(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 put_byte(s, val >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181 put_byte(s, val >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 void put_be32(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 put_byte(s, val >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 put_byte(s, val >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 void put_strz(ByteIOContext *s, const char *str)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 if (str)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 put_buffer(s, (const unsigned char *) str, strlen(str) + 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 put_byte(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
200 void put_le64(ByteIOContext *s, uint64_t val)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
202 put_le32(s, (uint32_t)(val & 0xffffffff));
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
203 put_le32(s, (uint32_t)(val >> 32));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
206 void put_be64(ByteIOContext *s, uint64_t val)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
208 put_be32(s, (uint32_t)(val >> 32));
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
209 put_be32(s, (uint32_t)(val & 0xffffffff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 void put_le16(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 void put_be16(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223
937
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
224 void put_le24(ByteIOContext *s, unsigned int val)
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
225 {
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
226 put_le16(s, val & 0xffff);
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
227 put_byte(s, val >> 16);
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
228 }
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
229
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
230 void put_be24(ByteIOContext *s, unsigned int val)
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
231 {
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
232 put_be16(s, val >> 8);
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
233 put_byte(s, val);
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
234 }
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
235
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 void put_tag(ByteIOContext *s, const char *tag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 while (*tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 put_byte(s, *tag++);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 }
905
dbc0145bbf11 Add --disable-protocols option to configure to disable I/O protocol from
diego
parents: 896
diff changeset
242 #endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 /* Input stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 static void fill_buffer(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 /* no need to do anything if EOF already reached */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 if (s->eof_reached)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 return;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
253
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
254 if(s->update_checksum){
780
46d81c56df9b 10l (segfault fix)
michael
parents: 778
diff changeset
255 if(s->buf_end > s->checksum_ptr)
46d81c56df9b 10l (segfault fix)
michael
parents: 778
diff changeset
256 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
257 s->checksum_ptr= s->buffer;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
258 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
259
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 len = s->read_packet(s->opaque, s->buffer, s->buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 if (len <= 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 /* do not modify buffer if EOF reached so that a seek back can
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 be done without rereading data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 s->eof_reached = 1;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
265 if(len<0)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
266 s->error= len;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 s->pos += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 s->buf_end = s->buffer + len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
274 unsigned long get_checksum(ByteIOContext *s){
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
275 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
276 s->update_checksum= NULL;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
277 return s->checksum;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
278 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
279
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
280 void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum){
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
281 s->update_checksum= update_checksum;
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
282 if(s->update_checksum){
1184
5a743f6f836a fix regression failure after adler simplification
michael
parents: 937
diff changeset
283 s->checksum= checksum;
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
284 s->checksum_ptr= s->buf_ptr;
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
285 }
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
286 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
287
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 /* NOTE: return 0 if EOF, so you cannot use it if EOF handling is
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 necessary */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 /* XXX: put an inline version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 int get_byte(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 if (s->buf_ptr < s->buf_end) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 fill_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 if (s->buf_ptr < s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 /* NOTE: return URL_EOF (-1) if EOF */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 int url_fgetc(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 if (s->buf_ptr < s->buf_end) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 fill_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 if (s->buf_ptr < s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 return URL_EOF;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 int get_buffer(ByteIOContext *s, unsigned char *buf, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 int len, size1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 size1 = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 len = s->buf_end - s->buf_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 if (len == 0) {
719
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
328 if(size > s->buffer_size && !s->update_checksum){
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
329 len = s->read_packet(s->opaque, buf, size);
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
330 if (len <= 0) {
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
331 /* 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
332 be done without rereading data */
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
333 s->eof_reached = 1;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
334 if(len<0)
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
335 s->error= len;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
336 break;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
337 } else {
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
338 s->pos += len;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
339 size -= len;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
340 buf += len;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
341 s->buf_ptr = s->buffer;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
342 s->buf_end = s->buffer/* + len*/;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
343 }
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
344 }else{
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
345 fill_buffer(s);
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
346 len = s->buf_end - s->buf_ptr;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
347 if (len == 0)
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
348 break;
0ab9b7331748 bypass internal buffer for "large" packets
michael
parents: 643
diff changeset
349 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 memcpy(buf, s->buf_ptr, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 s->buf_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 return size1 - size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
360 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
361 {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
362 int len;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
363
643
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
364 if(size<0)
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
365 return -1;
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
366
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
367 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
368 if (len == 0) {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
369 fill_buffer(s);
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
370 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
371 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
372 if (len > size)
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
373 len = size;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
374 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
375 s->buf_ptr += len;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
376 return len;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
377 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
378
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 unsigned int get_le16(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 val = get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 val |= get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386
937
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
387 unsigned int get_le24(ByteIOContext *s)
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
388 {
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
389 unsigned int val;
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
390 val = get_le16(s);
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
391 val |= get_byte(s) << 16;
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
392 return val;
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
393 }
a887adfe9dc5 add a Creative VOC (de)muxer
aurel
parents: 905
diff changeset
394
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 unsigned int get_le32(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 unsigned int val;
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
398 val = get_le16(s);
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
399 val |= get_le16(s) << 16;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
403 uint64_t get_le64(ByteIOContext *s)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
405 uint64_t val;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
406 val = (uint64_t)get_le32(s);
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
407 val |= (uint64_t)get_le32(s) << 32;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 unsigned int get_be16(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 val = get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 val |= get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
419 unsigned int get_be24(ByteIOContext *s)
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
420 {
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
421 unsigned int val;
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
422 val = get_be16(s) << 8;
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
423 val |= get_byte(s);
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
424 return val;
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
425 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
426 unsigned int get_be32(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428 unsigned int val;
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
429 val = get_be16(s) << 16;
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 780
diff changeset
430 val |= get_be16(s);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 char *get_strz(ByteIOContext *s, char *buf, int maxlen)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 int i = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 char c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 while ((c = get_byte(s))) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 if (i < maxlen-1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 buf[i++] = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
443
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444 buf[i] = 0; /* Ensure null terminated, but may be truncated */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446 return buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
448
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
449 uint64_t get_be64(ByteIOContext *s)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
451 uint64_t val;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
452 val = (uint64_t)get_be32(s) << 32;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
453 val |= (uint64_t)get_be32(s);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
455 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 /* link with avio functions */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
459 #ifdef CONFIG_MUXERS
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
460 static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 URLContext *h = opaque;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
463 return url_write(h, buf, buf_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
465 #else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
466 #define url_write_packet NULL
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
467 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
468
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
469 static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
471 URLContext *h = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 return url_read(h, buf, buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474
778
4fbe04f998bf Fix url_fsize for large files patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents: 764
diff changeset
475 static offset_t url_seek_packet(void *opaque, offset_t offset, int whence)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
476 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
477 URLContext *h = opaque;
502
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
478 return url_seek(h, offset, whence);
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
479 //return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
480 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
481
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
482 int url_fdopen(ByteIOContext *s, URLContext *h)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
483 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
484 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
485 int buffer_size, max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
486
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
487
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
488 max_packet_size = url_get_max_packet_size(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 if (max_packet_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 buffer_size = max_packet_size; /* no need to bufferize more than one packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
492 buffer_size = IO_BUFFER_SIZE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 buffer = av_malloc(buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 if (!buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
498 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
499 (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500 url_read_packet, url_write_packet, url_seek_packet) < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 av_free(buffer);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 421
diff changeset
502 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 s->is_streamed = h->is_streamed;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 s->max_packet_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 /* XXX: must be called before any I/O */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 int url_setbufsize(ByteIOContext *s, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
512 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 buffer = av_malloc(buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 if (!buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 av_free(s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 s->buffer = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 s->buffer_size = buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 s->buf_ptr = buffer;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
521 if (!s->write_flag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 s->buf_end = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 s->buf_end = buffer + buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 /* NOTE: when opened as read/write, the buffers are only used for
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 reading */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 int url_fopen(ByteIOContext *s, const char *filename, int flags)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 URLContext *h;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 int err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 err = url_open(&h, filename, flags);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 if (err < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 err = url_fdopen(s, h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 if (err < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 url_close(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 int url_fclose(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 URLContext *h = s->opaque;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
549
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 av_free(s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 memset(s, 0, sizeof(ByteIOContext));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 return url_close(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555 URLContext *url_fileno(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557 return s->opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
560 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 /* XXX: currently size is limited */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 int url_fprintf(ByteIOContext *s, const char *fmt, ...)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 va_list ap;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565 char buf[4096];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 int ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 va_start(ap, fmt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
569 ret = vsnprintf(buf, sizeof(buf), fmt, ap);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570 va_end(ap);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
571 put_buffer(s, buf, strlen(buf));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
573 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
574 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
575
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576 /* note: unlike fgets, the EOL character is not returned and a whole
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
577 line is parsed. return NULL if first char read was EOF */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
578 char *url_fgets(ByteIOContext *s, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
579 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
580 int c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 c = url_fgetc(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584 if (c == EOF)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585 return NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
587 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
588 if (c == EOF || c == '\n')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 c = url_fgetc(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594 if (buf_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
595 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596 return buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
599 /*
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600 * Return the maximum packet size associated to packetized buffered file
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601 * handle. If the file is not packetized (stream like http or file on
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 * disk), then 0 is returned.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
603 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 * @param h buffered file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
605 * @return maximum packet size in bytes
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
606 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
607 int url_fget_max_packet_size(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
608 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
609 return s->max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
610 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
611
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
612 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
613 /* buffer handling */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
614 int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
615 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
616 return init_put_byte(s, buf, buf_size,
364
0d74e8abcb3d avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 277
diff changeset
617 (flags & URL_WRONLY || flags & URL_RDWR),
0d74e8abcb3d avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 277
diff changeset
618 NULL, NULL, NULL, NULL);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
619 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 /* return the written or read size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622 int url_close_buf(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 put_flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 return s->buf_ptr - s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
626 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
627
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
628 /* output in a dynamic buffer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
629
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
630 typedef struct DynBuffer {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
631 int pos, size, allocated_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
632 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633 int io_buffer_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
634 uint8_t io_buffer[1];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
635 } DynBuffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
636
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
637 static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 DynBuffer *d = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 int new_size, new_allocated_size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
641
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 /* reallocate buffer if needed */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643 new_size = d->pos + buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644 new_allocated_size = d->allocated_size;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
645 if(new_size < d->pos || new_size > INT_MAX/2)
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
646 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
647 while (new_size > new_allocated_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
648 if (!new_allocated_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649 new_allocated_size = new_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 else
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
651 new_allocated_size += new_allocated_size / 2 + 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
652 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
653
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
654 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
655 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
656 if(d->buffer == NULL)
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
657 return -1234;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
658 d->allocated_size = new_allocated_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
659 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
660 memcpy(d->buffer + d->pos, buf, buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
661 d->pos = new_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
662 if (d->pos > d->size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663 d->size = d->pos;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
664 return buf_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
667 static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
669 unsigned char buf1[4];
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
670 int ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672 /* packetized write: output the header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
673 buf1[0] = (buf_size >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
674 buf1[1] = (buf_size >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
675 buf1[2] = (buf_size >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
676 buf1[3] = (buf_size);
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
677 ret= dyn_buf_write(opaque, buf1, 4);
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
678 if(ret < 0)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
679 return ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
681 /* then the data */
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
682 return dyn_buf_write(opaque, buf, buf_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
683 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684
778
4fbe04f998bf Fix url_fsize for large files patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
michael
parents: 764
diff changeset
685 static offset_t dyn_buf_seek(void *opaque, offset_t offset, int whence)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
686 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
687 DynBuffer *d = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
688
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
689 if (whence == SEEK_CUR)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 offset += d->pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
691 else if (whence == SEEK_END)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
692 offset += d->size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
693 if (offset < 0 || offset > 0x7fffffffLL)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
694 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
695 d->pos = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
696 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
697 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
698
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
699 static int url_open_dyn_buf_internal(ByteIOContext *s, int max_packet_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
700 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
701 DynBuffer *d;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
702 int io_buffer_size, ret;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
703
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
704 if (max_packet_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
705 io_buffer_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
706 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
707 io_buffer_size = 1024;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
708
639
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
709 if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
710 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
711 d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
712 if (!d)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
713 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
714 d->io_buffer_size = io_buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
715 d->buffer = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
716 d->pos = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
717 d->size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
718 d->allocated_size = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
719 ret = init_put_byte(s, d->io_buffer, io_buffer_size,
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
720 1, d, NULL,
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
721 max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
722 max_packet_size ? NULL : dyn_buf_seek);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
723 if (ret == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
724 s->max_packet_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
725 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
726 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
727 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
728
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
729 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
730 * Open a write only memory stream.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
731 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
732 * @param s new IO context
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
733 * @return zero if no error.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
734 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
735 int url_open_dyn_buf(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
736 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
737 return url_open_dyn_buf_internal(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
738 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
739
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
740 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
741 * Open a write only packetized memory stream with a maximum packet
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
742 * size of 'max_packet_size'. The stream is stored in a memory buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
743 * with a big endian 4 byte header giving the packet size in bytes.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
744 *
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
745 * @param s new IO context
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
746 * @param max_packet_size maximum packet size (must be > 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 * @return zero if no error.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
748 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
749 int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
751 if (max_packet_size <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
753 return url_open_dyn_buf_internal(s, max_packet_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
754 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
756 /*
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757 * Return the written size and a pointer to the buffer. The buffer
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
758 * must be freed with av_free().
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759 * @param s IO context
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 * @param pointer to a byte buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761 * @return the length of the byte buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
763 int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
764 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 DynBuffer *d = s->opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
766 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
767
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
768 put_flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
770 *pbuffer = d->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
771 size = d->size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
772 av_free(d);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
774 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 823
diff changeset
775 #endif //CONFIG_MUXERS