[FFmpeg-devel] [PATCH] avformat/aviobuf: fix broken logic in ffio_ensure_seekback()

Paul B Mahol onemda at gmail.com
Wed Sep 16 22:21:18 EEST 2020


This removes big CPU overhead for demuxing chained ogg streams.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavformat/aviobuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index a77517d712..c27d564602 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -999,7 +999,7 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
     int filled = s->buf_end - s->buffer;
     ptrdiff_t checksum_ptr_offset = s->checksum_ptr ? s->checksum_ptr - s->buffer : -1;
 
-    buf_size += s->buf_ptr - s->buffer + max_buffer_size;
+    buf_size += (s->buf_end - s->buf_ptr) + max_buffer_size;
 
     if (buf_size < filled || s->seekable || !s->read_packet)
         return 0;
-- 
2.17.1



More information about the ffmpeg-devel mailing list