From patchwork Tue Sep 29 21:10:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 22665 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E41FE449925 for ; Wed, 30 Sep 2020 00:10:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C932268B5EE; Wed, 30 Sep 2020 00:10:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86A5C68B5C8 for ; Wed, 30 Sep 2020 00:10:43 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 56557E4333; Tue, 29 Sep 2020 23:10:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P3q8zJBguWti; Tue, 29 Sep 2020 23:10:41 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5B889E45E4; Tue, 29 Sep 2020 23:10:41 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 Sep 2020 23:10:19 +0200 Message-Id: <20200929211021.25030-7-cus@passwd.hu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200929211021.25030-1-cus@passwd.hu> References: <20200929211021.25030-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avformat/aviobuf: do not allocate a new buffer in ffio_ensure_seekback if not needed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Let's move unread data to the start of the old buffer instead. Signed-off-by: Marton Balint --- libavformat/aviobuf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 75ddf52efc..2f1abe7d81 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1015,7 +1015,10 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) return 0; av_assert0(!s->write_flag); - buf_size = FFMAX(buf_size, s->buffer_size); + if (buf_size <= s->buffer_size) { + update_checksum(s); + memmove(s->buffer, s->buf_ptr, filled); + } else { buffer = av_malloc(buf_size); if (!buffer) return AVERROR(ENOMEM); @@ -1024,6 +1027,7 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) av_free(s->buffer); s->buffer = buffer; s->buffer_size = buf_size; + } s->buf_ptr = s->buffer; s->buf_end = s->buffer + filled; s->checksum_ptr = s->buffer;