From patchwork Wed Dec 19 12:33:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Lebedev X-Patchwork-Id: 11471 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 D22F944DA55 for ; Wed, 19 Dec 2018 14:33:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F056368AA67; Wed, 19 Dec 2018 14:33:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0013268AA1D for ; Wed, 19 Dec 2018 14:33:48 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id t9-v6so17244065ljh.6 for ; Wed, 19 Dec 2018 04:33:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=eycp+ara2rgaGO+WadI7jFr9DeFI9DCH9Bagvewo89g=; b=QoRLwcEAOHbBFTVMkE6AZMIdb/5Lv3VqvqHLZce3wnozli9DKrvOrFRapsBOjD/hUY SHttw3usYkNOa8Uk9DeipTlk8XWqIeJWor0ubG7srBXtS+3ZNWVyjLewvsU5boGDY7WP 07UPZa0RHHpLoJfLnhMwHszJtAAlexLjJuRSmawxx7JvF4IPzbKLaPvSyefiFES/eAik bubmPKmV6zhZjQS4VSn26Gcw8DjaFgqj76OeYd3ssI+Ir+eYR0OZ3eYmShMReSbr4N4A JIwCQ8lnKtt3Sqa5WvW46YLJ9nbYnsgyGuN9c7EkfnsD5WrVvurLvS6/rzORY1DFJDi7 HN0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=eycp+ara2rgaGO+WadI7jFr9DeFI9DCH9Bagvewo89g=; b=NIbXs3YRgsHgqDAUk3dI79s9oyG9VUQkkzBm+gi02989nK55msZBcAIEX7kEkwAOMD ci9OMod/G5U2Rc7+CLe5x94cWitcz+YHHHMHTzjKxyvsM6TbpzlPSu+6aRBwVKGIxKuP DWuJOjfv7jr3gQjLtXhkcaxaPUu4Ik4Axef3fQNhANrBmxlqk5gwdmO1qDLozpWp5bcj jQaJJcOfLgMA6n0rlLeB1mwI1PFjvD2oJjSl/clfzXaoVKMNI51kazCBywV3xu+hqj9S HFOrpMrnB5RGi9S1EiQ+nruvRkQOZzPNsZf9X6OP3KMQD417kQ5aa+pI78sximYpGcNo 49Og== X-Gm-Message-State: AA+aEWashpI9XMjHcBhFjdOiijDfAM5ORIndzy2fSIRYH2No3RoEIUQf xranYXQ0e6z9RKha9ii3MWLj/6zO X-Google-Smtp-Source: AFSGD/XslArVeIsHZ60h9pgFv7tN9OPHJyZzH0hquXlK7KZkV6uLVELY00jBRB0YY2afR+gLT5fUOA== X-Received: by 2002:a2e:2416:: with SMTP id k22-v6mr13826687ljk.80.1545222830278; Wed, 19 Dec 2018 04:33:50 -0800 (PST) Received: from [192.168.88.15] ([91.90.230.146]) by smtp.googlemail.com with ESMTPSA id e94sm3839418lfi.23.2018.12.19.04.33.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 04:33:49 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Artyom Lebedev Message-ID: <4b41ad6b-6ae9-8eac-af89-87d02edf1b2f@gmail.com> Date: Wed, 19 Dec 2018 14:33:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 Content-Language: ru-RU Subject: [FFmpeg-devel] [PATCH] Fix unnecessary buffer reallocotion 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It was reallocated even if the exisiting buffer is larger than needed one, thus unnecessary shrinking it. From 2b8cea72a69abe6564367fb2149be936d2ffb916 Mon Sep 17 00:00:00 2001 From: Artyom Lebedev Date: Wed, 19 Dec 2018 11:49:22 +0200 Subject: [PATCH] Fix unnecessary buffer reallocotion in ffio_ensure_seekback(). To: ffmpeg-devel@ffmpeg.org --- libavformat/aviobuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 5a33f82..b867fdd 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1063,6 +1063,9 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) return 0; av_assert0(!s->write_flag); + if (s->buffer_size >= buf_size) + return 0; + buffer = av_malloc(buf_size); if (!buffer) return AVERROR(ENOMEM); -- 2.7.4