From patchwork Wed Sep 16 20:54:14 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: 22448 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 EE4CD449D4F for ; Wed, 16 Sep 2020 23:54:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB2DF68B9DD; Wed, 16 Sep 2020 23:54:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A52FE68B970 for ; Wed, 16 Sep 2020 23:54:30 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k15so8259572wrn.10 for ; Wed, 16 Sep 2020 13:54:30 -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=XZ40SHBeuPxmw/Yqbzlw7AYoR04OXDMwo+eVsmwVgNA=; b=N3+IdSnH5uaLm0drDwDb5Kb2lW4qmaCOVjWCgvfq3OfRHShjIO1s8Ydkxv9jr25bRe nSHSkLNrGd/Afe+Pixtjx5lawW/V7lI80DyFi0gWkrgC/yXQCLJHZYT4485viL2NMcKh drbh62rz4axCUyssZSYEzi+pLQ92oKSta9S24J8YH86kJRlrb28JMtnjNB2dTOQcyTuD zoetibPy9nN0I/z18Qlv7pr8k3/Wy5p+yLaoeIkB9JNrX4s8O0YQNNfRVSPOef8OHy7o 6ibTcjNTIohqG9fHEG59inmlxOd3QlmBuR1jiwmTbY/1z1O6rINPwnxDclMV8AZT3KNi LmHQ== 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=XZ40SHBeuPxmw/Yqbzlw7AYoR04OXDMwo+eVsmwVgNA=; b=hNoodVWPNCI+OosOSV9il0RZJDfsFyKBXMJX8PM0e14Qu3Fg1AbQjLmyl7Hk7Umk5e CIGzVo0YPIbr7TAeMNH1D5iGbHjsHW60aGbi64UorMwi6HDRHIOiZZxLmeIiPMHGfb7Q yyawLiUvz4N+STEYaKPV2Flx91ixKIXyAm+KNyhwJ6Eba0QJ7xQmnu67XpCFw+QRBuQ1 yAQM65gX249990k9UoFN3DNUpox7OBYh31pEjDqF5f7by6nl82vDB8vPd9/cZDPKKXHd cdgsGgh9MkFrLLTd3LaRmCMwJlj3YOdwniTSDA2KrggVNvLZrUm6lUzKxvRnA4gZnSQX u7TA== X-Gm-Message-State: AOAM533lHFfkAPAgiKjMlUaqhxFuQ1vKfSJSUiOU3LmpU/hXWfyTk2Oz k/O0ZcW0CEfCJ1GHc8ZuGz0Ta6yniSh8Jw== X-Google-Smtp-Source: ABdhPJxdIueWNsHQ/4qFFtl90IZPitxk9bqyHBlPiDqRVzHq7IHovq3VqnTYPZmB+tRnNKw57YEWJA== X-Received: by 2002:adf:f5c1:: with SMTP id k1mr30972446wrp.271.1600289669823; Wed, 16 Sep 2020 13:54:29 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id b18sm36359543wrn.21.2020.09.16.13.54.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 13:54:29 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 22:54:14 +0200 Message-Id: <20200916205414.1095-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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index a77517d712..9dfef2377e 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -999,10 +999,10 @@ 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; + buf_size += s->buf_end - s->buf_ptr + max_buffer_size; + av_assert0(!s->write_flag); buffer = av_malloc(buf_size);