From patchwork Tue May 14 20:02:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 48881 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1184148pzb; Tue, 14 May 2024 13:02:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULiJo1q0hBGQiaR4Hq/Iz2mpHKG8auTyerqK1WbhwCwIW3AFkhl/XoSRPwNAD5hPx8R2uVnwOL9AacI1Fpu9P1yiF1eMFHD9tigg== X-Google-Smtp-Source: AGHT+IEOrvofseWcLgbxZcu0b0kl4JBp9U6dPzi1sYRMLOwO1QIMqT7bLFQdZ4Z1MGjkWzp7p1eN X-Received: by 2002:a50:9b41:0:b0:572:a123:5ed0 with SMTP id 4fb4d7f45d1cf-5734d5cccf3mr9361208a12.21.1715716965790; Tue, 14 May 2024 13:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715716965; cv=none; d=google.com; s=arc-20160816; b=CSuAqCr4PIKcwoZcFyAorcxkPzZBemg7nftR0EqPiiKmA8B53wiw9ZPavnd5ghG4wn X6dk9a9+KSPiSWzFTzTHn9xsnc1EFYUBSazvdHFOk+HumL4OAuRGFzs0aItx547o4F5M j1kP3qoDxW85ijVqp9VPnHFBgpIThQjWv8IkaDDT2JoY4gQTQT6zFRMSjkraYqvd7Dwq Mh0r9nDjuX2PdmWJmUUkwcC6skuUi1Q5iH7iLmKR2DIgFRrLQIbyoO8n4G5z4SNQq+A7 TQAlwkMHl3i0h6JSrWJUtV52ojGusLyx6SCXbI4CnbiIvmsf0mcICEOBPQk2NsaDwmCx MV9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=4c7xwjOMKc/yxQYN6k+++Ppu/Rdbhuh82BVGVnQRCk4=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=xIimBQo/sIfAL7jKpoPszFrYobWv4FcLnJUUvoUnSvNVoif7VH3/h120vEtvybYySS i2DKIKoACQ9THD7VK8su7yU5SYlAbLr1KHq0mR5F5CpT1clKtwJYv/unwQBsO6do/0kr 5ppwwxCBj8dIEU8V31rCr4xVF95Bmav+pb+QhOttZGzsmAouj1OqtwQC+2cBeDvrzkBC avKTxgn6HUKoxD9K+YVJhYnm3s+NkHkzgnq0gKchfg0QJEVmcVsHtu3ewlwFkwgq4qTg mbLXgc7E0k7NSaN+L36x2A4J9pGXSjxL4Kyq7H42mELS5oc+38aWVDowmB+DmuLgcBz9 rO8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5733c36e85esi6434417a12.573.2024.05.14.13.02.43; Tue, 14 May 2024 13:02:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92B8668D747; Tue, 14 May 2024 23:02:41 +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 AB9AF68CEC8 for ; Tue, 14 May 2024 23:02:34 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 6DD71EA6CE; Tue, 14 May 2024 22:02:34 +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 XZMiolGJJP2z; Tue, 14 May 2024 22:02:32 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1368EEA63E; Tue, 14 May 2024 22:02:32 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2024 22:02:24 +0200 Message-Id: <20240514200226.4320-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mp3dec: only call ffio_ensure_seekback once X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Jp43JFCUAyq/ Otherwise the subsequent ffio_ensure_seekback calls destroy the buffer of the earlier. The worst case ~66kB seekback is so small it is easier to request it entirely. Fixes ticket #10837, a regression since 0d17f5228f4d3854066ec1001f69c7d1714b0df9. Signed-off-by: Marton Balint --- libavformat/mp3dec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index ec6cf567bc..78d6c8c71c 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -32,6 +32,7 @@ #include "replaygain.h" #include "libavcodec/codec_id.h" +#include "libavcodec/mpegaudio.h" #include "libavcodec/mpegaudiodecheader.h" #define XING_FLAG_FRAMES 0x01 @@ -400,15 +401,16 @@ static int mp3_read_header(AVFormatContext *s) if (ret < 0) return ret; + ret = ffio_ensure_seekback(s->pb, 64 * 1024 + MPA_MAX_CODED_FRAME_SIZE + 4); + if (ret < 0) + return ret; + off = avio_tell(s->pb); for (i = 0; i < 64 * 1024; i++) { uint32_t header, header2; int frame_size; - if (!(i&1023)) - ffio_ensure_seekback(s->pb, i + 1024 + 4); frame_size = check(s->pb, off + i, &header); if (frame_size > 0) { - ffio_ensure_seekback(s->pb, i + 1024 + frame_size + 4); ret = check(s->pb, off + i + frame_size, &header2); if (ret >= 0 && (header & MP3_MASK) == (header2 & MP3_MASK))