From patchwork Tue Feb 27 21:14:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2256252pzb; Tue, 27 Feb 2024 13:12:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWXpDq9dktQ3ovJ12B7nep9WCtJpuipl/JPD4VghQzV4i0yBRKd6Z0REXOno0BfwithXr4bJO1ok5OwGXDRaHmY0jWgHpPWlERfoQ== X-Google-Smtp-Source: AGHT+IGTgLN5PL6VYNONN7JQ0442Fm7kDV9yW7zgwNc4RNfByMiN7zGTlhtKiUeVFX2Pbfpxyhas X-Received: by 2002:a17:907:208f:b0:a3e:5589:6099 with SMTP id pv15-20020a170907208f00b00a3e55896099mr7096030ejb.70.1709068362481; Tue, 27 Feb 2024 13:12:42 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bo3-20020a170906d04300b00a3f07f2f619si1030048ejb.245.2024.02.27.13.12.32; Tue, 27 Feb 2024 13:12:42 -0800 (PST) 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=M2oj25Eu; 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 7F58B68CEEA; Tue, 27 Feb 2024 23:12:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2048.outbound.protection.outlook.com [40.92.74.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41F5F68CEB3 for ; Tue, 27 Feb 2024 23:12:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eDd3SHfCfKDTdw2AfISJsGXga7FUXp+nzM43tAvrYuaLNiwsFY6Ohpf549wSlcHGXMa2R2ThpzrKtuBgJvjJL1cL/iR36YMI4WRqngv7jUissJb3H+vpYLwNnIj3g/DBlgmlWXR8hkNCTcGhWqzV5CsyxWF6sdkp5rthQRjseh54msXVThQ+R0sbjzeXQr8fzERq3RqO6J/FUyR5FNELYlh/eZV3Raz6UymExG5Dg33rgVc1FJN7mKzbZTdwZnj2YhspsZ/lJ+ZVW/d+JLCApROc/yrHE3Ul6ULsOFdmnEZa8owivUtfAzMj3rD0iDfYDoHoykFnSzX4W+4HahWvYA== 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=J5SM95SobVrVkCkfwOIJFe8J2NL1oP4c7O44/8kZF2E=; b=XAYaxX50s6Hbi02mnmcLVEjYSRs6fDBvoH63p302iD7I1jnsE0qwXqFfzEftbZ8J6kTj4VW7yUrR8bxF7MTvUDgMSppDCn9oNoeGvwmRpZes3aDuBd2w6nkD3YYg3Yv2ms9O0lxGgbOAI30hzzIfpOO27AF+WnyjS88E5NmgSb5aiSvC2pakXDls+OUDbBgzfmlTzWrP2RmyIfSj6A/NdqJ2vVWutmjV17ZtjJ96m7XBLrb2c4j2KkDQm948y4CaX35s3nxL8T7LLpejVYsi+FimPqfyxXfRBH24sFkazHg17ZIlPitSZmMYPwOvd03k0/EPMVgl3HiAvyPw1Gqu9w== 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=J5SM95SobVrVkCkfwOIJFe8J2NL1oP4c7O44/8kZF2E=; b=M2oj25EuGMo581iu+X36cTHsyxKNzDt5zkigoM2KOkWTvM6BIBuNL9Lpv7XDgbuTkOf7Nw+gi7HWGUAwq/AJ6Mtg4XZvHXn1qGqV3w8y/JZUa1rvLSSxiWPZzkiSURe/P1rg+FlYRQA0Pz0+aTo+zSFgbhbxLyrbJ8087r4vcjwT8iHEGtmP/O6+HTTLaSNB8tRS0WJPqPJxrU/mx8tI3rGYqkOhwyBPtgtTZndATZ5Yvf71qE+OrFMtyByfCwQvKnWtsCX4Rl5M4SFPusc8m0CQofApfOKCI4yQ3gnssyCMfHKgPfXJsjiahV92iSQzm1s8tavdp4kuhAGkxorfWg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0097.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:170::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Tue, 27 Feb 2024 21:12:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 27 Feb 2024 21:12:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 22:14:19 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [1w59AQHi6apAr+gdgTfHCV81boHiHegvD0MvS86jEtU=] X-ClientProxiedBy: ZR0P278CA0207.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240227211419.1774883-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0097:EE_ X-MS-Office365-Filtering-Correlation-Id: 27155f60-ebfd-4b6d-b0a8-08dc37d8cc52 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoh573Ov4uul0xl4pTrThcmnvg7aHEdl5Yb2543csNd/P6Xi6W7tD0thdUTpl1CJKZ0h0pJ3Xee0g9UJUoIYdTLw6CzMdVr1zx1bawPWd1zsDCDYP/dYjpKa4W7Ux6F8ixR+Mfxeu8gdk2mzeGXtMQ2unf9VZVYGWa+3bals0V2VPS0JozciSzN3gpYaS32MxmC27DuowokS+qtKBbEMYkYestDlpQbzxFaRY8mUb38X2RmHsS/MvkgnSkpq41BeH03N6cEVhn4uHPOiaRv8SJ0MOTbN1EGYadoteBEnfBdrkLFvR0k3o9PbJYD97WQ6VpJeu/9Tl1Fu4/AQHa+Ydb6rcnNCmQiqIAjCrCe9YG6ZyLKbsUGRdP43+SXPe+nl4Y4QIATyvKbDErAEz7X1Rn2nLw90KhmRcyOq1TVhdRRJJFE6pfqv83WVrhniyiE6Rw9KDMZ8DU8PeFGRw7jx61QSWzYnPvn2XqQO0aYZA2t1eESDzQUI78Ub2h8tF0kjPW/gDWbToQNsrzwrUMi70/YSLeEddDrwhctGU00fT1oV39Jb7WygifiVoEQRbJ5Mv+tdSuzqhF1h5lZxiV1+zwDDIHmtAJ8iBGCIDmo5IR5A9hYQbecR4BTQN+GMCVa2hhz/jcXkG6JA41M4FEI/INyMiuSVRQQnSBba87tCURtYiSdBSmwcvqGu8cZKvPDRk3qt9a/qbDbMFrTZFmEfa2aAJYPK9gJcHmRRvHDpeGE/pX2jukenktYq4ZHXriMrCk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hw1m2mJHObtjonlQH1+oN7OrArB5BRgus4AKgy8BXOIFTTm8QyZZ5eIqjjz5CuEIIE68yPeleRKMUzlIgUF8uKgheoseVPKJr07DuSxqGnVzsJ7KFeuGnTW/o5GyGxZRCKq2xLzXfpaND0pFjBub0rTIX/lrSPMQ66o/BJmKxpRcDsEF6sr+y+os9xR6juGU71/8Hr4VtMxd3xyA7cEGwr2IiONP9bWmgQgb/gCyTwEjur7eTQqwVIU0iB/62okcEnkgIZ4VO50LCaKX9S1dZ3imhffHf+KgNRRVxygjD8wWCqVNkyEYWha3FooMV/Z+SJPCpp55sB0fdjFohXyTyRAI+49UwvP301TT7kt/E5qMYW2auzxrrpgfH21yxXNhJuh0KUc7NMT13DXwo1SpwO5O2c2Hjw4D/EW+to7UgvH0hffdJQ0LpzYGZFJfZdPVJmD8ifiHBGOCq0ZTglCXhQSuXI+gTQXerdc37I2xqP3XYGoXC8XUZhL0oI+/qI7MNRgfBiBY6IOpC/HY0xUSefNULC6m2fVfOIPcgPTACvM4OzeAIQiBZcJYLsRuC21x2QJK7sw2k0NUGhVRidzS1e8LXlC29sT0Gs9D0UHzowQioP5936mzUlTVR9OK3BqQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e7qI6k6LdIKjhYSy2TmRqem6wFjb8+c75Yp03/VZw3+a6bThEM9+cbClzSbho/hu6xk2Rzl7G0LZqDjvTUb0TS31JilmHMDdEa7hQLLaw4bx5thPMxqBUv2Xws3tpz8T9ZmWhtvp7DuJZ+tIVFuwFxrNznpiW7Wqd90QK+WvibYPgmoctqQOEDcuP9R/4SLN6enWMpYOgN8hqGU4MBBMDv8fWInKN5Q2FLn6gjrJYzCvpW/86P72MpSzh6z5Pr9bJuzE83HHfmbU1MK+0kcyJ1xoxbFgyy+APYs5KyeQlE4TH27WC78pfkWIuozC/QgeRHdB/PgfardDUFErlqtt3A425DgtXp9W715kZMgEGluuuqn7OfolYgnJ/iazZn0bPZkTgxGmQrM8unZyAsxF6FBbxThahvlAnIWqzJxqdbqeM/lOu2BQBVlC0fOiMZGJfNZ3NF5eqXEtPILQKLgaifz4LPfGYipc1EdUvwc9EUlxtsDclyzbogLu/xvn1T439DdpDMTj4R488vLBhHuQThm0OfF3yFYE9cNDTxbBlIvVnC3yGVU/T7A3yRO5zYrc89fUwbvoyHhODJDDN2EvzOCNxPx0D8D7ng8+eIyUS2WjQrY1NOmVcQD8j3G53+dScSnFUc2MWc/IsqHLCKApGeg0G2TrbOEfO3SVI/nSphZYylOBH33ezXNygeiPugpWd7y8MOxBgRptln3michzdjWFX28NogS/rvD+UrbGjIa+onE1KmaaXNg3EezgVfIneW6QsXnlPcrcjZhTbZcehO+d0ne28v+1k8sdK38s5LM+/g3bhwpRqOirAjNHs/U72FOm45gxClz5gz7phfKO/1xm36ijSBtdwjceqBTFd8UExNq0myczaDVE0Z8bY3zTcdKiNbOrq80pkwwnSNq7AKJ48sAAgUZR2n28XY1fxoHfaUz3C48P/KmlztTWx4QmzJ8HSbMfj2KKElePnCt4jvnMUPm1ihwsfV8fH640oZZSHEGlEK2G/jNdHj7jVKcG5m2Xg2Gpovp1jGAtgfhXGIEJ8Dhjw5zNc1PPjQwjM9bYtVEZJXBn+XV8xCRb2a6vhLIxJDT4nohMJ5UwbK9q4Rcgft3NwXnm5ALxmB2tyx/7HNLPD/+WQEEHKxehaX4+f3lxphcIMC3PpU5KeLRLeVI37CLAUcK5l1iP9m1Z7DczG0MPSMEn1LAjRXNE7Ssr38utnDz3NpkyBJq46QOKeVcGh9gI5tjfQQ0tXstz5Gov8orU60MM0GfnrYZzgWZPA22/x24hKmncr9omnCoYCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27155f60-ebfd-4b6d-b0a8-08dc37d8cc52 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 21:12:26.1885 (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: PR3P250MB0097 Subject: [FFmpeg-devel] [PATCH] avcodec/refstruct: Don't use STRIDE_ALIGN for alignment 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: 53/lB4qNpC4H It was always intended that the buffers returned by RefStruct shall have the same alignment guarantees as the buffers returned by av_malloc(); said alignment depends upon the arch and the enabled instruction set and the code used STRIDE_ALIGN as a proxy for this. Yet since 7945d30e91b96d2f4f5b612048169087d214d41e there is a better way to get av_malloc's alignment: ALIGN_64 in mem_internal.h. So use this. Signed-off-by: Andreas Rheinhardt --- libavcodec/refstruct.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/refstruct.c b/libavcodec/refstruct.c index 81e8c9795c..f89af156c2 100644 --- a/libavcodec/refstruct.c +++ b/libavcodec/refstruct.c @@ -20,13 +20,13 @@ #include #include -#include "internal.h" #include "refstruct.h" #include "libavutil/avassert.h" #include "libavutil/error.h" #include "libavutil/macros.h" #include "libavutil/mem.h" +#include "libavutil/mem_internal.h" #include "libavutil/thread.h" #ifndef REFSTRUCT_CHECKED @@ -46,9 +46,9 @@ MKTAG('R', 'e', 'f', 'S') | (uint64_t)MKTAG('t', 'r', 'u', 'c') << 32) #if __STDC_VERSION__ >= 201112L && !defined(_MSC_VER) -#define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), FFMAX3(STRIDE_ALIGN, 16, _Alignof(max_align_t))) +#define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), FFMAX(ALIGN_64, _Alignof(max_align_t))) #else -#define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), FFMAX(STRIDE_ALIGN, 16)) +#define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), ALIGN_64) #endif typedef struct RefCount {