annotate aviobuf.c @ 2500:57954e76863d libavformat

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