From a0b7e289075dccf223b7f407790d8a86fc5d77e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 1 Jan 2013 22:57:36 +0200 Subject: [PATCH] aviobuf: Partial support for reading in read/write contexts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So far, aviocontexts are used either in pure-read or pure-write mode - full read/write mode doesn't work well (and implementing it is a much larger, not totally trivial change). This patch allows using avio_read and ffio_read_partial on read/write aviocontexts, where the read operations are passed through directly unbuffered, while writes are buffered as usual. This is enough to support the operations needed by packet based data transfer like in udp/rtp, where aviocontext is the only public API for hooking up custom IO. Signed-off-by: Martin Storsjö --- libavformat/aviobuf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 0da1e0579b..8f3e511fc4 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -452,7 +452,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) len = s->buf_end - s->buf_ptr; if (len > size) len = size; - if (len == 0) { + 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); @@ -497,6 +497,13 @@ int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size) 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) { fill_buffer(s);