annotate aviobuf.c @ 4072:b9bb53432c60 libavformat

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