From patchwork Sun Aug 28 21:19:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37529 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584766pzh; Sun, 28 Aug 2022 14:21:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR76zGG+ip+F5pJmhm4WzgvlsLaxiJuUQVPq8qea7pOBBMtcTlGvhg5Blxy4hMwQIAP4K/Ab X-Received: by 2002:a05:6402:b15:b0:447:ee8c:7ace with SMTP id bm21-20020a0564020b1500b00447ee8c7acemr9801944edb.306.1661721677961; Sun, 28 Aug 2022 14:21:17 -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 g4-20020aa7d1c4000000b004485081f004si1984495edp.598.2022.08.28.14.21.17; Sun, 28 Aug 2022 14:21:17 -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=MUiYyDUO; 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 E8F6468B9E4; Mon, 29 Aug 2022 00:20:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 499B668B9DB for ; Mon, 29 Aug 2022 00:20:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J9Vw6y7kDZ9zI0b6COGqulr6toWWlFnoGZWRbdkO6Ck1xE/tuX73ZLNOFa4RiAxIbi4veB/FjjWSMYwRHIm9KsS1HDhDMfN7he+IsARE+w1yHWUhoxH+xYpXLGmEwX6Vg4qUXeEZKHoHUFRUNGDQ0gN9sQ/0wcqaGCT7KTLefhyzvrE3OThkUCM7B5K4/0x0hxc4T+jRcIkqiEzC5ljUlYsyD2+OvVwd5ny92cC4o1I3XpIs69Y/ekPg0F+au2ZqKBK+U9zver0UFTdLbtIOCLzVVWAwVNIkICPPrpnUXhUQj0w+SbHrT8QqgXEsBASjKPDdBRqo2b3PAmQuT/CbMA== 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=+r5MxjUkdmrdzBeTmgBpnLJAlEcFa3Ld1wDIYoX2lzw=; b=LjsdLO3Cbl8CIQxAIDD6wMqjH6HDxyJ09mihy1cB6i82V0z6b+49sEqMZqt3TsxvLtiB3wvWiEhJzr1x0d39oxKxQpvOIZYb4Q5rItoYkcO5ZP9zOwoLldIOI9ybK4CAf4vqjuXbQldPBAqBU3g7/F7AKBwmhOWWYG3zlCVh5zc3mYulq8jwsc1NHnFBpeWqEhqpXXHef88hI8eEjH40y3okpz/gpwyZK4PgF3d95keXfrEfAqCiPsp0n29BFqWkMRPK24tNHH0LpP8+EC2Pe6QUyYsuI2Z1YiPz7o2u9Uu1PpVtEAGgKUS05E7fGGIJOV8mYSmaohkCQVF3FXPHMA== 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=+r5MxjUkdmrdzBeTmgBpnLJAlEcFa3Ld1wDIYoX2lzw=; b=MUiYyDUOHQoGhRMMuLQEVYVGxXvSWjI99hzfu2dhAVnJGhfXcDdaKs6w9Iv1Q3NL0sA/P5vLulxPj1z1JOUMyRjn3RLg2KmNMoevaIgbTE7aadihmKrnwr9YTh4iNiiWz90k6V9NBVuJ8/+DgAB0C7HN5dE1NBh2NBtRtBXY4Rto9nbTTQTpJReOFw7KXuzL/97ugD7qyyQFyb4tvSaekKVxuYa4v5ncjHlFJ+ya7B2gv444YNoLTFYt2zhVrdzC2gLv8yjVFtjeQKZLPwvUF5OufSTDie4mwDvzM2+D4580MowPkPS1D3X3nVdiL61wUQBqcwBZ2qMkdYIY5ENtWQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:20 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KB3ZnFiyoDfw0TvB9g/bnGuHxE8JU4Q1] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc4f4785-8342-40a6-c3ae-08da893b1cd1 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOdXi4Z5Cv6K4tTyYoOSaWjIuUnySRgLpADUwdj2jDQ8GbjbS00N3u5aWskJc6A6ZTPbGTl4+XDl6tfXc5qhU8q3w1ax0JuwrEmYnE7Qm9vbo/V4XU153N3I+Ht6qfmkXun/VhYY4pzYgK6feR5uPlt/IAmZhusVrgxn9EKDmX8NtCEgDuY/dT9g8B4QclhTB9wEs7Roj6MFiC0g05d9DQvD5s2M/6NqtFNS25lkewO72QsQ+LRk0BsKWtf5ZteKZkjZ//a3Way+ObDxacjwtFRjHoJkVisWLc2Zuye/X6G1ilNbQqRmY+E05srVgLHYtxWvI9o5A6FGsP2SxSfuXwE3HQqZK2orNbLyT6ch0oA+dX9a1E8rWvrCGkW2ZSM5N9Qvnu5JzMSliE+PyWUcERPHGr9Iz3I+Dz2SpqyfqLWZMBO1DHgBSadckAhsIIabaWsU7mWq9SvUMgUZxwz+uHV5gKviTBjXYZACqYOlOO7y73T7jwGM4KoEaG1AWKVKWp+jFE7K8vNf1RsMq2C/OWkhYF1IORCj46cM0tULaBecNxHRLaRSYAJOPotEcK+9VQlZxJtpNlcbSnS3LPAz6NiJJmjVjOsRLUNEK5vt+hSPQuMOIvR30jJZOHHHeIz74Tm+y3P3/y42JtKNnNMJJDhsXNRCCi/p1uxm7T1RGGIq5dt8CHdZbt6Nm4ZU+7NSlk/qxOmRhK2WxuX88k5b5nKnkaBKjimEIs4B1OLwwMIb5U= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QmjrQcb/v2nZ5fNM6bryFRe3s2iNT9QF85l77Pi3OZukqL7sPaJz0QhasiKykF7olcAleSsO3mVId1aF5SaWSiBNp93OxrjcSqXf2/LjCWssYCW9KAs7p6edI1pRs3NNGPczbM8hj5fQKypoSH4dIiqkbQcB+q5n3lLat1eEe4m37Dy+r69iPx4SDzWWiDhuZYNYqV0O0W8mjElFSjJvFt2K1kBocq9VCddxVA0LydBMwslllDa2F95p4n9hemx0pIskGM6M1GBqGGk/e6bBYqZwIhtxWM1AtODAMnnrcVW8J6H30b4pYDb9OKqDMKEiy+XHyOC8RDW0fzxLyi65kv/vGKnOIOlo8caSOsNNnHDPdmPPekCSwACuUuXBFh7mhLDj4jCjTYV+Ljn2m3OQ0+guBZFXk8HQekTbtrFbHGLKDguduGdP6gei0Ozh+RpTDrIRgxj4zUxgDlbDawyqhQC6TSxGbhxfiPENODDwg6fiUiR9qm1qg32bOGX/DEJB9oVMSSovo0ErqwrmJNHOSMXs3hrqDAbgtvXnyP8GLmBe2a7KMze6OHWp11Kbmg+tRRdlVlXL4FmE3FnJBBrEy9KinxNGAmQUodLVU6hv8fXOG9478meXl0BZyrQZguwMwTPFWsVw+uP0wGQkIXMgyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QB8X8OpmSzldpjgJX//CopEieIpkB2wxdNKrjdHu1qFIlst/mnjCCgkz0978Zt4kQidEVXB+rqlZjBZ9t6ka6oYiKIXeAlVmsKI7HDxW2+txeDRAf2t0ZGH2e9o2eir5WDZbH5OUO2L6Uubf6h7bV1LUDeuec0p9+ELtYo7JEuXoRvAUvppxtfg7CZjFIevzap0oHIZy7xwxHuz3lx4oocyG1K/w7dgKX/ZBtuf16dTcuugBn/STKDFCHtXR96NQzJpo8xMcCMpkrx70OKJoTlILoI0klgBSCto57yVkHJxQj1gSvIkwTkJgiciyxtTzvn1aSd+X5RaU5VsprQeHVOpVDsz8uSM6kvwbkLxLFX3kPXfDYTnjTEXSVPtBmHNU3XESYamJIhVX/rHKMIhaJGmU07Wrf+QdSH+Vn3K61rfek35KaLwrTduRgqL4jqe237gYSFlvNVknXbG8HXPpSjpMJlgOw3OENWNCIz7RcMWzYoMKUPBLoBh/wEUTqts4Dgahed6dH811GjOyKe9Ff0bK1PyPGIb1K7a+jMa3DS5/RvLxZx0CgogeycAz4bMYTI5uIspFWQo/Dwwd38ZXWENoPeJ11ZEVumUy5x/4rU4wcfxDSf3KGxytGn3HeW4w39SK34J+XZ8N0J0Eicc145E2lCEnpRvFFcJLJZlDorHz0hoVYHr51P504fRmsB5w/2B9hWT0c/Si7I1ErotRu/UNu7j1pPvLpKnthFyZLfPKb70oJMxFvZZnhwJHPCcA0AnsLgRVbquS5QGqH21lRcucGoYQeGIXrztdcLrlCJ96VlHWbLzZwxm6DqMoFRcvBXOMFSHE7b5zaQ+qEWZdcejtvWTKVc1kXBWGjB43pb0PyEaQ23LtFuo73hpUkJssY6C6tw5tBiBgZHAI/Lca7+99ZhwvnZFaetGav92wLimMoUDhbPVvmeD3b47SrQqGlS3OnUH9/FZeKcanVZCD2WpmP/Pd2gEnl1rECIk6pp4KTci7gHgMDdWCId2nskuU7mjQf22E+8cOKEpESQ1b/AyVAjJqhuJ9/iC/j9EpzlJu9Otbfx14Jg4lxoKVyBVLVFg2plcbMftixEi94bA8GEwbFi9a5n0SdC8EZ0D1fjXASicCliSEtJXOT1265wyyJpCAZ8RLjIcbZu9/ATZ9eKU3yIoEqDiEMj4uZ7icqyx/ELPWMfZ7v7IGro4h7ArOYIX3sokoQU+zrH7fC2KPdO9aQ4Q5nKPM4g4wv/4gwzdhG/J9dmH5c6Zi1KWtpDDeyKMVFJumYlSJGQn1siJJDrs2ZRRScsxP4OKo15mIBF0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc4f4785-8342-40a6-c3ae-08da893b1cd1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:20.7649 (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: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/flac: Don't use bytestream API unnecessarily 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: 6YVJkT7Q+Cd4 It makes no sense here, as flac_parse_block_header() is not even supposed to advance the caller's pointer. Signed-off-by: Andreas Rheinhardt --- libavcodec/flac.h | 6 +++--- libavformat/flacdec.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/flac.h b/libavcodec/flac.h index fd899ef72c..f118dbbff3 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -27,7 +27,7 @@ #ifndef AVCODEC_FLAC_H #define AVCODEC_FLAC_H -#include "bytestream.h" +#include "libavutil/intreadwrite.h" #define FLAC_STREAMINFO_SIZE 34 #define FLAC_MAX_CHANNELS 8 @@ -63,13 +63,13 @@ enum { static av_always_inline void flac_parse_block_header(const uint8_t *block_header, int *last, int *type, int *size) { - int tmp = bytestream_get_byte(&block_header); + int tmp = *block_header; if (last) *last = tmp & 0x80; if (type) *type = tmp & 0x7F; if (size) - *size = bytestream_get_be24(&block_header); + *size = AV_RB24(block_header + 1); } #endif /* AVCODEC_FLAC_H */ diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 09404b67bb..eadd41fc36 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -20,6 +20,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavcodec/bytestream.h" #include "libavcodec/flac.h" #include "avformat.h" #include "demux.h"