annotate aviobuf.c @ 6306:175c5f6cb556 libavformat

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