From patchwork Sat Mar 23 02:06:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47360 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp286194pzb; Fri, 22 Mar 2024 19:08:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnwGOffTehA1IfSw/B0b5LZUayvO2j1PJyqrvqLwbAm0bi79ttfh8gFPaTgBKoqp6b3dX6JzSGlC16dvA+P/ZtzQhY+J9ptfCeZw== X-Google-Smtp-Source: AGHT+IHGoxgTdOKIHeIf9qU19iEDB10C31qWvxQcDAe244b1hZxG3uBFFP72F5tDgGbyptK7WjIb X-Received: by 2002:a17:906:1318:b0:a46:ad7c:50ad with SMTP id w24-20020a170906131800b00a46ad7c50admr799635ejb.3.1711159698501; Fri, 22 Mar 2024 19:08:18 -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 hh9-20020a170906a94900b00a46bd891b68si376823ejb.587.2024.03.22.19.08.18; Fri, 22 Mar 2024 19:08:18 -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=UwagemCC; 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 A16D068D5EE; Sat, 23 Mar 2024 04:07:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2090.outbound.protection.outlook.com [40.92.73.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94BB168D5DE for ; Sat, 23 Mar 2024 04:06:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jQF9oP29QNRe/N3vhYn8JLEDfeprCV3TJDKftTAg0ax8AqjSyegMGzlBR+WcG+R1PgJQbP/1wM3yhIKtgt6J76oslFkchS3l2xB5G01Yeq4xW4DYJSDXnNg+13OIz48Xb76MOWDxrswThqqX9Z6Zuac5Tco/ejnJz926F+WGj46v5zysvdac1uru26Pj7wa7JOKmBVNWVZdwuGk2Vn5p2w/V0EXOsLPeZJn2gwtd0K15CUZkMjFdKBF8Kv0rdzY37Mta9i5vG61mR2V9Bp/VJiimlqSQborZs7f6OOZRkMTeFgnOMANWU44gbVctxFLxOfwKJKW+Ln02Rlj05u6lfQ== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HM+1wN2Lm1acLPf5zAwp47upF4Xw0/BcxabH0OJuZQs=; b=fzF6ZqG4kVjXjSnQKt7+hqPRZz+EWvYfQSwNYCqb6VkD+xjh0fycmrHb+iNa8B4X08TE8dyCGAGG0NVCKnVS5r8xfgHfOdI2flhD5QoJBOrped4JGwg86H6wz6tuEZir3rcvQvsNWtejOir34kCcWMr42flv648Ffm3BbG/e3+Ps7mdaHr/C6wYLZD4z1+ifwO4hfliWoJ/nh9STqM5U7IxG0OjTRz91pRAcxBsx0GqxS/7O6ZIX+NeVf6PdppN3XA6UMG48En6IOT7QveGMb3BoBV1VYAm+xPCYksANQFSj0lIfuqcOwuC3pFHHbcLVKDjhMlRlF6KMJ+afoU/d+A== 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=HM+1wN2Lm1acLPf5zAwp47upF4Xw0/BcxabH0OJuZQs=; b=UwagemCCKlkQbnc2NV1JKoug+D5MauCKz8qgahtDLFeSvVIzsmZXXhIWbv3eZdp2gZua1t0shjKexs2O0/ZbnR2T7TGVwKJWbUl/pf06hLLCuPIBY+EHQzY6rkpQYSi8mDIAyEW3aRShq2Jo0PfES8auhUjHaHQOvaW4Rxg4V7W88AS1wu+MRPJLVQQIRJGQD2Vks6j0Uh/OhzGf7LkFUnzSl86Xvtsg4ixpIRVF4SIiYTaMZ6A5BQNgGp//sVZV7VjwqB2w/F/K8n1quizmifwMVfBqtzi51y4oHqfPWz2hnbfO7wA0w3h1tU3BzysAa5HLj1kQ4DMhXFsrxwKfmA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:15 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [LkPib0MDLpj0fqSguYKqGGMK/hWtPzybLjpMOGazV0M=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 69e3dc33-630e-429d-e55a-08dc4adddf4e X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBMjzDtAlr46x5HKEJiZ0RbaTHljGk6gnKx6nr+Wf4gqxqJQvYQlzrAetjOqU7Xs5hvm6HaKblt0tpxSbq9tRvzDKlz5KKRHVqpXkMMZEiDLX+MEKZlKdpEXOR20wVcQ6wScp3uFEIBlff9qL8ZpiNijabaA594Sksba2iZgRNmPkCh1Nbv8G732KH3EWmqpHYZn/SSwnjzWAyQBcZoiPicALGScD/I45RkTnowfqZvZbycfRm9MgFg6poPpTRcIVDC10Z+u9Ujy0z3Lhy0gVXmXaYX7nIA2n+7IQVzP1b9t9EUaFvx9BnA/3E+N9ByodiON5W7ZdcyJ0TFQJhHvB/zvLRQH4JvB4ez7pjx0M1l9pd1PzAg2lIW/reVPvfUeHT+rgDW+nXYMnNIp549zX58pH1FMDqEvvGSmu6r1QseLkf5RZCi9TXTV8oOxetpTdPMGkkmY3ddG4r5ILLWd5iqg/YC6wgck2UZsCgBdAFFa0CbSrfDfmEEwISh/i+5bjRX+xJiWCjk0raBw8jw5WF35JpCS/L3cmPgSn0rn6GkX1M5tP2wzobWszeNmLOrb733O93y9WEy+SxgWbDzttMMzVxfJq6rD3cGqeAVRTcJhRfL6zWviJKy/B0dk7NWsGrgu84b6Wm4rlfwkd45KXkT9mtmcyAQqtxt0QW4Gg/rCgWpK36mhk8/qZay1OQ2r/akHmSb/YPzc5FU8ZjUpBhcRrxrYADFc52Vc6+hVuVpVQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wez7h+L96Q3x8ngku7c5ZbKsFHfgHT8rBQ+5kEC55vkRBbIZgG/TZJaDaqkk0vdVdYs4roNasS73v04W394VOlLwnlXJJ/FCoISmz0ycyMSnll2QWqI28Gu8UD15S2bihYSPP1qLakEcJLmug04kwbCcelzIqh3EocaFitnCh2R9uTWzA3/J4l+fmf/KYKqeYSpg/YSMdQ1W0NbKZMcSkL2xL2BAYNWe+Uiw3el3dp7Kn5kiCSSETvGJUjbTj8KT3h8xXPRJvbx2qrg1h8X9KBsTqJuZcCT/fY1M+2IzvuyQ21j5v/oimYknjsxEkKbqjLbInvXk6Ry3Q8Yrwy6GebycJCW9328mkJok/U2whowKxSmtXRVSuWqKAoKYM2IOf6XCuEG5cHUv/mXQiA2g4US8XX0jCA+xxtZs4z9T9CI+p9K7Qr4MHBb42ql73ZYpNB3ZExe1EHdtQpo91B9DiSbqpVcQP+WRPOyRFv2l5iA+P8pzQ8fM1ZFeRTThNMzjK6ziAjhT54K7nkd/Qp4pIVo2PM7s/F121b1yPUlAIH8S5v5PTGjbDZsSgAqedrYN9etNBX0K6exx99Wch5zOGkVN3DL7hhPAWtyG6XYrLtlJoAkmu5fxavDivOltwcBL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e4STioAFIeHAVxNBpScJsh9u+ztv4r8RqfXe03QV7BXzefMQBc21FtrxzThpMJg9jYwdsgat8rNFOaX25V3RZhFZ28lebs6Qgwl2xSuwDbnwBnlx4lnDaVA5cdBhcy5/BtvgbAWhAwUBnYoUUtbhJivpKboOCa+YAUA3bxFKPhKdZELVVAX36DNtCZodfBgdzYa1PTpVRTGDa71cCUgtD2NSNwYGrvMIC83rZSBIPZ7149Vl6wdifXLx3UkfGhFH/Eyji2iWJeCBBRrMJ5Xxoo0dhtV3/k8NGIW8Yvne/5990wk/yDpIq8qpdQT4bTySncOaubOMacyUbvAyQdR9IdHeb2uoGrijHEN8SNBj2Kj09vVfjw+kKTDN+VEeeHTaXGvslGHwioks+OtlJhHlRgRILDV/PzakTGWstB3nqVWH93e101umumgYMWNDHTlF5mO/X1jelXfEHturNNSiPcAtZ2twlwa1WEBDzVALUuxpMu9Ejcoy9Y/aGci8++LrmJe6oRPej0i5M6z8nGzZ5tj3DxCeT0Id+5LJZq7hsSgtdWQZiwYXc07DeO73Gl9/tfMfiKS1CqMbIvhbF95VwC/+CA/sBeDNNJOWiep/ABZ+tSVoj3ziDAqaVV3d0fhuDYk5Lq7ERHkqrlsrOwb4Z8ngL1kf7Nai9vJI95iceH0eZqC/WS7MIJijh1MID5l/xo8srM9j/0t2Bxyuu2+sUckaIeF/sy8nO8AnCYUyTEHQABTsRqIDwTbfAMmGKmpgDDSFCOWpeRY7YBI3WqTp/lQHLFgMDtk/9w0iph2v9m8wGFIPF8lLWjugEyIIq1UEs33Y9nkEIEALdQzWytv/lnJajPbtsyK3u4hHUybRhVoE8q+NoC1ORSwXxX5KYdsMlBbpedXJy4esXq/94FE9XqGSTrDeBF0pjTBloXaSEhRqUtKpGyrLUIYlKWqqL0bchkqm81blAgyn8AnHvZgn0zK+CJoIP7baApZ2bVCv0fyogbnWkyJp1tLIvdD8lwZbL1KPL2eGBzKwwCMxA2kCW/bYc36ZcvX2i+hJ5AgSqkHr0xkE3XWKTd6VKZzLSWjyXE/Gsd2qIDhGJi1zJczEi/WdY5hhwqQIBJ0W+6hOfpmJEYzoM59VNnd9uCS5hDtMjk8dSSMePFt02uPafifoPyvYLag00e8BuVp/intk6acsZM/1udC1TMxC8SkSiJb1OxC5XKBgXkAxRS5f0eJsvmRaLCLb0E4wjWfQWITTpsBz68oBVLAkLDq7X8lJJTL1FhmePjfyOk1SL1pLqKUukQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69e3dc33-630e-429d-e55a-08dc4adddf4e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:37.7096 (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: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 07/15] avformat/avr: Combine skips 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: VkFiUxQwyJWz Signed-off-by: Andreas Rheinhardt --- libavformat/avr.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavformat/avr.c b/libavformat/avr.c index 12286c04d4..261edef4b5 100644 --- a/libavformat/avr.c +++ b/libavformat/avr.c @@ -49,8 +49,7 @@ static int avr_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - avio_skip(s->pb, 4); // magic - avio_skip(s->pb, 8); // sample_name + avio_skip(s->pb, 4 /* magic */ + 8 /* sample_name */); chan = avio_rb16(s->pb); if (!chan) { @@ -66,18 +65,13 @@ static int avr_read_header(AVFormatContext *s) sign = avio_rb16(s->pb); - avio_skip(s->pb, 2); // loop - avio_skip(s->pb, 2); // midi - avio_skip(s->pb, 1); // replay speed + avio_skip(s->pb, 2 /* loop */ + 2 /* midi */ + 1 /* replay speed */); st->codecpar->sample_rate = avio_rb24(s->pb); if (st->codecpar->sample_rate == 0) return AVERROR_INVALIDDATA; - avio_skip(s->pb, 4 * 3); - avio_skip(s->pb, 2 * 3); - avio_skip(s->pb, 20); - avio_skip(s->pb, 64); + avio_skip(s->pb, 4 * 3 + 2 * 3 + 20 + 64); st->codecpar->codec_id = ff_get_pcm_codec_id(bps, 0, 1, sign); if (st->codecpar->codec_id == AV_CODEC_ID_NONE) {