From patchwork Tue Sep 13 05:07:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp481106pzh; Mon, 12 Sep 2022 22:07:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR5FoimtGjyj7MXiLN6qOHP696w7PPl6IWNHjV7CrxTgFAHr6w31eaHiq8omHYXdXYcVbwkj X-Received: by 2002:a17:907:7da8:b0:730:fdad:4af8 with SMTP id oz40-20020a1709077da800b00730fdad4af8mr21169555ejc.401.1663045645794; Mon, 12 Sep 2022 22:07:25 -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 i21-20020a170906251500b0077c6f26aa3bsi4693774ejb.656.2022.09.12.22.07.25; Mon, 12 Sep 2022 22:07:25 -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=CljdsVve; 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 582FF68B84C; Tue, 13 Sep 2022 08:07:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069105.outbound.protection.outlook.com [40.92.69.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 638EF68B72B for ; Tue, 13 Sep 2022 08:07:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IpbKoTWdpQYzDjVDTiDiGJl7z2ykaQa2X0TOaRyDB7mtLwDPYsr7FxFoNlWsSCcKOrrU5wwtqIY02qY1Anc/XAhtcEqQiLsvs4dXZjxyZUXyj+9zACS4HELNkv0PFzvOKhZQczgvBDWSOmZeMOfxU2L3auz+jL4g65fBv1sntE03XphvGdFa5guUdCQvz8s6PpYFNm7TidU1HXWjtBMQCxkq2OYSOy6N3FOcyxBmHLnE2mJbwRyaJFdr4X+d0DFx+Eur4ukO2TT/m2K14V4gHKAF952rMb3fRQw0FxwKvhYJq23X43pBZRKwquKxahHKk0sY7p57QFS0iwG6PFVmSw== 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=ncQpa5jKgmyhO3dca1p/W0/tCFclZe/qlzT+gu19dFU=; b=EEGRUTBBp9lYQ8XwyYcPVp2QlJtsMEYkb/AkWscN/z/+IVMEhI09+sCQgC/Aa05KJrp7B4Tttl3HjhytZ39qBFx10GOlERswMcIEz4MzYavt8M3cRihTy2Xnr6amlemNFdarWy3Jl7lyW8ZUt1ZN2RYnal4b9nuCQxn/DhMm9aFw53RjRLbKEiq0EfcCJCexy2w4dco0pFO3FuHeXCcvnypJNUmRkLNelJzP4A+pY8I50tLzS9mvX+9jufDfeYb+fLzVK16opDbc/V6aAEVi37EvXGKJiXBsxsqjuIK5IfXt32O77ZSa5ASi7yVJ8CXgs8rLCZauwusUJv4+S2lCNg== 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=ncQpa5jKgmyhO3dca1p/W0/tCFclZe/qlzT+gu19dFU=; b=CljdsVvezU+xP2Mr3OA2L1O28Iov/S0BMFYQ8eeWb71bI3/nHALl7WxUgWuvIOIC8c6mf4U+0MDPGmOynxaLDscZm1zP8JctSPjIJMTvL+wi2xu47pPbO+pQUpoEje1a6m0Ss+FfAfw7PtCKZytidfkXzj3hYKAYQBqI71jRQAKphEN8f8Tahs0fZmCuG7DqdTnL307L4iQA1JwGpTOehIGjnAgqer9sIwItghBPU51Prbxft9NK2yp+XQKfMK7k7zOgt/QjXLBhbrPDcDk3UzyKRH5kPSGQQOxSOnQFc9IFb2OWuNBU7OiIwxlgGJCocQxZCAVUZ7vhE2RU8QJQyg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0073.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 05:07:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Tue, 13 Sep 2022 05:07:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 07:07:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [P1lVaOzEyKVfJY4p5ntaPtrG4NKRyEj3C+24geWMN+0=] X-ClientProxiedBy: ZR0P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220913050708.432187-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0073:EE_ X-MS-Office365-Filtering-Correlation-Id: 601747a9-0a2b-4b8b-8834-08da9545d0b4 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3l+WVygPu0d+8eXbiP2o969a2SfIuZd8PgE0ke7oK7GKEokUN6oZhpA1w+6U2ZHHr0Lr3mawjeKCyZM5/wCcGv3fP/KlzzD6RZH17FmgA/TP9yXHBBv1mqUkDWVaK/t1TVkXF/JdcERo6RfMAZU4bWoylDfMWss3h+TNjvXd38Dc/fo0kBZ+xbbR/NYtq3CQnd9dIzrT71f4OFah2bEs7HhwdWAdrwwp1A96fbf9N6PIojjyA9vrfS6VKadWXBn7KoXS4C2+2+cqMeP7z8XiSvXly0k3vu0NX/8+/Gzyj5IL/iG4bxYMvE+/3lT0/57cDMbzynVz3GnG8CvQdJw0UTLdfEjY825lw1zz34Cw6dbKnWPIReqSKzxX5g8Qi739WqCJObc9zIKTNBgYbPHIBBp+sZayfA6A7cVdm3k4M4pQROCP6Jawsl4IntjvQd789B9LBRxJq1S39rSg/ZaP/T5b/0OhbEnLUt1pweh7PuQy3WjxdYa6/ODdh0fM/LXmhnJPR8i6qTZiBQ0shwAmsbqrb/YfBZlxEgzBCOFYzANdNwJ/eJOb1/6QJQbNAcpK0c9I709nWMYu0zkFD7i8o8hF+9zZh7RB78PnX4vUOgWQf/c0lKAElMGx3KLWdH/70hrBUH/g0hk32pRBerBIaM2vMv0vnh2zEaDvDlUMpiBMq4FBVOVpixxrUpSzgZhi9wqdYKffssO6yKWiN3btwNm8mLnVhvscw7pLBfVVbmD1Kn6Z7cBQyXG6UgzG2npRyo4Bg1QF1SC6t4uueDUxPz3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4yD6Pw1SXlcjKGbxzxBdt6/R9i3WrTJuxwibRu6p/6M4fnVmmKyGjMIC2cA8LLdqNaCSvun3ZWNsXi7K89eQo5JiAze4rv9yHfRfdvUCI2LI7azEQgsbVL9/VOi/NLoOWICAvOs7vYtBVS9zoi31As/kpM9qtvYffik9o17RUJ8zRkVjrp4GmvKbjx9y656vBFiHNh/ymfte4tDjfwRbOZFs9daxMEPLI7fB6pBr2IzuV+6TjRhNO3ZgfXYTEPy2TJY7FVs72/Qe7uQn8lKkw8IKW+XVaQse9JoAdDBjXXlnkNavr6z+5xWxSR+IUjxlJ9agWghve81a7E61cvgBTA5QZWdeEu3bNuI0sHyvMR+6dJgbWu8cN48wRtUdDuVc6qEkJpaHkjP3gH9lyJ7RumSzs8G+jv3iiNryE8bZ+UB5hG14/i/impO3cJRCTBpUnWAUnlVWiNaWBWgvY1oL/S0s8UI67BbYV380UdbB5EC7C8LfAAInKsi0RgzF4DkYcA/rH+Oq9qsDWiRErRlzTUuG6P0tzDotq28ZwS+gVBtZ76pD351K4CpBPVajz5pt9PB2KVK2QxGUpJY3XyncrQHJGbU5mJt8J1HDIxvkH7CYBnPZhXSaNZ2xTVBeqy0ahJ4Y4kTtRBJq3r84RXYWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qsWoeEagH2o4zJZVVN1GNhqXfCEC8MsWShfY/nxsiuhPAcwy3i/DsPls262I4yFs+ZbjCuDmyZIIPhz4oV5c3VgP/MP0cRLTO+LR6u8ox4jROaHi9/kVQmL0vVx2dLB1KBipJ81aVOr8A9aVIs4tQAzQHFpmFaCBUtkm9kubh0NysVvnFHCgq5OhOH/PG5k2zW5wKa90qt+5l099kWTT5r1g77a1FqLtgubQRmlg7ViuDVFQzv0yxzMpwgAYiGC0ZU4F/A2hf+V+kqmYqlQbJiZ5bGagZKY/7rR2agbbKdLV8+RUY7YLCY5mrFcCPKlLRIcIYZ8WGAc/U4t38i/5q+YVgy7kCc0ysx/O0QtLGaeogvOsdm2JvdyfE2I0y7fHkZBrfTq5/Q6UTE6AxbnStsXHUF4CHBhQTNR6luKLg9UNIzPttMeQVzDAvMcuMiJA7kqxe1QknJONa8pN24pJ4VKkN5ZfHHGH0XwEhdYnmg0PLg5vX1HVN/OQ3LVJX82Q1dxk91Tpz0X7A7iOShXsJW3MC8RiDwP8069WMBIweddwnWPFIGj72Hbuw7/x9L5kPwGArv9UWiYUXkHj5QE8UuZJEw/kcY1eZsYI0jZsn7+AX34T9UvVkb2G6PQmOssN1/8m9kusH8+0r/3r0LBRVoGcpeuUNspuN6hhqqDHPpY4d6fxtZaC/9NvuN/2Xtgs2sy9/FNI6fZ04nB0ARnoIRYlXlVm/MoqK7+Jq5KwtJyej0ScNYPRp0iI8nP2/NF0GDUEXePGufp2YpSdbQVLi/D9R8Wjb3CAD5dvbChWNXjwBCENGrdRk9sJlcSgXaEL1g90MrPMmiAQLVybd3NKyrUKh6FHDcHkty3UGsU8MNt/WwcUGGvAdZjk4VrMBdoOY9zvsLVnX3wZtZyXFZqcbe6hC4yb0j+5r6goW47ZMmFlj6euNBJKhxwolUmlFFHOJUz1FiuLZWSh4XqdN6i3QpcbycaDadjWEWJ9jmuHL/AciSjdNFB4kxJwC7T6A/uX6SX/+4WWiCLlfiSNPTwLUqmGnLwb2JoWP/rPL/aY0j6e7Uh8SVMUAgSRzoK6PaVlZSv4iUBvmM8ZvyIh6ZnjAFGzhUC6nBTQoO9WQG4ybb3ar4f+ZWmJQHOW6nM0xsgYmCAwCWyMiX5odvzHvQAd3Ki/UCpocVrW/QrM2TN8TnRwY5gZxzfgMJNDKlEdfJbYMUCtmHIJz890kxZwiOKn03xbCCpZDgwnGAjibm/E4TrMIN0LyKIElzTHaQsJtbqisS4I9xFOjYDjDqUKuRpavRnXkiwVaZl66NxPDjR20qR7nhN6d6bOO4Sd37r/Kyjn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 601747a9-0a2b-4b8b-8834-08da9545d0b4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 05:07:11.5933 (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: AM8P250MB0073 Subject: [FFmpeg-devel] [PATCH] avutil/intreadwrite: Always provide AV_[RW]N(24|48) 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: iAZfmZJ93Tji Currently, only the AVR32-arch provides some of these (namely the 24 bit variants), but this should not depend on the arch. Signed-off-by: Andreas Rheinhardt --- When I started writing this patch, I believed that whether intreadwrite.h provided AV_[RW]N24 depended upon the arch, namely AVR32; but later I noticed that this issue actually only exists for internal users, as an API user never got AV_[RW]24, because the AVR32-specific header is not public. So I am no longer sure about this patch. libavutil/intreadwrite.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 4c8413a536..8a18233f55 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -510,6 +510,34 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; } while(0) #endif +#if AV_HAVE_BIGENDIAN +# ifndef AV_WN24 +# define AV_WN24(p, v) AV_WB24(p, v) +# endif +# ifndef AV_RN24 +# define AV_RN24(p) AV_RB24(p) +# endif +# ifndef AV_WN48 +# define AV_WN48(p, v) AV_WB48(p, v) +# endif +# ifndef AV_RN48 +# define AV_RN48(p) AV_RB48(p) +# endif +#else +# ifndef AV_WN24 +# define AV_WN24(p, v) AV_WL24(p, v) +# endif +# ifndef AV_RN24 +# define AV_RN24(p) AV_RL24(p) +# endif +# ifndef AV_WN48 +# define AV_WN48(p, v) AV_WL48(p, v) +# endif +# ifndef AV_RN48 +# define AV_RN48(p) AV_RL48(p) +# endif +#endif + /* * The AV_[RW]NA macros access naturally aligned data * in a type-safe way.