From patchwork Thu Sep 9 15:57:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp648364iov; Thu, 9 Sep 2021 08:58:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbenxHCzUbd0Sev/QsOV/H3pbEEP1K3uSB4S6FW1qeRpsly0J8GGqsXnptr5MJz6AcCzDK X-Received: by 2002:a17:906:4fd6:: with SMTP id i22mr4204337ejw.92.1631203087824; Thu, 09 Sep 2021 08:58:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l14si2276601edr.27.2021.09.09.08.58.07; Thu, 09 Sep 2021 08:58:07 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=HoSYc1Vd; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 692F168A98D; Thu, 9 Sep 2021 18:58:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065087.outbound.protection.outlook.com [40.92.65.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1A7A687EBB for ; Thu, 9 Sep 2021 18:57:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0kVtmDMz0nc3qGbu2zqJKXUEJjd5JgfdjeT3/hoaqv6hShFKspRGqDyVbalNPrpBdeqdwndMVyvIIcejX7OIxGMXJ1oJUtctMbBHgdaZo9+9r1Q+1ZkbJtJ5R/E8MPSWwDjMV6oWj2bbkziv3m2ny3y1I/rJjcrkJsw0OIJtX81OiqP39o7d7sJShSoxYPr8rIlQvJ3CsfEW3dKch2yvb/b2F9ovkD43K+FDayV8rdyHcPynyF6rcAb7nGwKsf5eCQH8egTVr2Et/OKIAYju8CWXUkinGt1zyOHTnQtjlmoJ4GYv/4GW4j1ypjQrHQfQlCKjZHQ5nrCPAS0INuB8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=j3RdeHHqNG3NWZ9PeI2McX8ep28t4QvioyvpjwYmgr0=; b=DpY5w8VaxSCIYKUoEhUNLiLtNBWCSkckquApxb64mD+o9nAqUMsN15HqOe22lj5h6ngCERrqGnHpv30y8YiS5maBEQteinM2jGmjdNEpRi2/n2DE2tLfBA3+VmQz9qqz9Q5lCEgJHy9qnHW961bBsB4lyqfr6p3IKuyv7FJC+QvNozPxHBFv5VSciMLEcxyIxaId0YP8+1zfmKHw2pRW8argeZWQ5LJHYbiDoFkFIulWBkIrBI4v/dTfVScqxqY5Zarjo/gK02SxZRf3aN2hdUWZ1YaNT5locDmSHJVPsZ0s9qEhVteBc6aw8Cp3j+bxlhNwlsgjQsHS2WJ+eRzmtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j3RdeHHqNG3NWZ9PeI2McX8ep28t4QvioyvpjwYmgr0=; b=HoSYc1VdGm036f0+r/6vgx3lUwrlcSpk0hD2qg14zKEJg5zKLm6pvIQpSKJ6v6d5uAzbWoFoUwbM3iB+SfZMaHgLh4k5BzZReLNTWvlU14zCfmpKfi+C5EgDsrQlZ5WwGcLvfvNMgeqqMUyWdoPE0qJ3dj5Rzzr8D1LauHkEBgZBVhMsG++uYU5ju4VtJkD81kOvRvAP9bt88AGEGs5ko2BnreQFysK8za0zLELkE2+tHr8mFtZtfG11ORHNo5TrpWR8vXdOQIk+3R1x6je8rI9uU3j/UQr/lBfGmO+iTOORedibt7DmCG4K+moEvXoPl7E03201al+407So5KtRBg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7039.eurprd03.prod.outlook.com (2603:10a6:102:ef::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Thu, 9 Sep 2021 15:57:56 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 15:57:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Sep 2021 17:57:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1ygMiQuIeHGTsNORb8i0g539t2IbOvvN] X-ClientProxiedBy: AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210909155747.1841422-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 15:57:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: adfa10b5-2e3f-49aa-5362-08d973aa96ac X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wok19LiHRQJwUjXseAn0bFx1v+YUssy3vwcQRgJ/7DRXGaWd8wpOH+4nwzI7SwuP+HWbv9AW+fHTZF2iGgld/Z+olQndfmfzV/FIwDwF/xesTgP01TGMM58lVHgDsZ5WKylJs973hGGjAmJQEP7sqc1519eTBssDzTjoyz2tDpRVq0fopWgDvbWUw6SQie+LFEMAkRRQuVdWyWH9qrZXKCHR+QH+sm9wZtYf7hCAxAi53p1SFavJAOuPTekdcd8M8RXPQQ2+7St9IOb8q3GXtTVZq/BVDZmBLHBTMDMqFk1WYdEgYAfX6vaE8LLz5Z//Uxp019k0ijOJxfGoMJ/xYxdPJzHip4Zdnp9xa6hLqjDcL6GLqgO9zrQwZaxrFVIcKbatZknocxp4tKRK/mds4tbUO8kva4DaTmgX5uVKIUL06YBIEx7Ys+16C/0VbcbCBf321AJnELDtVev8f8CAWUNAk4ia29uj5RiRQzu/GuxyrGj9QBEU5wnhjdvcQH9jKImpsAmP6DVeLUB9hBapGkZq8CDXfYcA8/uNIbNsTi6g8jVX788ACJUjHWMIKUa+FfS4dHXx5dx+Eeh6O8ktYROgdBC3VxeVUVy1+H+45rllvGej/J/oB0TGdseud5XpRYDtbS/DveWRVZZYisjgJmKpLYfXIdmELxlHen1NKrHDRbKwq3yPyKxq7XynF0jNAvBIH0EL+uLOmFLTQHAV3ZVkUPbW6VPKBJq+6WAeEy1Df3pLRjZTy8NJ7ACsCidh+Oo= X-MS-TrafficTypeDiagnostic: PA4PR03MB7039: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qS+WLLFGEBfOY5fuk9NBOuxwPycXvUNyqJWsvjNffyzalow4bPtoJ8gOjE7ab76+e4jsJgZudFg+1yr2aJ5TUW3Tm/8/FfOGbZ9HVgczoZ42wX5YunNpwEKOO/DcAgF7IYqCymNO5hauLoqiDeGAVbTOgsC33S5YWcrHRmW22t4reh0/Az9C0OQTFvaotqtcdVe9vlhcyIu9YRmvVMYdCvC/JDjCB4AHSh5Wqnk+Pwjo2ME0TFzTdR265wojpQUt7rS/LuYcQLuFYe/hgymJeV24Bk5NMP4TXKfuhaGI3MoqjR+NL4rzhrITtrD+vgNw8kpI7rRXe6hQCDUzRz5UQTXFvY6gsYYwUE+IYGYtt8yvC0xc9KbXuexZZ8mECCnoHdITYCyIdFX3Zd6wm8eCCCoF4ShP2mxtEnxkFWr9zlJslBsBLeNyR6r99ul2UMzl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3eLu49kihsVLiSfUPgvPWqrKKkpGa81nOp564tuRhPlKQejYkpQy4YL6K5i4eoXXl2P1IH9psgznnRrw6QXDv9hQ/XrTHp6eus8VXFJcVyEvzd5vTqmx6xDwh/I+07/Ovp36DAKGqpE+MxhZo1ABRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: adfa10b5-2e3f-49aa-5362-08d973aa96ac X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 15:57:56.1436 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB7039 Subject: [FFmpeg-devel] [PATCH 02/14] avformat/mp3dec: Avoid calling avio_tell() multiple times 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V6XQiKligMXW Signed-off-by: Andreas Rheinhardt --- libavformat/mp3dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 195d89814e..9205abebc4 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -171,7 +171,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, MP3DecContext *mp3 = s->priv_data; static const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; uint64_t fsize = avio_size(s->pb); - fsize = fsize >= avio_tell(s->pb) ? fsize - avio_tell(s->pb) : 0; + int64_t pos = avio_tell(s->pb); + fsize = fsize >= pos ? fsize - pos : 0; /* Check for Xing / Info tag */ avio_skip(s->pb, xing_offtbl[c->lsf == 1][c->nb_channels == 1]); @@ -430,9 +431,10 @@ static int mp3_read_header(AVFormatContext *s) return ret; } + off = avio_tell(s->pb); // the seek index is relative to the end of the xing vbr headers for (i = 0; i < st->internal->nb_index_entries; i++) - st->internal->index_entries[i].pos += avio_tell(s->pb); + st->internal->index_entries[i].pos += off; /* the parameters will be extracted from the compressed bitstream */ return 0;