From patchwork Tue Aug 8 12:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Smalley X-Patchwork-Id: 43177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2240024pzh; Tue, 8 Aug 2023 05:23:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmGXAreAfSrI1eiIatbcuwbWA2ar0Bq90smSrf0GffMGXj6joqw4y+le7xJdFeyMG8MkjV X-Received: by 2002:aa7:db5a:0:b0:522:3ef1:b1d with SMTP id n26-20020aa7db5a000000b005223ef10b1dmr9063073edt.6.1691497380334; Tue, 08 Aug 2023 05:23:00 -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 l23-20020a056402125700b0052247666986si7527511edw.434.2023.08.08.05.22.59; Tue, 08 Aug 2023 05:23:00 -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=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DDWYnGoa; dkim=neutral (body hash did not verify) header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DDWYnGoa; 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=NONE dis=NONE) header.from=arm.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD0CD68C7D4; Tue, 8 Aug 2023 15:22:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2066.outbound.protection.outlook.com [40.107.6.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04A9668C4E5 for ; Tue, 8 Aug 2023 15:22:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rz+WRtOSPLzpsfD4EoU0NI9w+PXa8hTy/pX4XrZnlF4=; b=DDWYnGoacbB71HHC5GDC5yZmYoEYjQIMH6gOvVt2qOEpYlyc4s4DxSc2/OqmpCXGPBGY7Po+vFsrAQ/E3zOjHvhvFjf/FEGnm4m7JeHYvHA5m0vLUYwxr0KNnzGnXKkXYw7Rvd52Uwf3sTzFzh/8EeAbzsKWwiSSODpRx+e9qYE= Received: from DUZPR01CA0180.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b3::14) by DBAPR08MB5592.eurprd08.prod.outlook.com (2603:10a6:10:1a8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 12:22:45 +0000 Received: from DBAEUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4b3:cafe::9) by DUZPR01CA0180.outlook.office365.com (2603:10a6:10:4b3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Tue, 8 Aug 2023 12:22:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT029.mail.protection.outlook.com (100.127.142.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44 via Frontend Transport; Tue, 8 Aug 2023 12:22:45 +0000 Received: ("Tessian outbound f1e964b3a9be:v145"); Tue, 08 Aug 2023 12:22:45 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 537e23cb867f12fb X-CR-MTA-TID: 64aa7808 Received: from 274a6e8bc623.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9D3EDD9F-D255-44ED-BCC7-81987719831E.1; Tue, 08 Aug 2023 12:22:38 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 274a6e8bc623.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 08 Aug 2023 12:22:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C3pDnlLt/R/4y81V7+3RqAUkma/XxdQ3Wke34EdF1+zPBOQZ/R4e0MVnbOZhWVDHYilreRwayB/P2mVdpA0B49jMPXm+Q8moTutF5AKvCgX68ssOOsHQubgUdBN77YFt/H6NvdGApUPWOSG9Hkh9OGkzmK8b3lI2uZ9VDfQ4PcEUkKK8DPOim5AdbCPjPloGk1oh94uPd1n5HUGG657jFTjIsEO8ruiA0p3yX9FAu7mzYZh102iiBwGGZ3pJrSNLp6FoCB+AmaFEOOTXmqKfVHpPssvnwACQiXQwPQvYVdXK1V6j9Vh4cmZIMKiShmnbC2qEV4Vn1mhOQIK8b8ATWA== 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=rz+WRtOSPLzpsfD4EoU0NI9w+PXa8hTy/pX4XrZnlF4=; b=AY8jvUWRoLsM8KeBtgCQiFBAZ4nCdwakcfHaLV3JRqgivl4lGcJXb2lfr/5CVWHDjKeisyTWqhlZMA3Q1t1W351ceRN5EvNMtZKeyRkqi9fZdELzzyvtUJrq5fF0Icv+PtbPbou7hggCQaUyVf3c0201H9ProBYEIG/NXsRCI6BIYcbT7ODwhdLUfnjMECJQWVhY+VYlsRLIKW2etjxGEHSNgxwhUKFL1fmYdafgUUGWZfR3hDS6+OUXRcb3B7WxkIJwyP1bU6mx6ZopYh2QaoljF5U+P6UgxacuzKJjj3NQzSrqs0c1nwystS2mdwmXz+gDUCjEOxutqM/e6Sc6zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rz+WRtOSPLzpsfD4EoU0NI9w+PXa8hTy/pX4XrZnlF4=; b=DDWYnGoacbB71HHC5GDC5yZmYoEYjQIMH6gOvVt2qOEpYlyc4s4DxSc2/OqmpCXGPBGY7Po+vFsrAQ/E3zOjHvhvFjf/FEGnm4m7JeHYvHA5m0vLUYwxr0KNnzGnXKkXYw7Rvd52Uwf3sTzFzh/8EeAbzsKWwiSSODpRx+e9qYE= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PAVPR08MB9674.eurprd08.prod.outlook.com (2603:10a6:102:31d::14) by PA4PR08MB6285.eurprd08.prod.outlook.com (2603:10a6:102:e0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 12:22:36 +0000 Received: from PAVPR08MB9674.eurprd08.prod.outlook.com ([fe80::44ee:bcc0:6070:f47b]) by PAVPR08MB9674.eurprd08.prod.outlook.com ([fe80::44ee:bcc0:6070:f47b%4]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 12:22:35 +0000 Message-ID: Date: Tue, 8 Aug 2023 13:22:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 From: Casey Smalley To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-ClientProxiedBy: LO3P265CA0023.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:387::10) To PAVPR08MB9674.eurprd08.prod.outlook.com (2603:10a6:102:31d::14) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: PAVPR08MB9674:EE_|PA4PR08MB6285:EE_|DBAEUR03FT029:EE_|DBAPR08MB5592:EE_ X-MS-Office365-Filtering-Correlation-Id: eb721ce7-3c7b-4f87-5623-08db980a2bab x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jOHPJ8Oc5DFGUmhCu9lp8Z5GLKpCjgLTMp6PyvLFOOnJZxxu66bzjQRIum4g7H85opCecWjnDh7DTY4y5lIhpSA3oCUivYyotn22iw9yBpxd5hsfeCFwhEe86TikL8cA3vVARsQXYZn+XmtdOr0Du9fqB/DSJvFY80f6+QWp30lSMQ/XldAzd9YYV1BB/ZlnCv1NtQvcNa/Ym/WwL932HUFT0otcl1KHvQeJZ8AHmZCKNpu89WQSQck6J5cdIOXkrBEJp9U5POlXaHk5N0U9k3Jb0zquXi/rRXM9RtyiWG3XH59A32R4XuJpg4cES0ya9F3d3XLiiTlrmPTbmv4I/LtYTSP6MXlWQtPgFWp4WCMWway0dM+FYn/sMTR3cVtSsmx2IIoatplt4zO6QTTSj7hGVyTbKhrEWlKCNvxYlBf8GB/CuVhB/I8DjO1/NMV0OL6/pF3uIFp9qddkRn8lP/srZvGNZZDzF2enXQyCpaEXCEHTFzd+TcDaLOZzpOn0HQte3vdrMFivKXgH+/XN+oMI3KmtXg/exymyL1PTwA4MmuirrsTJvLCzBx499GannZnISFUyHBj+doeW+dwejYKwv/NCp94hnwpqVASRywruUT/i83FMKxQThCJLLx5EGIErxYbZ7fWyAyZzn7JDzw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAVPR08MB9674.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(366004)(346002)(39860400002)(376002)(1800799003)(451199021)(186006)(83380400001)(316002)(66476007)(41300700001)(6916009)(66556008)(44832011)(6506007)(66946007)(38100700002)(5660300002)(8936002)(8676002)(26005)(6486002)(6512007)(478600001)(31696002)(86362001)(2616005)(36756003)(2906002)(31686004)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6285 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: efac61e2-9fde-4fde-ed10-08db980a2525 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V6X2kWTl/qbpCICf6zzZr+0tvFJurbLhZw4QQ9Hv4Eg6Ue9cRPlScYjScKuKDnJSku8KZGsjSoAadA+A96RP7hm3aSLTl+d9KVIQophqFe4ytWUqDmhFMqkrE1/DcokyufnjGY72mMtBxmcH6O3O+/W16EBRwqIteXebvHGDkpfAvw2NbddyUYirMRWuWp1hGJUuTLLhr4YM1wewrjrrYx6Nb3g8YPwJ2OTQC4wtrVKgeg9D1Sje3fnhnl2pvRJYGKUHvjUaNnnkefocczWs3CBVsWj95K3m2FQvOLhfh0LR5rMuTlbJ2HAL8O+50CWJWcjdMWEKrDA78hlN+dsAN7GN8qhgBUUZepwcgxCzB7jR80du+5/L7/VTL97ufznfyNtAWBciGgsKDLU8/AzgduivGuG2n9Jsxb2d5jtIBE0RGqUONPpM68m0c6GpLM0wlXlWWVD8vBTlWbx5XyYag2isz0nlJxxnSke6oJuzH7JIJTBhymq2tLeuda4KJ2Tik0sID36DzCEz9MGAOGPvsdP28JOMUl1LxidjVMscLe7ZI/TK8w6yJYwJnWGMx2wjHhzr+BN1ZK6PE+MHDu7WdI4aFDh/513+NczLzDIs4wfr3MvT9IdEjDLICzsdC8/c0h2vgWcr8QghwHKLq3Yd6qUjI0aYhdDGyg/IgsClRHoj2oL+UxmD238evVbZdBHZ6CkLJabmuAHh172B3VZxZwSuypaG5Iri5QthxgfV0UxhquiIHMGjq1ndqel3L2Hz/imfYar3/dxQ4bAYL/rQIQ== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(39860400002)(346002)(136003)(376002)(451199021)(82310400008)(186006)(1800799003)(40470700004)(36840700001)(46966006)(44832011)(8936002)(8676002)(5660300002)(6916009)(41300700001)(316002)(86362001)(47076005)(83380400001)(40480700001)(31696002)(40460700003)(2906002)(36860700001)(6486002)(6512007)(2616005)(6506007)(26005)(36756003)(336012)(70586007)(70206006)(356005)(478600001)(31686004)(81166007)(82740400003)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 12:22:45.2644 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb721ce7-3c7b-4f87-5623-08db980a2bab X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5592 Subject: [FFmpeg-devel] [PATCH] Replace br return with ret 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kupgb3VI4xJ/ This patch changes the return instruction in the tr_32x4 macro from br to ret. Using ret properly hints that the branch is a function return. On devices that support BTI a landing pad is required when branching with br, or the instruction can be replaced with a ret. The change fixes fate-hevc-hdr-vivid-metadata when on hardware with BTI support. Signed-off-by: Casey Smalley --- libavcodec/aarch64/hevcdsp_idct_neon.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. diff --git a/libavcodec/aarch64/hevcdsp_idct_neon.S b/libavcodec/aarch64/hevcdsp_idct_neon.S index f7142c939c..dbb3705670 100644 --- a/libavcodec/aarch64/hevcdsp_idct_neon.S +++ b/libavcodec/aarch64/hevcdsp_idct_neon.S @@ -790,7 +790,7 @@ function func_tr_32x4_\name add x3, x11, #(32 + 3 * 64) scale_store \shift - br x10 + ret x10 endfunc .endm -- 2.40.1