From patchwork Wed Mar 13 00:53:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:e85:b0:1a3:31a3:7958 with SMTP id ma5csp98341pzb; Tue, 12 Mar 2024 17:53:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUtcU+YlC32oHLG3nY3BjIWmcGvAKvNyUdAxxGYZgueAA78xfRhLK4reer3TFmdWOUVRi9lKHiYWCy3s3FNZf6ec4cNJd5sQwJQRg== X-Google-Smtp-Source: AGHT+IGGxyCOIKizoH68PA849CkQ129wD48y/3O0+vQADGWfGAqRU354qZePLIDk+szVM5FDJMVn X-Received: by 2002:a50:c31b:0:b0:565:7ce5:abdb with SMTP id a27-20020a50c31b000000b005657ce5abdbmr7305735edb.10.1710291209476; Tue, 12 Mar 2024 17:53:29 -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 l11-20020a056402254b00b005656776bf67si3949843edb.655.2024.03.12.17.53.29; Tue, 12 Mar 2024 17:53:29 -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=lM2DUbNa; 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 C2A6E68D014; Wed, 13 Mar 2024 02:53:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2068.outbound.protection.outlook.com [40.92.64.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87D3F68CF5C for ; Wed, 13 Mar 2024 02:53:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XL2lVNj5sq5A8elQSWZe1CszO5oH8X1zb2n3/Fr0V9HyI4Bx09Qw1CmZ9UbxCbOfyPjl1AKwd8wDmkzutaUuekn9d9iVetZ242+JJkDY2rqlOj0uNW6ymqIeThUVX2e790P7zE5W9jm6CupLdn4NptQt7oezZptUhgecTjWnjAaZMZ0cGpkvdNa9kkKNiEA5RnSs1EggLhlnikfO7eZqioUfuQffPL52OCfuCqROkP8Qdp+fK/3qqjn55SY3w4sGOfhhviYtn/a5D/z8r9QK5bL2Rfvz01ZuNlAJ8S6B1PwRz3FTz1+W/zrUJG/tPDAQ0CKbcEHXqdt9RJ79p+b9qQ== 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=ulqFPPQamXIlfZBaXvGA1lvnb4hJi1d04PaiveVCR6E=; b=ZNMsQHXwUf6v6ThehV6ftyfro4ocX1OXq7vvO+vRCD9Apl5MX+Zm9s2LBGApvFeVvyBJPCl6UQoTMjBElNkmG09SzY2mw/74LazPpMPe2x/hmmB8LH0lCbElhIuVng0S5X0Gfn35pqhSh9Q8Cpa8nYeACT5U5rMzekPhA64f1NzuwgvxLhGhVXgd+0IVUg1WbzmYYhXdbyT1PuORZyba9QT5JgXSxoKaOnS2m6MTGRlrAhWYy9O7VcJN1qecYDol/wih8QLHA1Qv7Nd+U+UIqWy9Z2zLC32ux+vbwW4DFTkPGt46AX9BRdcT/n4pkt0/3gKdXTvSmCFhHKsnKRZOYw== 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=ulqFPPQamXIlfZBaXvGA1lvnb4hJi1d04PaiveVCR6E=; b=lM2DUbNa6RKTyGI3xH1PyFPQ+4ZncL0UcGX/TSf9+2gwX+nlcw7e08vlh9yCtEdm62P0LsZdWDCAtGOnixQI2raNsXYBgP07cLcEZ3VUNhExmp4xzSHPRg1uwuLtexBE08xc0IYhZxUFmO82yGEGK/e4gvv1FTVvISc5CoX/sKrB8ofQszmo9p3E901E3y0SWqgi3CZy2jx1IcjlmJdd/lGSxB5lSZU3uWWyqV/sT6U+R4EQ9pXdH2/4CFvvMrDMLoAgX8kPCl/JHRbx+cPrxVwYxVJFsLarlZUm4LiE/ryIbzUTZUiIWXiDKOwL7sNIKstx0+j7PUKyB2HHFjG7Iw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0238.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Wed, 13 Mar 2024 00:53:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 00:53:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Mar 2024 01:53:10 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [GckFrs6aM3QT797a8oiMtGqamaDBxYQ3] X-ClientProxiedBy: ZR2P278CA0082.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313005310.2047859-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0238:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f4c11d1-f7a0-4b5e-5e10-08dc42f7f896 X-MS-Exchange-SLBlob-MailProps: obhAqMD0nT+NcFk63dsqyDEd1RTx8qSas/mpthi2FLOOEOBUegjCHspmhQxM7MPM7nfyeKGvxHd6qIc73b/nAvMbVGYK8RRn9itbDTlTHIYvnFkDoonmY+7WfImyjTtYu34dVBNq8gLlET2omB5W70WB/vRI+1/wUtSKXXZt8CA7RrUEB6j86yDPHVR9UAVYo/DGm5ggDai3WVRiSwUkhE2d3nHA8xjfZtpKwnv0FrkLly8X6nMPzbj9hHbcTqkXdDOIQ8mzhXND4N2vEwWBAs9SwFzwykwum8TOd4z/d+SoEuy+X0VTA1zaRn4thwrxqoXlMVLOAYJ2BKOR7lt57kXtQrN+5guwkC6wSknmLGTPXs/NxHHUeM84jY54aUh7GkY3+dNvmrENTwGQWuJOHWzkMoVmNFPklLK3RU/SowtBh8Uo/SxZhyEzbuPG47EZXZi8tEIlgQd5NfyNgnEpf0+yO3Mgq6DGc6F9CYVLd4bmYcjKASwcas4juZxIVKFJNn1XzV+ZId0GlfxxbM+hxg89WfKJEKrFKDdpnIQPbgM6GHiXbdEksPsxs7reXlmKLTRfAH7QZpNWLJqxTpgRtwpxbVzgW1pQb5u2XoqCQ1A3hlUEzPAm6FmEJN3427+cHV7IIEe/TpljVH5VLlAWaFB7CI4B12m1QXBaRmg9wSXAU1tTFQH//bGaJrv/DsvXdc0HOs3efRzBmEqToDHo96BJSYHt++IO9b2gMRToUxk6jlUYyUY/sF/ZGSJ98DCxcnq1z3sPlk27fnq7qRK0vZsLHe/NUAl51igq5dc6u/QwOiXvfjvMJzJqxNEnh5Ej X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SvP/Gq/LLY5YdzNBfFf8F6u885eOczlmfZVaz7sky5r3IekgywLxm6vcWdVye/VyGIaCc7nQtKYuJ3SlTFHGQzkUhgwSDlZIbrUHhl2GPvIJdaoBlniZOvvWgc88vbEylyrBjA1dY7qnEgs+QlOMnfq4BTsLxkWtZy/l4DdNmVTT0nOOcZhtGed2FetYLN6YtsZd2Se/AnBm1VoHwclabRM+EXndorezwb8JIYf/P2ds3V64WeMeUIpba0WuFEWJ5ACo0fzjE+YOLx8Xqs9Lip/M4FmCWwROYWuVWH6mH6qNEu/U+svdhSxivlsanNop8dqJtQfVl6q4ylNHMcuADiXWjmKGPlYWhCIZAA0dpkb+t4K5FbgN/+Qn7uvsvGWWplCtzc5bN85WK1kiL3gl03MVtMNxNztsjCgVeX12wWo/y04FOH5+e/WFcn3C5tuJLIrYGHeemoKrbcnBTmogdxs3e6yO1asteIal/6qHD2yH5xLIvvaUPJSbe0or+JGw0QisL+W0P0IBw5uA5A1iHI2P80bxaeRBNYZZUYbuUEbxR+QZMCmZDc5y+u1OBBfSvK6CwGRrCJI6FyIK37ZtpTvjXrvZjTRCVDee3OUUfTQKuVu7RWiNPC3mLuXSUCM9gU2kHfqIEMA0Xw3sLQLI/4w4Ed4B/+Nzo3Wejb01WhiLCrZnzwznjhUvY4Q5pug7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K6wDch/kY2cIdJUO/uI5lAOXxR1SFsvJY/pjvV3AcmBPF7iDuYfebBBPHi1W2redV1iEB8hmIWIrzlZIOJlKHH48OlZ5udUxAiFXNRzBlSaw4izTueXZJa42GXdg7NfapHtVYO8jILYM5Jf+uG6IR6so0VM9gZElIBIXloB7AovxE/f2v3r4lfGYu5C34wHniJvY+G0uexX2NwVZksIGihKGmk62q3xZg5DvI8LI+NuWLGD4zrrQCIxO+6mTUwNiPHWVtETihOFYyBe4J+MWMPzwdTeFYOzWFjf/ayo5ks9c2t7HGZD9J/Z8Hx0SJjR4TmGNmPIrMZDRHI8UPb7Sy1MHbWQ59dRrbI6hqbMArA85ZWyzL2CD6P2sXDZ8ap9qYx/a5JfsoKP6Smh5s6DlvK0xFLqIfZjILUoZ93QaBdr6JEtDVN7BTew2pLmCln4+lPMc3NkjN91uy+/1LFErcZf6Vgq0kDRHJk4EjCF9Sl/JzB64bww5M6DIGsA7dbpB+a0uvAecKg5zUPQGaMMDtGNjAYyLihLtCP2tVcI+6+xRLN3wuYwGy70YKssYWY3ywI4DkqzIW1Pp/lmFo5Ldmud6vKfgdA/HbwXgBON2PqEnYo2N/il34gOgJuYtexHIrzJg51nnbhlN3QWz7V/M2SgTK0K1Xrtd5nHHuZL/lxdYwtf2gJtxPSxaNRynHi3luqZSXg/KZuqM6SV6PW5VGqmGK3UvqybqHbpsjGk+G8PIcabls7V7UeDJJmY0NCqgXIbuVTramcmakUkQfeADOnhzCr94ClBkkx9K7Kh1zn4OvOx9WVMmUmE42J5evq0RiVpfjuarGC7fZZTj0WNUpHVjZLyyOxgQbayuzuD0N8iHXiPlh9rP23tI1EJEWMMIPGBXWMH2kr5jedVblZVuDc6q4NCr7y2iUk4V7A4T+xJ17YdF/zxH9dtx1Cx7+CnIygdNAHF6hcpik9QCS5lJFlvYMiYXsyXxfBH1W+n8CBvIcX0rCQ1JT/cVzDQt20noSvfKj6nFh+K2GJni5dKEOsczAHYCo0RpnDzcyS5aHjO5WXK6duUgyfaNbc2PxCF0ZRn/UPbtYoD2ZlkXzHpcfOil0s8rFA7s5Uo4wGNItFdYdusGjRbqe58zW5ioYYciDLe5t3M399oTL6HNi/V4qIdGNOMT0l26Wx2BoZ16JzVfVALOUsIkL4eT1kvCT9gEHrOmGI35MpVVmos4wT/d1YSvBtXVo1kaBcfPdjJl7aAfNGTVG9VSWyInBUYbhOmBM3ks6rWh42mNBJdWbj9fXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f4c11d1-f7a0-4b5e-5e10-08dc42f7f896 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 00:53:17.6706 (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: DU2P250MB0238 Subject: [FFmpeg-devel] [PATCH] avcodec/mpeg4videodec: Align idct-block appropriately 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: 9LBYKZbT8JRN It is accessed via AV_RN64() in ff_simple_idct_put_int32_10bit(). Should fix the UBSan failures in the mpeg4-simple-studio-profile test here: https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.h b/libavcodec/mpeg4videodec.h index c0e6ec6592..4a26d18987 100644 --- a/libavcodec/mpeg4videodec.h +++ b/libavcodec/mpeg4videodec.h @@ -29,6 +29,7 @@ #include "mpegvideo.h" #include "mpeg4videodsp.h" +#include "libavutil/mem_internal.h" typedef struct Mpeg4DecContext { MpegEncContext m; @@ -83,7 +84,7 @@ typedef struct Mpeg4DecContext { Mpeg4VideoDSPContext mdsp; - int32_t block32[12][64]; + DECLARE_ALIGNED(8, int32_t, block32)[12][64]; // 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan int dpcm_direction; int16_t dpcm_macroblock[3][256];