From patchwork Sun Sep 20 08:52:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 22523 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 CDFA344AA75 for ; Sun, 20 Sep 2020 11:53:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A819968B74D; Sun, 20 Sep 2020 11:53:08 +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 D868868B67D for ; Sun, 20 Sep 2020 11:53:00 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id BE671E4705; Sun, 20 Sep 2020 10:53:00 +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 uQiks6V2IPlj; Sun, 20 Sep 2020 10:52:59 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 3B547E4709; Sun, 20 Sep 2020 10:52:59 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Sep 2020 10:52:53 +0200 Message-Id: <20200920085253.7107-3-cus@passwd.hu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200920085253.7107-1-cus@passwd.hu> References: <20200920085253.7107-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/aviobuf: increase default read buffer size to 2*max_buffer_size for streamed data 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" This should increase the effectiveness of ffio_ensure_seekback. Note: increasing buffer size to non-streamed or write buffer should also work, but they both cause fate failures... The reason for that should be checked. Signed-off-by: Marton Balint --- libavformat/aviobuf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index aa1d6c0830..13cad7f5f0 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -938,6 +938,11 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) } else { buffer_size = IO_BUFFER_SIZE; } + if (h->flags & AVIO_FLAG_READ && h->is_streamed) { + if (buffer_size > INT_MAX/2) + return AVERROR(EINVAL); + buffer_size *= 2; + } buffer = av_malloc(buffer_size); if (!buffer) return AVERROR(ENOMEM);