annotate aviobuf.c @ 5836:2997c88028cd libavformat

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