From patchwork Wed Sep 16 19:37:45 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: 22446 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 44C8044B014 for ; Wed, 16 Sep 2020 22:38:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E19D68B989; Wed, 16 Sep 2020 22:38:04 +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 7D66D68B8AF for ; Wed, 16 Sep 2020 22:37:57 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id s12so8053620wrw.11 for ; Wed, 16 Sep 2020 12:37:57 -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=zWExZ6CjFyCXi+0/dWZuUcTUBkhhn4UnMaC22dp5kqY=; b=Nb3iTEDZdfm880h1SP+sVKYWyNWfe5ty8QwITnCbkrPPmYhS6NZ1mRuPb1/kjyNoia P6MaEe66Py06Ge2d5MNJhJgY7+rSZCoaksJcgxCg2pJMSk2q+2it6LoLT58fzxXrKQW3 av0sTLO5X+TeHtKJcYZdYkvwbMPEt67t9I9bVSWMTOLFVcZP91bSU9otCLeVApCIpdbZ USyKLlRXTbOUOsbNAz0sV8M/iJbMhN5rPi+UHZQpYWnLR1FysDm3C5v31BNDdU0YkzEm Bmu2rsfKtlpK9vdTwdKKHQNE5Qci4NTxGAIxo6ARhCAP5ZVgvJOs0fYN3YppY+dvtSJd HC8A== 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=zWExZ6CjFyCXi+0/dWZuUcTUBkhhn4UnMaC22dp5kqY=; b=JmMV9Tp/cwavbOPyIyTSy97irxiJ+d38p3R7ARuCX3nXYzPQ0Zw0RrQP8tteau0mxk nOZL6AlRnkOMn/ZOkHY63TVKvbDKDJsCa8F2ahIiCWPFR7RvpsfN0Tw7ZBtDZFbJ+WEN lzwRvnVduyrdP0QjERPigRaLOO4AC1Ovr9iJ6Wq29qsA6UK/UnK87GPRM8QljvhZ6RD1 TLXxLO6qRx/3yzTiqjIvvtfvVfnXy3vEPpUKDxIjkzkPbybxRGUtI7c6orRFmj84op6n /uQfFy+qNulmZphHoMe6Rgq/jnBoIRVFbnfsyg4guByyQFjMh6ODMqnnIpiQvUQYoBF+ UI1Q== X-Gm-Message-State: AOAM531caXaS44JgdLRsBa9vY6TZeBlTbVBPbizZFPPFZ/QaZTa1kBWd LXFuEGIurbjQZSB8pCEGB44n3xkhexCaaw== X-Google-Smtp-Source: ABdhPJxIiFJ7Vrkemwcinl6ZuPimkZx0lMUONMYBwhmLqcGlKLNd4gyc/qciLFVWWsZSHchDK8Jz1g== X-Received: by 2002:a5d:4152:: with SMTP id c18mr29923260wrq.277.1600285076642; Wed, 16 Sep 2020 12:37:56 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id h204sm7006045wmf.35.2020.09.16.12.37.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 12:37:56 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 21:37:45 +0200 Message-Id: <20200916193745.25188-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, 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index a77517d712..88cc0b4030 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -999,8 +999,6 @@ 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; - if (buf_size < filled || s->seekable || !s->read_packet) return 0; av_assert0(!s->write_flag);