From patchwork Tue Sep 15 11:35:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22417 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 1CC1444A34A for ; Tue, 15 Sep 2020 14:35:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E073D68BC48; Tue, 15 Sep 2020 14:35:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C3AF68BAD6 for ; Tue, 15 Sep 2020 14:35:34 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id j11so4616513ejk.0 for ; Tue, 15 Sep 2020 04:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=uiy1P2vmqctz42+UUGpmYzaBKxGnKbjEOD5feMpPTKo=; b=JJi/zUGOpOT1mqpTdAe7EGSfPgznpiKG7FywvEYH5PqxLT8jgYme2EvqHY2EKFoaIY SazVj9hGWD4XxWoUZe6TerSAc3uPHjyP45782SuTx/knAWatu776sqsBW0qYHTgRO+Ic phpwIzVjYvLuwKTqWI2O0/BXGTOZPk0NnBhGvzNX2uXE4Ia2HRsXWTAEDyJvnCko6XWZ vFsrCkZDaxDoBVtYT+INY2tD/VRRnNvTQ6XcWH9sx8bvwz6nRvKYeFailqi6yClOjRY2 cL6R8t35KAjHmsZOL9CHbzs2Xcf382KY7FLljro2WLmHErcEnYvZGI2IU1Fholcqx/Uj cCdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=uiy1P2vmqctz42+UUGpmYzaBKxGnKbjEOD5feMpPTKo=; b=aM8LrYRAjiRP/8HajE1tBzwJRfqHeQr2ymYm/iIycUzfwBQuY91jLl0HNTwJWN5cnd S4/gmi7600bLg/S07YNvv24+jn26vIyd8bKH6ec2Tk4oJQgJ1E310yu2IUCYqPyFgiqA 7hG3aqhvcZFGH5Ot0h7dI1ytmswhvALyUV4IKxrOJT4MFuQvOtwcHauj0Vl+BfHimFKD riJyIQmqEyjKxuF6cUciH4yVjkFAtf3oD5FC+q5H7bWIzyZ2uaU5vCwUe5nHhW6ybKmE lhqhzrF0MBsG9bpI2hwqffGJcRjLbpOh4+xTVA+dyltrGqnLgw2oxp4uysHjoyMLlZaj uSiQ== X-Gm-Message-State: AOAM531F0bGIK/ZRZey0fdSfcIvr6lhuDoRxCunIMAGVbkI9J6V+88u+ EkN3CRi2k/9xBB7Ai/nTVyNkF36+Wmomgw== X-Google-Smtp-Source: ABdhPJw5szQ0kDoUJ71xhVpSMHjVzgh2mb0Mf39zKio1tT6nLc7V+t0NzVkcszEHTAptdg1rNuFe/Q== X-Received: by 2002:a17:906:1f43:: with SMTP id d3mr18566725ejk.295.1600169733790; Tue, 15 Sep 2020 04:35:33 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id g90sm11992607edd.64.2020.09.15.04.35.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 04:35:33 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 13:35:25 +0200 Message-Id: <20200915113525.30806-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/aviobuf: realloc memory in ffio_ensure_seekback() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This removes big CPU overhead for demuxing chained ogg streams. Signed-off-by: Paul B Mahol --- libavformat/aviobuf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index a77517d712..6d01150f66 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1005,12 +1005,11 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) return 0; av_assert0(!s->write_flag); - buffer = av_malloc(buf_size); + buffer = s->buffer; + buffer = av_realloc(buffer, buf_size); if (!buffer) return AVERROR(ENOMEM); - memcpy(buffer, s->buffer, filled); - av_free(s->buffer); s->buf_ptr = buffer + (s->buf_ptr - s->buffer); s->buf_end = buffer + (s->buf_end - s->buffer); s->buffer = buffer;