annotate aviobuf.c @ 822:2614d3c1f415 libavformat

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