From patchwork Wed Sep 16 19:21:18 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: 22445 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 5D56C44A3D3 for ; Wed, 16 Sep 2020 22:22:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 419E068B9C6; Wed, 16 Sep 2020 22:22:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BED8768B859 for ; Wed, 16 Sep 2020 22:22:11 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id z1so8075265wrt.3 for ; Wed, 16 Sep 2020 12:22:11 -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=Np4rvLuwqRuM5IdbH/et1XkrI88NkfjJ0vSyhohlLAU=; b=bRlzzmbIn/8uIjBaIs4wbI+rwFXldXwAqPh1+8dRt8Xa3fMhOrvyQ/7Vuol5MmDjsF Kz+x1aOLSib3OVo/Ed5U1TbCmeTMKct2sjKyb7sB7Nic7EvRyN1zLz+ZbrhpkLV5H5HX gi7UBS2Ltoae4Z/0vL9iYi5fTPkLEjreMcpM+IHAK60unrATMP8YDxtZ+6Uu0Fx+vHov MQcwzNcr5MtENNRiOXDpd+nKemjAtWSZlo7N+SlkxCVsMLiXKSdJvPryLxC96LmpVoGj pkguTiEmNtSQvODhaEegLy2CcxcjAC4eQoeCXFPwbTcX7X8jadVOH+ze4nWUYVN0X/ve FIwQ== 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=Np4rvLuwqRuM5IdbH/et1XkrI88NkfjJ0vSyhohlLAU=; b=NxmXhU6n5KrOfrFmDafTcL8RSe2SVAbPUkhI67HC+0oImZOTnUmxJcx6jV7eW8eNza +3aXNZyJ19horZermYcla+ofrMuDHinNIPAEUj1VBY/Bm3KV2PkqpujegfNoKq0g6vfz ZQtO5SzZNPPqyCuqYGyyiBOuOoAa30nW3oFPIb1Mmkjx4AZo9ykhtYI55llSlN2TM4DN 8ZewKROjp1DJ5SCr86eAtZJhhCo/40i5QDO9npORvwibxNhkTZl+D5JzquXe7ZHeZbRm CwwZlQby3cKi/kYHJqocNMstyVci414ftyMi2r+pOx8l0wFZ/pf6EAxgrfXDVpxuC22v n5SA== X-Gm-Message-State: AOAM530MIhyIRVrqtnjge2r9DWmtqPxvViMnaWjTnTBE6OaF5Vwr+zNY JzplptcbATqjZwc2yPsNHnp/3GRED3zdrw== X-Google-Smtp-Source: ABdhPJw3TI/aLKKUM2UuZ5aQAMhSAIe/0eRo/L51Smb2g4XqL9/xo8sTW6pf7u+5vFERp37A9MVuZQ== X-Received: by 2002:adf:dd44:: with SMTP id u4mr27168036wrm.22.1600284130927; Wed, 16 Sep 2020 12:22:10 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id w7sm35035203wrm.92.2020.09.16.12.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 12:22:10 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 21:21:18 +0200 Message-Id: <20200916192118.22135-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/aviobuf: fix broken logic 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 | 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;