From patchwork Mon May 6 09:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1263826pzb; Mon, 6 May 2024 02:30:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWMLTOzokelbTL7xmyzLmtS5un84NWI9x3OCzm+ZzeADAC1NoVIgXSD6eVXwNEB5hsLZ3tE3gZbgv40y8syCeqrR3PqNBAZQeybw== X-Google-Smtp-Source: AGHT+IFQ5wi8kgckj7C4lHqLJ+L0KIffuGsISVuO6lFBIiZ1jqWbPI73w0MvNdhHDi3ixerrwmkl X-Received: by 2002:a50:8d1b:0:b0:572:3b15:a40 with SMTP id s27-20020a508d1b000000b005723b150a40mr6571750eds.33.1714987858466; Mon, 06 May 2024 02:30:58 -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 w6-20020a056402128600b00572aae836d2si4623848edv.462.2024.05.06.02.30.58; Mon, 06 May 2024 02:30:58 -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=uXSIYo2s; 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 E302968D5FC; Mon, 6 May 2024 12:30:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2097.outbound.protection.outlook.com [40.92.89.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63EA168D5CE for ; Mon, 6 May 2024 12:30:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YihFkyzOOyJPXbPAHcPF4suxo62DimfthSmxMz4MocT3zy2FGrOhWeRJVnkBmUuyTCg8TMJV4pien6FL+HmdTHEKRdIFpPif2yO3gh0+OebtmnJhgRY29yK+cfQL4iwNNp/sYabJeVxZA3Sm6pMEF6DiiLtLgmDPqS5Cp3ixXX0a/bjcNQ0gYjOuiF69Co6eNYYrii2kfTETK213Tf1tHV46URY8SzcPV2lRIFaUmn3dZj7KNNx/E469NsldU9VmDcg8JHi5ZB3js4lVmDJwDo03mkT/931vSRYv+uBPklmK19pnA+od7MSiC7hQ7/k5jcbvwGw5grzTRaBOLTwS3w== 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=SVFJgDb94hkfnAvrp1lzSFgzzFKDFo4v2fyzPCqdWWc=; b=VuOaSxrQhVe0dGuIIGd5lDJOqXlgH5LC3pMPIoZdzLkUdlEUSNt/hNWF+/2HQxHueJ/SghYYUHmQAsPuBLpAPPUgfegipbV7ceZ3k8NCHjVi6EDfnm5QmQEZhnbcd/aMt+72t86CkB0E71DANkxKAoGiSN/jKmzOG/KldLPbSJqustuyfxXit9/teL2rpPgymW0vST+m9hfDi8wk6PgoWHxe0dKGnp75/HwHCKwx1wyRJQRxdDNmOpnG//ycUm1v6DeqytslUbDQ69A+xrke3y0zKxPuWtXoiTJ0Qd9RyZ5Mej3Gd1xbD5HF9lN6ciYpj02Bq4TrgtMDuv3+8oqfBg== 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=SVFJgDb94hkfnAvrp1lzSFgzzFKDFo4v2fyzPCqdWWc=; b=uXSIYo2sppIs0Ym8cIMnEKxGJoVRLvjG1Mx3j2hXPryz9gm/F1nU27ZSUvKK8hEVtFzjB5oUaHR3hGKaSfmMl9jvAQX1Oe6/wRfYscEno5eCXasxhxfy/rpRp839bFjGs2IoP0sEFZmYQ77wVTq2tnxJEln9AH9931MJXyynHZ1NARJQeY14XTEKvZY51wkqrBUn8Yzb+ztOLZEftBdmjVMdSVbnOlsuMY2oO50m+1yROll+kGn7LGcn1cgJUsfvPzXEMHylfa/xqbV44MU/jjNBH1+FcFqM/9Ve9RMIy9I0njzPFEYhk39w7n5VD9QN6J7BVI6GlbZcz48Dp1QcHQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0376.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 09:30:47 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.029; Mon, 6 May 2024 09:30:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 11:30:39 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [aXPaipyMaaLSi3KXZM2nDS8HDk489jNyAbeUzQxOpbM=] X-ClientProxiedBy: FR3P281CA0155.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240506093040.4157263-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0376:EE_ X-MS-Office365-Filtering-Correlation-Id: c00d1daf-1171-49c9-41cc-08dc6daf361e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Gvcg8z1MbcUYOXJTLfYFBrOZNni66aHA2zBWbRrI0YKbwapMtaDaBUwdTTr0tqcFvrr2E7pLpFPKj1PhlMbhLV4QKjFCCkVLdkgdaoKkfNG8YXg8JWKhUWOICJzpRoMe25Bv+xEHTjmD/Q+MS6NkybW1d9/pHDAcl3FfoS6jBoqiagcijj6JOmHPkNPFCGXCJf9hnPxPUuPWjMQs/DrGZr0oSaZg9u7qzO2KdSX8XkgdkZ/7+5+B1QroA9syKvbENAdJzZFpP0bAAXugVDrQREd0f2oxQteK2RncRd/x0po+Vy53Gjm5Z4GASlgteen66IEVyiL8zxiAPW9aUTjqUUDCsMuc6ECgNufGhU9lHuER2mj9H4SGVaYVbussTp8v/DPda1tXbQzW95t7HRG2wfzyMgXt++7yhKYfdR9EVfU/Ayd9++QG4T+ZdgsIAaWuYtDgIub0c35CiIopNmq63R6Thj2XiMAd6Vcmijuxp4cvWvxa1FjT43oiuERwAXFZRMiuS6iRcC3Y3zHvb23NITclOFJCY3INaZCT0Bdawpl8WiwlLY81SMvrpxwOtQYtWGoxT/krHxN7VqgqNjVKtPYQXUa+d5G+pQ33PIJouj5IV1quDLERj37kCe9jvv3R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q88XtiqSSOS48HXeP3m6kVnD/6J7rSAaCHUQIMc+6zPrUXOHd+e3yANlYmlaiJvbBna4N3EFsAHlAjl/NUwUiKU4cLdl0C0D703dmMmQOP9lCLA43mHWbtob8Rg7ZHPn7T6Rwkc9CVWINts5gDYKeLpVHJXe/4G/MnoFhTjy728H08V3ADbbAk+RLRtA4sOLHLafdVQx5fI5k2Au40l8DoOh+zJrxx7FL/Sem9QtiBWCOtR9+BkQBzLE+p8TmEGgGfU88q6SmlWkAGxSiBKVdWk4S/XSFUS2HEYyh6mr/mtbnrgFy6y3oYbQVOoNP6GfC/E2pQMvY3Utf3o+pqJgYlBhA7BM5povjoquJFvRkMkjND1aDWUCsyi2AUc7XunjUIyN0+nmBWTQwIz1r48PvBd8dHB8qrL49z119dRz47TK7C/u79kWkbpO2I3RbCnH7r/3PUIYG9Zb6wMP/xRzPwBye+JvStS85rv+9WPvC12D77Y1YL71wt+GY0FoWCcR2N/XREechzjCcsZ+HQL621ch9CmAsz+7yVUnyRpBKO7bI5N76DMYSeYyRFg1ZKMUeZrmrNQviwynE8jQPnF+fd78z8IRnnW18/zl3DdkYg11aneoJ17jySO5VuM/HzVX5uyHYwRajGaSls+N4h9s+3ZSCF//kTVMMCJpPG+zZllsqqvdTgvHROT5weRBjiw3n9k8iSRRfOvKcl9o5Yr7XgBLMukEwYGmTBPi36E83aIa7C8HQkXJIy8pU+vcCT455Hbo+zthX1p+gIOEZFyvQ1Bj3ExPb/VubbVuI22K8L5ledvFyLE0h5zuKn3XUnQy5MaWMEMqRGfWcKakfhd6osepEObD5fhdgyWLs84uFLFRwkns1nBR9yl2hnTv3CKh6y+DmLA21UZN7u3xCznuPmZbvqdtiiWacDrs/kYQ8sdnJzQKEK+JGnu5SP9F+d3zA1EbK2U1ons5eBUqWSJri0nb5QNuDDQedNq/zmLsPeX990Y2hi0zp7rhEuzHwoNvrN97HyQ3IjX0VyxreSzX/sPhoTr+X/rqPK7QFghZO3ql8/D7wTCOaL2gzc/E49ZhesuiCnb0hoEzs7pMGJ/wnGMhocJBhSBLNVCNwEU84YOBBH3dM0Jh1V/gR+5/tPoOMkccyyKQjB9UFlxosGPTyIMvNiEYFPPT6SOtG4FuNJ3+/fouYW6y5w6v+lQ36CBO7Kl4n5N+/nYTSRCPU2uEhmG65vvP0R928HXZuUbavhHwH10AGUdF23xE1X2uTUqMnlq9Z19JIBxMTbnQlOsaRA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c00d1daf-1171-49c9-41cc-08dc6daf361e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 09:30:47.6597 (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: AM8P250MB0376 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/aacsbr: Fix type mismatch 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: uC/inaT00bq/ ff_aac_sbr_apply() and ff_aac_sbr_apply_fixed() still used pointers to INTFLOAT which is float or int depending upon whether USE_FIXED is set or not; in particular, according to these declarations both functions have the same type. But that is wrong and given that aacdec.c sets USE_FIXED, it sees the wrong type for ff_aac_sbr_apply(). Fix this by avoiding INTFLOAT in aacsbr.h (which also means that aac_defines.h need not be included there any more). Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec.c | 1 + libavcodec/aacsbr.h | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 72f2d7e7ba..c6b93e33a2 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -42,6 +42,7 @@ #include "aacdec_tab.h" #include "libavcodec/aac.h" +#include "libavcodec/aac_defines.h" #include "libavcodec/aacsbr.h" #include "libavcodec/aactab.h" #include "libavcodec/adts_header.h" diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index cd030aa801..656ef5258e 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -31,7 +31,6 @@ #include "get_bits.h" #include "aac/aacdec.h" -#include "aac_defines.h" #include "libavutil/attributes_internal.h" @@ -91,9 +90,9 @@ int ff_aac_sbr_decode_extension_fixed(AACDecContext *ac, ChannelElement *che, /** Apply one SBR element to one AAC element. */ void ff_aac_sbr_apply(AACDecContext *ac, ChannelElement *che, - int id_aac, INTFLOAT* L, INTFLOAT* R); + int id_aac, float *L, float *R); void ff_aac_sbr_apply_fixed(AACDecContext *ac, ChannelElement *che, - int id_aac, INTFLOAT* L, INTFLOAT* R); + int id_aac, int *L, int *R); FF_VISIBILITY_POP_HIDDEN