*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
+#include "avio.h"
#include <stdarg.h>
#define IO_BUFFER_SIZE 32768
int buffer_size,
int write_flag,
void *opaque,
- int (*read_packet)(void *opaque, UINT8 *buf, int buf_size),
- void (*write_packet)(void *opaque, UINT8 *buf, int buf_size),
- int (*seek)(void *opaque, offset_t offset, int whence))
+ int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+ int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+ offset_t (*seek)(void *opaque, offset_t offset, int whence))
{
s->buffer = buffer;
s->buffer_size = buffer_size;
s->buf_ptr = buffer;
s->write_flag = write_flag;
- if (!s->write_flag)
+ if (!s->write_flag)
s->buf_end = buffer;
else
s->buf_end = buffer + buffer_size;
s->pos = 0;
s->must_flush = 0;
s->eof_reached = 0;
+ s->error = 0;
s->is_streamed = 0;
s->max_packet_size = 0;
+ s->update_checksum= NULL;
return 0;
}
-
static void flush_buffer(ByteIOContext *s)
{
if (s->buf_ptr > s->buffer) {
- if (s->write_packet)
- s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
+ if (s->write_packet && !s->error){
+ int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
+ if(ret < 0){
+ s->error = ret;
+ }
+ }
+ if(s->update_checksum){
+ s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
+ s->checksum_ptr= s->buffer;
+ }
s->pos += s->buf_ptr - s->buffer;
}
s->buf_ptr = s->buffer;
void put_byte(ByteIOContext *s, int b)
{
*(s->buf_ptr)++ = b;
- if (s->buf_ptr >= s->buf_end)
+ if (s->buf_ptr >= s->buf_end)
flush_buffer(s);
}
memcpy(s->buf_ptr, buf, len);
s->buf_ptr += len;
- if (s->buf_ptr >= s->buf_end)
+ if (s->buf_ptr >= s->buf_end)
flush_buffer(s);
buf += len;
if (whence != SEEK_CUR && whence != SEEK_SET)
return -EINVAL;
-
+
+#ifdef CONFIG_MUXERS
if (s->write_flag) {
if (whence == SEEK_CUR) {
offset1 = s->pos + (s->buf_ptr - s->buffer);
offset += offset1;
}
offset1 = offset - s->pos;
- if (!s->must_flush &&
+ if (!s->must_flush &&
offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) {
/* can do the seek inside the buffer */
s->buf_ptr = s->buffer + offset1;
s->seek(s->opaque, offset, SEEK_SET);
s->pos = offset;
}
- } else {
+ } else
+#endif //CONFIG_MUXERS
+ {
if (whence == SEEK_CUR) {
offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
if (offset == 0)
return -EPIPE;
s->buf_ptr = s->buffer;
s->buf_end = s->buffer;
- s->seek(s->opaque, offset, SEEK_SET);
+ if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
+ return -EPIPE;
s->pos = offset;
}
s->eof_reached = 0;
return url_fseek(s, 0, SEEK_CUR);
}
+offset_t url_fsize(ByteIOContext *s)
+{
+ offset_t size;
+
+ if (!s->seek)
+ return -EPIPE;
+ size = s->seek(s->opaque, -1, SEEK_END) + 1;
+ s->seek(s->opaque, s->pos, SEEK_SET);
+ return size;
+}
+
int url_feof(ByteIOContext *s)
{
return s->eof_reached;
}
+int url_ferror(ByteIOContext *s)
+{
+ return s->error;
+}
+
+#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
void put_le32(ByteIOContext *s, unsigned int val)
{
put_byte(s, val);
put_byte(s, val);
}
-/* IEEE format is assumed */
-void put_be64_double(ByteIOContext *s, double val)
-{
- union {
- double d;
- UINT64 ull;
- } u;
- u.d = val;
- put_be64(s, u.ull);
-}
-
void put_strz(ByteIOContext *s, const char *str)
{
if (str)
put_byte(s, 0);
}
-void put_le64(ByteIOContext *s, UINT64 val)
+void put_le64(ByteIOContext *s, uint64_t val)
{
- put_le32(s, (UINT32)(val & 0xffffffff));
- put_le32(s, (UINT32)(val >> 32));
+ put_le32(s, (uint32_t)(val & 0xffffffff));
+ put_le32(s, (uint32_t)(val >> 32));
}
-void put_be64(ByteIOContext *s, UINT64 val)
+void put_be64(ByteIOContext *s, uint64_t val)
{
- put_be32(s, (UINT32)(val >> 32));
- put_be32(s, (UINT32)(val & 0xffffffff));
+ put_be32(s, (uint32_t)(val >> 32));
+ put_be32(s, (uint32_t)(val & 0xffffffff));
}
void put_le16(ByteIOContext *s, unsigned int val)
put_byte(s, val);
}
+void put_le24(ByteIOContext *s, unsigned int val)
+{
+ put_le16(s, val & 0xffff);
+ put_byte(s, val >> 16);
+}
+
+void put_be24(ByteIOContext *s, unsigned int val)
+{
+ put_be16(s, val >> 8);
+ put_byte(s, val);
+}
+
void put_tag(ByteIOContext *s, const char *tag)
{
while (*tag) {
put_byte(s, *tag++);
}
}
+#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
/* Input stream */
/* no need to do anything if EOF already reached */
if (s->eof_reached)
return;
+
+ if(s->update_checksum){
+ if(s->buf_end > s->checksum_ptr)
+ s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_end - s->checksum_ptr);
+ s->checksum_ptr= s->buffer;
+ }
+
len = s->read_packet(s->opaque, s->buffer, s->buffer_size);
if (len <= 0) {
/* do not modify buffer if EOF reached so that a seek back can
be done without rereading data */
s->eof_reached = 1;
+ if(len<0)
+ s->error= len;
} else {
s->pos += len;
s->buf_ptr = s->buffer;
}
}
+unsigned long get_checksum(ByteIOContext *s){
+ s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
+ s->update_checksum= NULL;
+ return s->checksum;
+}
+
+void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum){
+ s->update_checksum= update_checksum;
+ if(s->update_checksum){
+ s->checksum= checksum;
+ s->checksum_ptr= s->buf_ptr;
+ }
+}
+
/* NOTE: return 0 if EOF, so you cannot use it if EOF handling is
necessary */
/* XXX: put an inline version */
if (len > size)
len = size;
if (len == 0) {
- fill_buffer(s);
- len = s->buf_end - s->buf_ptr;
- if (len == 0)
- break;
+ if(size > s->buffer_size && !s->update_checksum){
+ len = s->read_packet(s->opaque, buf, size);
+ if (len <= 0) {
+ /* do not modify buffer if EOF reached so that a seek back can
+ be done without rereading data */
+ s->eof_reached = 1;
+ if(len<0)
+ s->error= len;
+ break;
+ } else {
+ s->pos += len;
+ size -= len;
+ buf += len;
+ s->buf_ptr = s->buffer;
+ s->buf_end = s->buffer/* + len*/;
+ }
+ }else{
+ fill_buffer(s);
+ len = s->buf_end - s->buf_ptr;
+ if (len == 0)
+ break;
+ }
} else {
memcpy(buf, s->buf_ptr, len);
buf += len;
return size1 - size;
}
+int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size)
+{
+ int len;
+
+ if(size<0)
+ return -1;
+
+ len = s->buf_end - s->buf_ptr;
+ if (len == 0) {
+ fill_buffer(s);
+ len = s->buf_end - s->buf_ptr;
+ }
+ if (len > size)
+ len = size;
+ memcpy(buf, s->buf_ptr, len);
+ s->buf_ptr += len;
+ return len;
+}
+
unsigned int get_le16(ByteIOContext *s)
{
unsigned int val;
return val;
}
-unsigned int get_le32(ByteIOContext *s)
+unsigned int get_le24(ByteIOContext *s)
{
unsigned int val;
- val = get_byte(s);
- val |= get_byte(s) << 8;
+ val = get_le16(s);
val |= get_byte(s) << 16;
- val |= get_byte(s) << 24;
return val;
}
-UINT64 get_le64(ByteIOContext *s)
+unsigned int get_le32(ByteIOContext *s)
{
- UINT64 val;
- val = (UINT64)get_le32(s);
- val |= (UINT64)get_le32(s) << 32;
+ unsigned int val;
+ val = get_le16(s);
+ val |= get_le16(s) << 16;
+ return val;
+}
+
+uint64_t get_le64(ByteIOContext *s)
+{
+ uint64_t val;
+ val = (uint64_t)get_le32(s);
+ val |= (uint64_t)get_le32(s) << 32;
return val;
}
return val;
}
-unsigned int get_be32(ByteIOContext *s)
+unsigned int get_be24(ByteIOContext *s)
{
unsigned int val;
- val = get_byte(s) << 24;
- val |= get_byte(s) << 16;
- val |= get_byte(s) << 8;
+ val = get_be16(s) << 8;
val |= get_byte(s);
return val;
}
-
-double get_be64_double(ByteIOContext *s)
+unsigned int get_be32(ByteIOContext *s)
{
- union {
- double d;
- UINT64 ull;
- } u;
-
- u.ull = get_be64(s);
- return u.d;
+ unsigned int val;
+ val = get_be16(s) << 16;
+ val |= get_be16(s);
+ return val;
}
char *get_strz(ByteIOContext *s, char *buf, int maxlen)
if (i < maxlen-1)
buf[i++] = c;
}
-
+
buf[i] = 0; /* Ensure null terminated, but may be truncated */
return buf;
}
-UINT64 get_be64(ByteIOContext *s)
+uint64_t get_be64(ByteIOContext *s)
{
- UINT64 val;
- val = (UINT64)get_be32(s) << 32;
- val |= (UINT64)get_be32(s);
+ uint64_t val;
+ val = (uint64_t)get_be32(s) << 32;
+ val |= (uint64_t)get_be32(s);
return val;
}
/* link with avio functions */
-void url_write_packet(void *opaque, UINT8 *buf, int buf_size)
+#ifdef CONFIG_MUXERS
+static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
{
URLContext *h = opaque;
- url_write(h, buf, buf_size);
+ return url_write(h, buf, buf_size);
}
+#else
+#define url_write_packet NULL
+#endif //CONFIG_MUXERS
-int url_read_packet(void *opaque, UINT8 *buf, int buf_size)
+static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
{
URLContext *h = opaque;
return url_read(h, buf, buf_size);
}
-int url_seek_packet(void *opaque, INT64 offset, int whence)
+static offset_t url_seek_packet(void *opaque, offset_t offset, int whence)
{
URLContext *h = opaque;
- url_seek(h, offset, whence);
- return 0;
+ return url_seek(h, offset, whence);
+ //return 0;
}
int url_fdopen(ByteIOContext *s, URLContext *h)
{
- UINT8 *buffer;
+ uint8_t *buffer;
int buffer_size, max_packet_size;
-
+
max_packet_size = url_get_max_packet_size(h);
if (max_packet_size) {
buffer_size = max_packet_size; /* no need to bufferize more than one packet */
if (!buffer)
return -ENOMEM;
- if (init_put_byte(s, buffer, buffer_size,
- (h->flags & URL_WRONLY) != 0, h,
+ if (init_put_byte(s, buffer, buffer_size,
+ (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
url_read_packet, url_write_packet, url_seek_packet) < 0) {
av_free(buffer);
- return -EIO;
+ return AVERROR_IO;
}
s->is_streamed = h->is_streamed;
s->max_packet_size = max_packet_size;
/* XXX: must be called before any I/O */
int url_setbufsize(ByteIOContext *s, int buf_size)
{
- UINT8 *buffer;
+ uint8_t *buffer;
buffer = av_malloc(buf_size);
if (!buffer)
return -ENOMEM;
s->buffer = buffer;
s->buffer_size = buf_size;
s->buf_ptr = buffer;
- if (!s->write_flag)
+ if (!s->write_flag)
s->buf_end = buffer;
else
s->buf_end = buffer + buf_size;
int url_fclose(ByteIOContext *s)
{
URLContext *h = s->opaque;
-
+
av_free(s->buffer);
memset(s, 0, sizeof(ByteIOContext));
return url_close(h);
return s->opaque;
}
+#ifdef CONFIG_MUXERS
/* XXX: currently size is limited */
int url_fprintf(ByteIOContext *s, const char *fmt, ...)
{
put_buffer(s, buf, strlen(buf));
return ret;
}
+#endif //CONFIG_MUXERS
/* note: unlike fgets, the EOL character is not returned and a whole
line is parsed. return NULL if first char read was EOF */
return buf;
}
-/*
+/*
* Return the maximum packet size associated to packetized buffered file
* handle. If the file is not packetized (stream like http or file on
* disk), then 0 is returned.
- *
+ *
* @param h buffered file handle
* @return maximum packet size in bytes
*/
return s->max_packet_size;
}
+#ifdef CONFIG_MUXERS
/* buffer handling */
-int url_open_buf(ByteIOContext *s, UINT8 *buf, int buf_size, int flags)
+int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
{
- return init_put_byte(s, buf, buf_size,
- (flags & URL_WRONLY) != 0, NULL, NULL, NULL, NULL);
+ return init_put_byte(s, buf, buf_size,
+ (flags & URL_WRONLY || flags & URL_RDWR),
+ NULL, NULL, NULL, NULL);
}
/* return the written or read size */
typedef struct DynBuffer {
int pos, size, allocated_size;
- UINT8 *buffer;
+ uint8_t *buffer;
int io_buffer_size;
- UINT8 io_buffer[1];
+ uint8_t io_buffer[1];
} DynBuffer;
-static void dyn_buf_write(void *opaque, UINT8 *buf, int buf_size)
+static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
{
DynBuffer *d = opaque;
int new_size, new_allocated_size;
- UINT8 *new_buffer;
-
+
/* reallocate buffer if needed */
new_size = d->pos + buf_size;
new_allocated_size = d->allocated_size;
+ if(new_size < d->pos || new_size > INT_MAX/2)
+ return -1;
while (new_size > new_allocated_size) {
if (!new_allocated_size)
new_allocated_size = new_size;
else
- new_allocated_size = (new_allocated_size * 3) / 2 + 1;
+ new_allocated_size += new_allocated_size / 2 + 1;
}
-
+
if (new_allocated_size > d->allocated_size) {
- new_buffer = av_malloc(new_allocated_size);
- if (!new_buffer)
- return;
- memcpy(new_buffer, d->buffer, d->size);
- av_free(d->buffer);
- d->buffer = new_buffer;
+ d->buffer = av_realloc(d->buffer, new_allocated_size);
+ if(d->buffer == NULL)
+ return -1234;
d->allocated_size = new_allocated_size;
}
memcpy(d->buffer + d->pos, buf, buf_size);
d->pos = new_size;
if (d->pos > d->size)
d->size = d->pos;
+ return buf_size;
}
-static void dyn_packet_buf_write(void *opaque, UINT8 *buf, int buf_size)
+static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
{
unsigned char buf1[4];
+ int ret;
/* packetized write: output the header */
buf1[0] = (buf_size >> 24);
buf1[1] = (buf_size >> 16);
buf1[2] = (buf_size >> 8);
buf1[3] = (buf_size);
- dyn_buf_write(opaque, buf1, 4);
+ ret= dyn_buf_write(opaque, buf1, 4);
+ if(ret < 0)
+ return ret;
/* then the data */
- dyn_buf_write(opaque, buf, buf_size);
+ return dyn_buf_write(opaque, buf, buf_size);
}
-static int dyn_buf_seek(void *opaque, offset_t offset, int whence)
+static offset_t dyn_buf_seek(void *opaque, offset_t offset, int whence)
{
DynBuffer *d = opaque;
{
DynBuffer *d;
int io_buffer_size, ret;
-
- if (max_packet_size)
+
+ if (max_packet_size)
io_buffer_size = max_packet_size;
else
io_buffer_size = 1024;
-
+
+ if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
+ return -1;
d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
if (!d)
return -1;
d->pos = 0;
d->size = 0;
d->allocated_size = 0;
- ret = init_put_byte(s, d->io_buffer, io_buffer_size,
- 1, d, NULL,
- max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
+ ret = init_put_byte(s, d->io_buffer, io_buffer_size,
+ 1, d, NULL,
+ max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
max_packet_size ? NULL : dyn_buf_seek);
if (ret == 0) {
s->max_packet_size = max_packet_size;
/*
* Open a write only memory stream.
- *
+ *
* @param s new IO context
* @return zero if no error.
*/
* Open a write only packetized memory stream with a maximum packet
* size of 'max_packet_size'. The stream is stored in a memory buffer
* with a big endian 4 byte header giving the packet size in bytes.
- *
+ *
* @param s new IO context
- * @param max_packet_size maximum packet size (must be > 0)
+ * @param max_packet_size maximum packet size (must be > 0)
* @return zero if no error.
*/
int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size)
return url_open_dyn_buf_internal(s, max_packet_size);
}
-/*
+/*
* Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
+ * must be freed with av_free().
* @param s IO context
* @param pointer to a byte buffer
* @return the length of the byte buffer
*/
-int url_close_dyn_buf(ByteIOContext *s, UINT8 **pbuffer)
+int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer)
{
DynBuffer *d = s->opaque;
int size;
av_free(d);
return size;
}
+#endif //CONFIG_MUXERS
projects / ffmpeg / blobdiff