/*
- * Buffered I/O for ffmpeg system
+ * buffered I/O
* Copyright (c) 2000,2001 Fabrice Bellard
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/crc.h"
+#include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/log.h"
+#include "libavutil/opt.h"
#include "avformat.h"
+#include "avio.h"
+#include "avio_internal.h"
+#include "internal.h"
+#include "url.h"
#include <stdarg.h>
#define IO_BUFFER_SIZE 32768
-int init_put_byte(ByteIOContext *s,
+/**
+ * Do seeks within this distance ahead of the current buffer by skipping
+ * data instead of calling the protocol seek function, for seekable
+ * protocols.
+ */
+#define SHORT_SEEK_THRESHOLD 4096
+
+typedef struct AVIOInternal {
+ const AVClass *class;
+
+ char *protocol_whitelist;
+ char *protocol_blacklist;
+
+ URLContext *h;
+ const URLProtocol **protocols;
+} AVIOInternal;
+
+static void *io_priv_child_next(void *obj, void *prev)
+{
+ AVIOInternal *internal = obj;
+ return prev ? NULL : internal->h;
+}
+
+static const AVClass *io_priv_child_class_next(const AVClass *prev)
+{
+ return prev ? NULL : &ffurl_context_class;
+}
+
+#define OFFSET(x) offsetof(AVIOInternal, x)
+static const AVOption io_priv_options[] = {
+ { "protocol_whitelist", "A comma-separated list of allowed protocols",
+ OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING },
+ { "protocol_blacklist", "A comma-separated list of forbidden protocols",
+ OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING },
+ { NULL },
+};
+
+static const AVClass io_priv_class = {
+ .class_name = "AVIOContext",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ .option = io_priv_options,
+ .child_next = io_priv_child_next,
+ .child_class_next = io_priv_child_class_next,
+};
+
+static void *ff_avio_child_next(void *obj, void *prev)
+{
+ AVIOContext *s = obj;
+ return prev ? NULL : s->opaque;
+}
+
+static const AVClass *ff_avio_child_class_next(const AVClass *prev)
+{
+ return prev ? NULL : &io_priv_class;
+}
+
+static const AVOption ff_avio_options[] = {
+ { NULL },
+};
+
+const AVClass ff_avio_class = {
+ .class_name = "AVIOContext",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ .option = ff_avio_options,
+ .child_next = ff_avio_child_next,
+ .child_class_next = ff_avio_child_class_next,
+};
+
+static void fill_buffer(AVIOContext *s);
+static int url_resetbuf(AVIOContext *s, int flags);
+
+int ffio_init_context(AVIOContext *s,
unsigned char *buffer,
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),
+ int64_t (*seek)(void *opaque, int64_t offset, int whence))
{
- s->buffer = buffer;
+ s->buffer = buffer;
s->buffer_size = buffer_size;
- s->buf_ptr = buffer;
- s->write_flag = write_flag;
- if (!s->write_flag)
- s->buf_end = buffer;
- else
- s->buf_end = buffer + buffer_size;
- s->opaque = opaque;
- s->write_packet = write_packet;
- s->read_packet = read_packet;
- s->seek = seek;
- s->pos = 0;
- s->must_flush = 0;
- s->eof_reached = 0;
- s->is_streamed = 0;
+ s->buf_ptr = buffer;
+ s->opaque = opaque;
+
+ url_resetbuf(s, write_flag ? AVIO_FLAG_WRITE : AVIO_FLAG_READ);
+
+ s->write_packet = write_packet;
+ s->read_packet = read_packet;
+ s->seek = seek;
+ s->pos = 0;
+ s->must_flush = 0;
+ s->eof_reached = 0;
+ s->error = 0;
+ s->seekable = seek ? AVIO_SEEKABLE_NORMAL : 0;
s->max_packet_size = 0;
+ s->update_checksum = NULL;
+
+ if (!read_packet && !write_flag) {
+ s->pos = buffer_size;
+ s->buf_end = s->buffer + buffer_size;
+ }
+ s->read_pause = NULL;
+ s->read_seek = NULL;
+
+ s->write_data_type = NULL;
+ s->ignore_boundary_point = 0;
+ s->current_type = AVIO_DATA_MARKER_UNKNOWN;
+ s->last_time = AV_NOPTS_VALUE;
+
return 0;
}
-
-static void flush_buffer(ByteIOContext *s)
+AVIOContext *avio_alloc_context(
+ unsigned char *buffer,
+ int buffer_size,
+ int write_flag,
+ void *opaque,
+ int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+ int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+ int64_t (*seek)(void *opaque, int64_t offset, int whence))
+{
+ AVIOContext *s = av_mallocz(sizeof(AVIOContext));
+ if (!s)
+ return NULL;
+ ffio_init_context(s, buffer, buffer_size, write_flag, opaque,
+ read_packet, write_packet, seek);
+ return s;
+}
+
+static void flush_buffer(AVIOContext *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->error) {
+ int ret = 0;
+ if (s->write_data_type)
+ ret = s->write_data_type(s->opaque, s->buffer,
+ s->buf_ptr - s->buffer,
+ s->current_type,
+ s->last_time);
+ else if (s->write_packet)
+ ret = s->write_packet(s->opaque, s->buffer,
+ s->buf_ptr - s->buffer);
+ if (ret < 0) {
+ s->error = ret;
+ }
+ }
+ if (s->current_type == AVIO_DATA_MARKER_SYNC_POINT ||
+ s->current_type == AVIO_DATA_MARKER_BOUNDARY_POINT) {
+ s->current_type = AVIO_DATA_MARKER_UNKNOWN;
+ }
+ s->last_time = AV_NOPTS_VALUE;
+ 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)
+void avio_w8(AVIOContext *s, int b)
{
- *(s->buf_ptr)++ = b;
- if (s->buf_ptr >= s->buf_end)
+ *s->buf_ptr++ = b;
+ if (s->buf_ptr >= s->buf_end)
flush_buffer(s);
}
-void put_buffer(ByteIOContext *s, const unsigned char *buf, int size)
+void ffio_fill(AVIOContext *s, int b, int count)
{
- int len;
+ while (count > 0) {
+ int len = FFMIN(s->buf_end - s->buf_ptr, count);
+ memset(s->buf_ptr, b, len);
+ s->buf_ptr += len;
+
+ if (s->buf_ptr >= s->buf_end)
+ flush_buffer(s);
+ count -= len;
+ }
+}
+
+void avio_write(AVIOContext *s, const unsigned char *buf, int size)
+{
while (size > 0) {
- len = (s->buf_end - s->buf_ptr);
- if (len > size)
- len = size;
+ int len = FFMIN(s->buf_end - s->buf_ptr, size);
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;
}
}
-void put_flush_packet(ByteIOContext *s)
+void avio_flush(AVIOContext *s)
{
flush_buffer(s);
s->must_flush = 0;
}
-offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
+int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
{
- offset_t offset1;
+ int64_t offset1;
+ int64_t pos;
+ int force = whence & AVSEEK_FORCE;
+ whence &= ~AVSEEK_FORCE;
+
+ if(!s)
+ return AVERROR(EINVAL);
+
+ pos = s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer));
if (whence != SEEK_CUR && whence != SEEK_SET)
- return -EINVAL;
-
- if (s->write_flag) {
- if (whence == SEEK_CUR) {
- offset1 = s->pos + (s->buf_ptr - s->buffer);
- if (offset == 0)
- return offset1;
- offset += offset1;
- }
- offset1 = offset - s->pos;
- 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;
- } else {
- if (!s->seek)
- return -EPIPE;
+ return AVERROR(EINVAL);
+
+ if (whence == SEEK_CUR) {
+ offset1 = pos + (s->buf_ptr - s->buffer);
+ if (offset == 0)
+ return offset1;
+ offset += offset1;
+ }
+ offset1 = offset - pos;
+ 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;
+ } else if ((!(s->seekable & AVIO_SEEKABLE_NORMAL) ||
+ offset1 <= s->buf_end + SHORT_SEEK_THRESHOLD - s->buffer) &&
+ !s->write_flag && offset1 >= 0 &&
+ (whence != SEEK_END || force)) {
+ while(s->pos < offset && !s->eof_reached)
+ fill_buffer(s);
+ if (s->eof_reached)
+ return AVERROR_EOF;
+ s->buf_ptr = s->buf_end + offset - s->pos;
+ } else {
+ int64_t res;
+
+ if (s->write_flag) {
flush_buffer(s);
s->must_flush = 1;
- s->buf_ptr = s->buffer;
- s->seek(s->opaque, offset, SEEK_SET);
- s->pos = offset;
- }
- } else {
- if (whence == SEEK_CUR) {
- offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
- if (offset == 0)
- return offset1;
- offset += offset1;
}
- offset1 = offset - (s->pos - (s->buf_end - s->buffer));
- if (offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
- /* can do the seek inside the buffer */
- s->buf_ptr = s->buffer + offset1;
- } else {
- if (!s->seek)
- return -EPIPE;
- s->buf_ptr = s->buffer;
+ if (!s->seek)
+ return AVERROR(EPIPE);
+ if ((res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
+ return res;
+ if (!s->write_flag)
s->buf_end = s->buffer;
- s->seek(s->opaque, offset, SEEK_SET);
- s->pos = offset;
- }
- s->eof_reached = 0;
+ s->buf_ptr = s->buffer;
+ s->pos = offset;
}
+ s->eof_reached = 0;
return offset;
}
-void url_fskip(ByteIOContext *s, offset_t offset)
+int64_t avio_size(AVIOContext *s)
{
- url_fseek(s, offset, SEEK_CUR);
+ int64_t size;
+
+ if (!s)
+ return AVERROR(EINVAL);
+
+ if (!s->seek)
+ return AVERROR(ENOSYS);
+ size = s->seek(s->opaque, 0, AVSEEK_SIZE);
+ if (size < 0) {
+ if ((size = s->seek(s->opaque, -1, SEEK_END)) < 0)
+ return size;
+ size++;
+ s->seek(s->opaque, s->pos, SEEK_SET);
+ }
+ return size;
}
-offset_t url_ftell(ByteIOContext *s)
+void avio_wl32(AVIOContext *s, unsigned int val)
{
- return url_fseek(s, 0, SEEK_CUR);
+ avio_w8(s, val);
+ avio_w8(s, val >> 8);
+ avio_w8(s, val >> 16);
+ avio_w8(s, val >> 24);
}
-int url_feof(ByteIOContext *s)
+void avio_wb32(AVIOContext *s, unsigned int val)
{
- return s->eof_reached;
+ avio_w8(s, val >> 24);
+ avio_w8(s, val >> 16);
+ avio_w8(s, val >> 8);
+ avio_w8(s, val);
}
-void put_le32(ByteIOContext *s, unsigned int val)
+int avio_put_str(AVIOContext *s, const char *str)
{
- put_byte(s, val);
- put_byte(s, val >> 8);
- put_byte(s, val >> 16);
- put_byte(s, val >> 24);
+ int len = 1;
+ if (str) {
+ len += strlen(str);
+ avio_write(s, (const unsigned char *) str, len);
+ } else
+ avio_w8(s, 0);
+ return len;
}
-void put_be32(ByteIOContext *s, unsigned int val)
+#define PUT_STR16(type, write) \
+ int avio_put_str16 ## type(AVIOContext * s, const char *str) \
+ { \
+ const uint8_t *q = str; \
+ int ret = 0; \
+ \
+ while (*q) { \
+ uint32_t ch; \
+ uint16_t tmp; \
+ \
+ GET_UTF8(ch, *q++, break; ) \
+ PUT_UTF16(ch, tmp, write(s, tmp); ret += 2; ) \
+ } \
+ write(s, 0); \
+ ret += 2; \
+ return ret; \
+ }
+
+PUT_STR16(le, avio_wl16)
+PUT_STR16(be, avio_wb16)
+
+#undef PUT_STR16
+
+int ff_get_v_length(uint64_t val)
{
- put_byte(s, val >> 24);
- put_byte(s, val >> 16);
- put_byte(s, val >> 8);
- put_byte(s, val);
+ int i = 1;
+
+ while (val >>= 7)
+ i++;
+
+ return i;
}
-/* IEEE format is assumed */
-void put_be64_double(ByteIOContext *s, double val)
+void ff_put_v(AVIOContext *bc, uint64_t val)
{
- union {
- double d;
- UINT64 ull;
- } u;
- u.d = val;
- put_be64(s, u.ull);
+ int i = ff_get_v_length(val);
+
+ while (--i > 0)
+ avio_w8(bc, 128 | (val >> (7 * i)));
+
+ avio_w8(bc, val & 127);
}
-void put_strz(ByteIOContext *s, const char *str)
+void avio_wl64(AVIOContext *s, uint64_t val)
{
- if (str)
- put_buffer(s, (const unsigned char *) str, strlen(str) + 1);
- else
- put_byte(s, 0);
+ avio_wl32(s, (uint32_t)(val & 0xffffffff));
+ avio_wl32(s, (uint32_t)(val >> 32));
+}
+
+void avio_wb64(AVIOContext *s, uint64_t val)
+{
+ avio_wb32(s, (uint32_t)(val >> 32));
+ avio_wb32(s, (uint32_t)(val & 0xffffffff));
}
-void put_le64(ByteIOContext *s, UINT64 val)
+void avio_wl16(AVIOContext *s, unsigned int val)
{
- put_le32(s, (UINT32)(val & 0xffffffff));
- put_le32(s, (UINT32)(val >> 32));
+ avio_w8(s, val);
+ avio_w8(s, val >> 8);
}
-void put_be64(ByteIOContext *s, UINT64 val)
+void avio_wb16(AVIOContext *s, unsigned int val)
{
- put_be32(s, (UINT32)(val >> 32));
- put_be32(s, (UINT32)(val & 0xffffffff));
+ avio_w8(s, val >> 8);
+ avio_w8(s, val);
}
-void put_le16(ByteIOContext *s, unsigned int val)
+void avio_wl24(AVIOContext *s, unsigned int val)
{
- put_byte(s, val);
- put_byte(s, val >> 8);
+ avio_wl16(s, val & 0xffff);
+ avio_w8(s, val >> 16);
}
-void put_be16(ByteIOContext *s, unsigned int val)
+void avio_wb24(AVIOContext *s, unsigned int val)
{
- put_byte(s, val >> 8);
- put_byte(s, val);
+ avio_wb16(s, val >> 8);
+ avio_w8(s, val);
}
-void put_tag(ByteIOContext *s, const char *tag)
+void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType type)
{
- while (*tag) {
- put_byte(s, *tag++);
+ if (!s->write_data_type)
+ return;
+ // If ignoring boundary points, just treat it as unknown
+ if (type == AVIO_DATA_MARKER_BOUNDARY_POINT && s->ignore_boundary_point)
+ type = AVIO_DATA_MARKER_UNKNOWN;
+ // Avoid unnecessary flushes if we are already in non-header/trailer
+ // data and setting the type to unknown
+ if (type == AVIO_DATA_MARKER_UNKNOWN &&
+ (s->current_type != AVIO_DATA_MARKER_HEADER &&
+ s->current_type != AVIO_DATA_MARKER_TRAILER))
+ return;
+
+ switch (type) {
+ case AVIO_DATA_MARKER_HEADER:
+ case AVIO_DATA_MARKER_TRAILER:
+ // For header/trailer, ignore a new marker of the same type;
+ // consecutive header/trailer markers can be merged.
+ if (type == s->current_type)
+ return;
+ break;
}
+
+ // If we've reached here, we have a new, noteworthy marker.
+ // Flush the previous data and mark the start of the new data.
+ avio_flush(s);
+ s->current_type = type;
+ s->last_time = time;
}
/* Input stream */
-static void fill_buffer(ByteIOContext *s)
+static void fill_buffer(AVIOContext *s)
{
- int len;
+ uint8_t *dst = !s->max_packet_size &&
+ s->buf_end - s->buffer < s->buffer_size ?
+ s->buf_end : s->buffer;
+ int len = s->buffer_size - (dst - s->buffer);
+ int max_buffer_size = s->max_packet_size ?
+ s->max_packet_size : IO_BUFFER_SIZE;
+
+ /* can't fill the buffer without read_packet, just set EOF if appropriate */
+ if (!s->read_packet && s->buf_ptr >= s->buf_end)
+ s->eof_reached = 1;
/* no need to do anything if EOF already reached */
if (s->eof_reached)
return;
- len = s->read_packet(s->opaque, s->buffer, s->buffer_size);
+
+ if (s->update_checksum && dst == s->buffer) {
+ 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;
+ }
+
+ /* make buffer smaller in case it ended up large after probing */
+ if (s->buffer_size > max_buffer_size) {
+ ffio_set_buf_size(s, max_buffer_size);
+
+ s->checksum_ptr = dst = s->buffer;
+ len = s->buffer_size;
+ }
+
+ if (s->read_packet)
+ len = s->read_packet(s->opaque, dst, len);
+ else
+ len = 0;
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;
- s->buf_end = s->buffer + len;
+ s->buf_ptr = dst;
+ s->buf_end = dst + len;
}
}
-/* NOTE: return 0 if EOF, so you cannot use it if EOF handling is
- necessary */
-/* XXX: put an inline version */
-int get_byte(ByteIOContext *s)
+unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf,
+ unsigned int len)
{
- if (s->buf_ptr < s->buf_end) {
- return *s->buf_ptr++;
- } else {
- fill_buffer(s);
- if (s->buf_ptr < s->buf_end)
- return *s->buf_ptr++;
- else
- return 0;
+ return av_crc(av_crc_get_table(AV_CRC_32_IEEE), checksum, buf, len);
+}
+
+unsigned long ff_crcA001_update(unsigned long checksum, const uint8_t *buf,
+ unsigned int len)
+{
+ return av_crc(av_crc_get_table(AV_CRC_16_ANSI_LE), checksum, buf, len);
+}
+
+unsigned long ffio_get_checksum(AVIOContext *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 ffio_init_checksum(AVIOContext *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 URL_EOF (-1) if EOF */
-int url_fgetc(ByteIOContext *s)
+/* XXX: put an inline version */
+int avio_r8(AVIOContext *s)
{
- if (s->buf_ptr < s->buf_end) {
- return *s->buf_ptr++;
- } else {
+ if (s->buf_ptr >= s->buf_end)
fill_buffer(s);
- if (s->buf_ptr < s->buf_end)
- return *s->buf_ptr++;
- else
- return URL_EOF;
- }
+ if (s->buf_ptr < s->buf_end)
+ return *s->buf_ptr++;
+ return 0;
}
-int get_buffer(ByteIOContext *s, unsigned char *buf, int size)
+int avio_read(AVIOContext *s, unsigned char *buf, int size)
{
int len, size1;
len = s->buf_end - s->buf_ptr;
if (len > size)
len = size;
- if (len == 0) {
- fill_buffer(s);
- len = s->buf_end - s->buf_ptr;
- if (len == 0)
- break;
+ if (len == 0 || s->write_flag) {
+ if(size > s->buffer_size && !s->update_checksum){
+ if(s->read_packet)
+ 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;
size -= len;
}
}
+ if (size1 == size) {
+ if (s->error) return s->error;
+ if (s->eof_reached) return AVERROR_EOF;
+ }
return size1 - size;
}
-unsigned int get_le16(ByteIOContext *s)
+int ffio_read_size(AVIOContext *s, unsigned char *buf, int size)
+{
+ int ret = avio_read(s, buf, size);
+ if (ret != size)
+ return AVERROR_INVALIDDATA;
+ return ret;
+}
+
+int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data)
+{
+ if (s->buf_end - s->buf_ptr >= size && !s->write_flag) {
+ *data = s->buf_ptr;
+ s->buf_ptr += size;
+ return size;
+ } else {
+ *data = buf;
+ return avio_read(s, buf, size);
+ }
+}
+
+int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size)
+{
+ int len;
+
+ if (size < 0)
+ return -1;
+
+ if (s->read_packet && s->write_flag) {
+ len = s->read_packet(s->opaque, buf, size);
+ if (len > 0)
+ s->pos += len;
+ return len;
+ }
+
+ len = s->buf_end - s->buf_ptr;
+ if (len == 0) {
+ /* Reset the buf_end pointer to the start of the buffer, to make sure
+ * the fill_buffer call tries to read as much data as fits into the
+ * full buffer, instead of just what space is left after buf_end.
+ * This avoids returning partial packets at the end of the buffer,
+ * for packet based inputs.
+ */
+ s->buf_end = s->buf_ptr = s->buffer;
+ 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;
+ if (!len) {
+ if (s->error) return s->error;
+ if (s->eof_reached) return AVERROR_EOF;
+ }
+ return len;
+}
+
+unsigned int avio_rl16(AVIOContext *s)
{
unsigned int val;
- val = get_byte(s);
- val |= get_byte(s) << 8;
+ val = avio_r8(s);
+ val |= avio_r8(s) << 8;
return val;
}
-unsigned int get_le32(ByteIOContext *s)
+unsigned int avio_rl24(AVIOContext *s)
{
unsigned int val;
- val = get_byte(s);
- val |= get_byte(s) << 8;
- val |= get_byte(s) << 16;
- val |= get_byte(s) << 24;
+ val = avio_rl16(s);
+ val |= avio_r8(s) << 16;
return val;
}
-UINT64 get_le64(ByteIOContext *s)
+unsigned int avio_rl32(AVIOContext *s)
{
- UINT64 val;
- val = (UINT64)get_le32(s);
- val |= (UINT64)get_le32(s) << 32;
+ unsigned int val;
+ val = avio_rl16(s);
+ val |= avio_rl16(s) << 16;
return val;
}
-unsigned int get_be16(ByteIOContext *s)
+uint64_t avio_rl64(AVIOContext *s)
{
- unsigned int val;
- val = get_byte(s) << 8;
- val |= get_byte(s);
+ uint64_t val;
+ val = (uint64_t)avio_rl32(s);
+ val |= (uint64_t)avio_rl32(s) << 32;
return val;
}
-unsigned int get_be32(ByteIOContext *s)
+unsigned int avio_rb16(AVIOContext *s)
{
unsigned int val;
- val = get_byte(s) << 24;
- val |= get_byte(s) << 16;
- val |= get_byte(s) << 8;
- val |= get_byte(s);
+ val = avio_r8(s) << 8;
+ val |= avio_r8(s);
return val;
}
-double get_be64_double(ByteIOContext *s)
+unsigned int avio_rb24(AVIOContext *s)
{
- union {
- double d;
- UINT64 ull;
- } u;
-
- u.ull = get_be64(s);
- return u.d;
+ unsigned int val;
+ val = avio_rb16(s) << 8;
+ val |= avio_r8(s);
+ return val;
+}
+unsigned int avio_rb32(AVIOContext *s)
+{
+ unsigned int val;
+ val = avio_rb16(s) << 16;
+ val |= avio_rb16(s);
+ return val;
}
-char *get_strz(ByteIOContext *s, char *buf, int maxlen)
+int ff_get_line(AVIOContext *s, char *buf, int maxlen)
{
int i = 0;
char c;
- while ((c = get_byte(s))) {
- if (i < maxlen-1)
+ do {
+ c = avio_r8(s);
+ if (c && i < maxlen-1)
buf[i++] = c;
- }
-
- buf[i] = 0; /* Ensure null terminated, but may be truncated */
+ } while (c != '\n' && c);
+
+ buf[i] = 0;
+ return i;
+}
- return buf;
+int avio_get_str(AVIOContext *s, int maxlen, char *buf, int buflen)
+{
+ int i;
+
+ if (buflen <= 0)
+ return AVERROR(EINVAL);
+ // reserve 1 byte for terminating 0
+ buflen = FFMIN(buflen - 1, maxlen);
+ for (i = 0; i < buflen; i++)
+ if (!(buf[i] = avio_r8(s)))
+ return i + 1;
+ buf[i] = 0;
+ for (; i < maxlen; i++)
+ if (!avio_r8(s))
+ return i + 1;
+ return maxlen;
}
-UINT64 get_be64(ByteIOContext *s)
+#define GET_STR16(type, read) \
+ int avio_get_str16 ##type(AVIOContext *pb, int maxlen, char *buf, int buflen)\
+{\
+ char* q = buf;\
+ int ret = 0;\
+ if (buflen <= 0) \
+ return AVERROR(EINVAL); \
+ while (ret + 1 < maxlen) {\
+ uint8_t tmp;\
+ uint32_t ch;\
+ GET_UTF16(ch, (ret += 2) <= maxlen ? read(pb) : 0, break;)\
+ if (!ch)\
+ break;\
+ PUT_UTF8(ch, tmp, if (q - buf < buflen - 1) *q++ = tmp;)\
+ }\
+ *q = 0;\
+ return ret;\
+}\
+
+GET_STR16(le, avio_rl16)
+GET_STR16(be, avio_rb16)
+
+#undef GET_STR16
+
+uint64_t avio_rb64(AVIOContext *s)
{
- UINT64 val;
- val = (UINT64)get_be32(s) << 32;
- val |= (UINT64)get_be32(s);
+ uint64_t val;
+ val = (uint64_t)avio_rb32(s) << 32;
+ val |= (uint64_t)avio_rb32(s);
return val;
}
-/* link with avio functions */
+uint64_t ffio_read_varlen(AVIOContext *bc){
+ uint64_t val = 0;
+ int tmp;
+
+ do{
+ tmp = avio_r8(bc);
+ val= (val<<7) + (tmp&127);
+ }while(tmp&128);
+ return val;
+}
-void url_write_packet(void *opaque, UINT8 *buf, int buf_size)
+static int io_read_packet(void *opaque, uint8_t *buf, int buf_size)
{
- URLContext *h = opaque;
- url_write(h, buf, buf_size);
+ AVIOInternal *internal = opaque;
+ return ffurl_read(internal->h, buf, buf_size);
}
-int url_read_packet(void *opaque, UINT8 *buf, int buf_size)
+static int io_write_packet(void *opaque, uint8_t *buf, int buf_size)
{
- URLContext *h = opaque;
- return url_read(h, buf, buf_size);
+ AVIOInternal *internal = opaque;
+ return ffurl_write(internal->h, buf, buf_size);
}
-int url_seek_packet(void *opaque, INT64 offset, int whence)
+static int64_t io_seek(void *opaque, int64_t offset, int whence)
{
- URLContext *h = opaque;
- url_seek(h, offset, whence);
- return 0;
+ AVIOInternal *internal = opaque;
+ return ffurl_seek(internal->h, offset, whence);
+}
+
+static int io_read_pause(void *opaque, int pause)
+{
+ AVIOInternal *internal = opaque;
+ if (!internal->h->prot->url_read_pause)
+ return AVERROR(ENOSYS);
+ return internal->h->prot->url_read_pause(internal->h, pause);
}
-int url_fdopen(ByteIOContext *s, URLContext *h)
+static int64_t io_read_seek(void *opaque, int stream_index, int64_t timestamp, int flags)
{
- UINT8 *buffer;
+ AVIOInternal *internal = opaque;
+ if (!internal->h->prot->url_read_seek)
+ return AVERROR(ENOSYS);
+ return internal->h->prot->url_read_seek(internal->h, stream_index, timestamp, flags);
+}
+
+int ffio_fdopen(AVIOContext **s, URLContext *h)
+{
+ AVIOInternal *internal = NULL;
+ uint8_t *buffer = NULL;
int buffer_size, max_packet_size;
-
- max_packet_size = url_get_max_packet_size(h);
+ max_packet_size = h->max_packet_size;
if (max_packet_size) {
buffer_size = max_packet_size; /* no need to bufferize more than one packet */
} else {
}
buffer = av_malloc(buffer_size);
if (!buffer)
- return -ENOMEM;
+ return AVERROR(ENOMEM);
+
+ internal = av_mallocz(sizeof(*internal));
+ if (!internal)
+ goto fail;
+
+ internal->class = &io_priv_class;
+ internal->h = h;
+
+ av_opt_set_defaults(internal);
+
+ *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE,
+ internal, io_read_packet, io_write_packet, io_seek);
+ if (!*s)
+ goto fail;
+
+ (*s)->seekable = h->is_streamed ? 0 : AVIO_SEEKABLE_NORMAL;
+ (*s)->max_packet_size = max_packet_size;
+ if(h->prot) {
+ (*s)->read_pause = io_read_pause;
+ (*s)->read_seek = io_read_seek;
- if (init_put_byte(s, buffer, buffer_size,
- (h->flags & URL_WRONLY) != 0, h,
- url_read_packet, url_write_packet, url_seek_packet) < 0) {
- av_free(buffer);
- return -EIO;
+ if (h->prot->url_read_seek)
+ (*s)->seekable |= AVIO_SEEKABLE_TIME;
}
- s->is_streamed = h->is_streamed;
- s->max_packet_size = max_packet_size;
+ (*s)->av_class = &ff_avio_class;
return 0;
+fail:
+ if (internal)
+ av_opt_free(internal);
+ av_freep(&internal);
+ av_freep(&buffer);
+ return AVERROR(ENOMEM);
}
-/* XXX: must be called before any I/O */
-int url_setbufsize(ByteIOContext *s, int buf_size)
+int ffio_set_buf_size(AVIOContext *s, int buf_size)
{
- UINT8 *buffer;
+ uint8_t *buffer;
buffer = av_malloc(buf_size);
if (!buffer)
- return -ENOMEM;
+ return AVERROR(ENOMEM);
av_free(s->buffer);
s->buffer = buffer;
s->buffer_size = buf_size;
s->buf_ptr = buffer;
- if (!s->write_flag)
- s->buf_end = buffer;
- else
- s->buf_end = buffer + buf_size;
+ url_resetbuf(s, s->write_flag ? AVIO_FLAG_WRITE : AVIO_FLAG_READ);
+ return 0;
+}
+
+static int url_resetbuf(AVIOContext *s, int flags)
+{
+ assert(flags == AVIO_FLAG_WRITE || flags == AVIO_FLAG_READ);
+
+ if (flags & AVIO_FLAG_WRITE) {
+ s->buf_end = s->buffer + s->buffer_size;
+ s->write_flag = 1;
+ } else {
+ s->buf_end = s->buffer;
+ s->write_flag = 0;
+ }
+ return 0;
+}
+
+int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size)
+{
+ int64_t buffer_start;
+ int buffer_size;
+ int overlap, new_size, alloc_size;
+
+ if (s->write_flag)
+ return AVERROR(EINVAL);
+
+ buffer_size = s->buf_end - s->buffer;
+
+ /* the buffers must touch or overlap */
+ if ((buffer_start = s->pos - buffer_size) > buf_size)
+ return AVERROR(EINVAL);
+
+ overlap = buf_size - buffer_start;
+ new_size = buf_size + buffer_size - overlap;
+
+ alloc_size = FFMAX(s->buffer_size, new_size);
+ if (alloc_size > buf_size)
+ if (!(buf = av_realloc(buf, alloc_size)))
+ return AVERROR(ENOMEM);
+
+ if (new_size > buf_size) {
+ memcpy(buf + buf_size, s->buffer + overlap, buffer_size - overlap);
+ buf_size = new_size;
+ }
+
+ av_free(s->buffer);
+ s->buf_ptr = s->buffer = buf;
+ s->buffer_size = alloc_size;
+ s->pos = buf_size;
+ s->buf_end = s->buf_ptr + buf_size;
+ s->eof_reached = 0;
+ s->must_flush = 0;
+
return 0;
}
-/* NOTE: when opened as read/write, the buffers are only used for
- reading */
-int url_fopen(ByteIOContext *s, const char *filename, int flags)
+int avio_open(AVIOContext **s, const char *filename, int flags)
{
+ return avio_open2(s, filename, flags, NULL, NULL);
+}
+
+int avio_open2(AVIOContext **s, const char *filename, int flags,
+ const AVIOInterruptCB *int_cb, AVDictionary **options)
+{
+ AVIOInternal *internal;
+ const URLProtocol **protocols;
+ char *proto_whitelist = NULL, *proto_blacklist = NULL;
+ AVDictionaryEntry *e;
URLContext *h;
int err;
- err = url_open(&h, filename, flags);
- if (err < 0)
+ if (options) {
+ e = av_dict_get(*options, "protocol_whitelist", NULL, 0);
+ if (e)
+ proto_whitelist = e->value;
+ e = av_dict_get(*options, "protocol_blacklist", NULL, 0);
+ if (e)
+ proto_blacklist = e->value;
+ }
+
+ protocols = ffurl_get_protocols(proto_whitelist, proto_blacklist);
+ if (!protocols)
+ return AVERROR(ENOMEM);
+
+ err = ffurl_open(&h, filename, flags, int_cb, options, protocols, NULL);
+ if (err < 0) {
+ av_freep(&protocols);
return err;
- err = url_fdopen(s, h);
+ }
+
+ err = ffio_fdopen(s, h);
if (err < 0) {
- url_close(h);
+ ffurl_close(h);
+ av_freep(&protocols);
return err;
}
+
+ internal = (*s)->opaque;
+ internal->protocols = protocols;
+
+ if (options) {
+ err = av_opt_set_dict(internal, options);
+ if (err < 0) {
+ avio_closep(s);
+ return err;
+ }
+ }
+
return 0;
}
-int url_fclose(ByteIOContext *s)
+int avio_close(AVIOContext *s)
{
- URLContext *h = s->opaque;
-
- av_free(s->buffer);
- memset(s, 0, sizeof(ByteIOContext));
- return url_close(h);
+ AVIOInternal *internal;
+ URLContext *h;
+
+ if (!s)
+ return 0;
+
+ avio_flush(s);
+ internal = s->opaque;
+ h = internal->h;
+
+ av_opt_free(internal);
+
+ av_freep(&internal->protocols);
+ av_freep(&s->opaque);
+ av_freep(&s->buffer);
+ av_free(s);
+ return ffurl_close(h);
}
-URLContext *url_fileno(ByteIOContext *s)
+int avio_closep(AVIOContext **s)
{
- return s->opaque;
+ int ret = avio_close(*s);
+ *s = NULL;
+ return ret;
}
-/* XXX: currently size is limited */
-int url_fprintf(ByteIOContext *s, const char *fmt, ...)
+int avio_printf(AVIOContext *s, const char *fmt, ...)
{
va_list ap;
char buf[4096];
va_start(ap, fmt);
ret = vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
- put_buffer(s, buf, strlen(buf));
+ avio_write(s, buf, strlen(buf));
return ret;
}
-/* note: unlike fgets, the EOL character is not returned and a whole
- line is parsed. return NULL if first char read was EOF */
-char *url_fgets(ByteIOContext *s, char *buf, int buf_size)
-{
- int c;
- char *q;
-
- c = url_fgetc(s);
- if (c == EOF)
- return NULL;
- q = buf;
- for(;;) {
- if (c == EOF || c == '\n')
- break;
- if ((q - buf) < buf_size - 1)
- *q++ = c;
- c = url_fgetc(s);
- }
- if (buf_size > 0)
- *q = '\0';
- 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
- */
-int url_fget_max_packet_size(ByteIOContext *s)
-{
- return s->max_packet_size;
-}
-
-/* buffer handling */
-int url_open_buf(ByteIOContext *s, UINT8 *buf, int buf_size, int flags)
+int avio_pause(AVIOContext *s, int pause)
{
- return init_put_byte(s, buf, buf_size,
- (flags & URL_WRONLY) != 0, NULL, NULL, NULL, NULL);
+ if (!s->read_pause)
+ return AVERROR(ENOSYS);
+ return s->read_pause(s->opaque, pause);
}
-/* return the written or read size */
-int url_close_buf(ByteIOContext *s)
+int64_t avio_seek_time(AVIOContext *s, int stream_index,
+ int64_t timestamp, int flags)
{
- put_flush_packet(s);
- return s->buf_ptr - s->buffer;
+ int64_t ret;
+ if (!s->read_seek)
+ return AVERROR(ENOSYS);
+ ret = s->read_seek(s->opaque, stream_index, timestamp, flags);
+ if (ret >= 0) {
+ int64_t pos;
+ s->buf_ptr = s->buf_end; // Flush buffer
+ pos = s->seek(s->opaque, 0, SEEK_CUR);
+ if (pos >= 0)
+ s->pos = pos;
+ else if (pos != AVERROR(ENOSYS))
+ ret = pos;
+ }
+ return ret;
}
/* output in a dynamic buffer */
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;
-
+ unsigned new_size, new_allocated_size;
+
/* 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;
+ int err;
+ if ((err = av_reallocp(&d->buffer, new_allocated_size)) < 0) {
+ d->allocated_size = 0;
+ d->size = 0;
+ return err;
+ }
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);
+ AV_WB32(buf1, buf_size);
+ 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 int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence)
{
DynBuffer *d = opaque;
return 0;
}
-static int url_open_dyn_buf_internal(ByteIOContext *s, int max_packet_size)
+static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size)
{
DynBuffer *d;
- int io_buffer_size, ret;
-
- if (max_packet_size)
- io_buffer_size = max_packet_size;
- else
- io_buffer_size = 1024;
-
- d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
- if (!d)
+ unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024;
+
+ if (sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
return -1;
+ d = av_mallocz(sizeof(DynBuffer) + io_buffer_size);
+ if (!d)
+ return AVERROR(ENOMEM);
d->io_buffer_size = io_buffer_size;
- d->buffer = NULL;
- 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,
- max_packet_size ? NULL : dyn_buf_seek);
- if (ret == 0) {
- s->max_packet_size = max_packet_size;
+ *s = avio_alloc_context(d->io_buffer, d->io_buffer_size, 1, d, NULL,
+ max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
+ max_packet_size ? NULL : dyn_buf_seek);
+ if(!*s) {
+ av_free(d);
+ return AVERROR(ENOMEM);
}
- return ret;
+ (*s)->max_packet_size = max_packet_size;
+ return 0;
}
-/*
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int url_open_dyn_buf(ByteIOContext *s)
+int avio_open_dyn_buf(AVIOContext **s)
{
return url_open_dyn_buf_internal(s, 0);
}
-/*
- * 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)
- * @return zero if no error.
- */
-int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size)
+int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size)
{
if (max_packet_size <= 0)
return -1;
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().
- * @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 avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
{
- DynBuffer *d = s->opaque;
+ DynBuffer *d;
int size;
+ static const char padbuf[AV_INPUT_BUFFER_PADDING_SIZE] = {0};
+ int padding = 0;
+
+ if (!s) {
+ *pbuffer = NULL;
+ return 0;
+ }
+
+ /* don't attempt to pad fixed-size packet buffers */
+ if (!s->max_packet_size) {
+ avio_write(s, padbuf, sizeof(padbuf));
+ padding = AV_INPUT_BUFFER_PADDING_SIZE;
+ }
- put_flush_packet(s);
+ avio_flush(s);
+ d = s->opaque;
*pbuffer = d->buffer;
size = d->size;
av_free(d);
+ av_free(s);
+ return size - padding;
+}
+
+void ffio_free_dyn_buf(AVIOContext **s)
+{
+ uint8_t *tmp;
+ if (!*s)
+ return;
+ avio_close_dyn_buf(*s, &tmp);
+ av_free(tmp);
+ *s = NULL;
+}
+
+static int null_buf_write(void *opaque, uint8_t *buf, int buf_size)
+{
+ DynBuffer *d = opaque;
+
+ d->pos += buf_size;
+ if (d->pos > d->size)
+ d->size = d->pos;
+ return buf_size;
+}
+
+int ffio_open_null_buf(AVIOContext **s)
+{
+ int ret = url_open_dyn_buf_internal(s, 0);
+ if (ret >= 0) {
+ AVIOContext *pb = *s;
+ pb->write_packet = null_buf_write;
+ }
+ return ret;
+}
+
+int ffio_close_null_buf(AVIOContext *s)
+{
+ DynBuffer *d = s->opaque;
+ int size;
+
+ avio_flush(s);
+
+ size = d->size;
+ av_free(d);
+ av_free(s);
return size;
}
projects / ffmpeg / blobdiff