From 496c645d3b3bb5ded7f5ce918ca21d3acac6b8df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Sat, 24 Jul 2010 09:04:44 +0000 Subject: [PATCH] Never shrink the ByteIOContext buffer in ff_rewind_with_probe_data If there is little unread data in the ByteIOContext buffer, this may lead to reducing the size of the ByteIOContext buffer to little more the probe data size. This can lead to suboptimal aviobuf behaviour, e.g. making some demuxers fail to do short seeks backwards (if the input isn't seekable). Originally committed as revision 24478 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/aviobuf.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 5841966..941691a 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -667,7 +667,7 @@ int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size { int64_t buffer_start; int buffer_size; - int overlap, new_size; + int overlap, new_size, alloc_size; if (s->write_flag) return AVERROR(EINVAL); @@ -681,17 +681,20 @@ int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size overlap = buf_size - buffer_start; new_size = buf_size + buffer_size - overlap; - if (new_size > buf_size) { - if (!(buf = av_realloc(buf, new_size))) + 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->pos = s->buffer_size = buf_size; + 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; -- 2.7.4