From patchwork Sun Sep 25 15:05:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1724049pzh; Sun, 25 Sep 2022 08:05:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5GvETdwjCw9uBdBrZBEWdTOoR3a9Zg17So9tTcww/fo/el9cznOYvT04I19mTKi+UhCdTl X-Received: by 2002:a17:906:9bf5:b0:77e:1ed1:b1b with SMTP id de53-20020a1709069bf500b0077e1ed10b1bmr15175029ejc.540.1664118320987; Sun, 25 Sep 2022 08:05:20 -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 hq33-20020a1709073f2100b007816bc05722si14243490ejc.683.2022.09.25.08.05.17; Sun, 25 Sep 2022 08:05:20 -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=GFz1Wq8W; 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 CEB4B68BC00; Sun, 25 Sep 2022 18:05:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2011.outbound.protection.outlook.com [40.92.50.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08B7068BBF1 for ; Sun, 25 Sep 2022 18:05:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EI7B5ucIp2WJgscsRBdTpEvDqj9HUqg/bXlGUT0u6jIgQ1luXQfRcjRKkTbQQiMw8KmaSyr0uN68DnwuAKzaN2W42FneBBDvuXX6WqjFBA6yx+X/EvNuZycC+lf2MvcMuRIm5VQ/X7dGG4wq4MHLwdzIPfVMEOqM4udmGNGpceHBlNF8Bdc4olTvjaZWIWqCaTHyAosxpQmxEsRVIl4JpmGIMeAdUcBHeoLXkXBSShKGLb9qTt+W7TcdhupdlftVGmlQ1KNV70P0aNUxXycHWVyd1vnFGyPedp/cF93J7HkUI5AplJXN+li+vqTxSJsYGtl0rN8W78UwcsQgSkFEeg== 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=mk+XDK3MFq8mXRvchxkelTU08mPnUguLVLScNy7yyHc=; b=SP0xUWd7OYgzXYUEXke8sidYiZlxrSc/AtoxSxs/WmGo03/vRf66ZV07hexfFiNhMwsIw4RWUcUxQcDc6khZmQ0WwokLjIHPKrRBPndLiT7D7jIioOU41iZpsueJb+zLeO1YC2RIrSFlC2ZGOG7EO+4mlhvyU5JZNsF2JZjmxNJ1WF+x141DBGzg/W3uya/Xh725M7CnZmjdKZWGTxU8r3aDbZd8VDDvrzRJN/cZ0u3I7otKGzkkuAEfcqqfp5H21sVBXb2mqoqvrwLGvhiqs/iBsS2IYQG3ebkPjQzo/at9qzWMgu+6PA86qYzWYXurF1MW7GvtSilIspcXv4gFKA== 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=mk+XDK3MFq8mXRvchxkelTU08mPnUguLVLScNy7yyHc=; b=GFz1Wq8WO0rO0DV+77M2cInisRcZARAmjQEwRYPoIpSFhY5yiXJm8VbpHTJWdsv9VN/Yk+paXeHFIneDNtrYSO/OPpmSnDsw30zde9/BBjwt3gwHvRYwwdw9wnN3N05XjsUEuOlZb1LeD3HDleXhK0X+yife+dzhD8F2JtuiweRdM6cjxH2jlvzaYYSmk7CBhVJUv/lEAAwH2Q3ZBh6+shbqK2u6G6B9tPqg+42nN9ZDundL8nYNKocvrsFl6QfDx6vB9LuER7dNWMCbE3jtldPMEjueBBKUG6truhJv51TA/EhpCwHGLHo/KCTS4HbT4n/SezUx6lZIIl8xeMj7JQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0298.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.24; Sun, 25 Sep 2022 15:05:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5654.016; Sun, 25 Sep 2022 15:05:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 17:05:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [tFsk8eiFh43S5H5Yb/BAgJtVjyBFTvVT4X9C5GbSX2w=] X-ClientProxiedBy: ZR0P278CA0057.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220925150504.2727989-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0298:EE_ X-MS-Office365-Filtering-Correlation-Id: c742173b-e5f0-4b58-0933-08da9f0754a7 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kzD6Up0rDzZ4U4HaxhYnjzsiWkgMpM/DosvCykh9t1O3z5GLBnsxW0mD1UEZlpDDuGFwQWSCsTfTVrCiUkNhpmtZhUpX9IliaSlUfYUPq2lulIqjph9mfXfxoaiPeGCrGtV20VR25sPVfnCoEzjvbmpv92m/SImBPfAf7baqK8MHTB0PN5dq2FvWy8ASS8kpkDgSB9Zi3TQnemnaOW4V/zb041Feun/dRQfGCkojApJYY6ZB6NoWPV0dSzWsjVbY0McUDQ1iMf0pV1touOJ3zntF98+zrenONA+57OEss3kkqkV9TZjLoIFB1mR66IBgAMhdTLUmtf4cvhtOyjL8gz0mMP64PeU+JlOBbEUrTGHXMCD0E6usGEFlYtKwu2JFJqdkV9sHII9cBmmGmzBbS5T68skl9A1EHKUAUdY2WrQWbPD8SkywdXy+FXx1T/ffqlvFb6ouOi2ZE53GkQJVCn19FkkbiYd2paY6CoIh1doQN7tutI9HHp8I7UvwoFbsCJWhhFsM6BWcVyW8LBq6aeETycqCcEUPY0UzLwK1Lj1PnEJq4k87i8Ike4vpl6PeFrl0tUxdtUIOc+e7GzsdEbZK0tpYA3W9WEsowvcfo8ALd/O5UwJb3Umle39C6Rrrfy+RtBAcN6485J/WU1fsWvh3mfOAMDZ5ExoQVAlMSnWKKnzG7kry5B5jk26798NB/Qo3QNKrSVKu0pb45WVr8OnmHbd6dOnVJ34FDZQYP56ZoT4+KKMRuK43VnMZjGjq/vh86ZDxZnKK1cOBG8kbhm X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TfbKDSmbIDuPTQILTKrGJN8mI+1xZjzYel0hC0BxcQlUok7iyKWB+v/hApbqRmWvrvsMOdlKG8SZap7bzqdMjLHHTzP8yCBiC87h/XLJ8Y0Ku4TZTK3jds5Dn53MTTPdqBHMTcj4FJe0sOyjqJ5cSPsZ9N/2El7j/3iP5QogpsZWDS/aAsvOEN+d1qwWtT8eXw9hiGpSYyhzZ6KEYc3DoxzBR3lsCeCMgs1B7zdViggqaGsF4ulKNkikMxEYxoZFE929qyQCyp3Yr6IRAkCARI52fBLchPo1ENxOL1ApRmvPKcxbHz/E3hWPPIlBL7hWf8e/PYI+cF2X+PpRwlFTfibbnaDoWJuAw0westBsADMkf7EZ6g7q5pfRiB9P+3/m86gnag9/O9HeTRmRUw9sV/dnX6VQB1pj7WeIVVhtboVjbXXx3VZSMr/xknNI3aHM6LlwGRVs/QGMAzBMBu/g66w1KUhMOqnA5BySYZodN8dv0WJbZCQ+H2fFrz0yxn5X02nxJXhyBxlnlrDsIHNR4pvzI9bOXM41CBE8skrpH4+yjjCz6fjouWSKbJKOLdFwfPDH+YjF42YZZ81+NtHgWA4kX1gJzOC7CCrEm3PPebdImBS1b7Q5Czaard89JbUty8YIaCFsHRmcALmGzlq3Ng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P+e6g20IVuELKwjXYeOy8t6DtfPKaWthwS2WCzQtQ/ySVIVZZ0kWtkqdm5Hk1/l5Sz+Z+570mU3iRhsd4OlZHQ+QmCA56qa25vcBSA3+ULY8gaWlE+FBrtq2hkhsY5O8Wnk0ix34mZXYlTe8Y9BRixhf+dWT8t97vOYhX28qaFRt2ujpl6ZACuOMmU7h1/Zt12YTzOsf3toTTVpBUqVeDwa/OIq8u4giKYDvqRaSVrGGcHLz5IjxogW4vkZwnNTHrhFp6EsifSJjB3usVmXkmC+WbPm48TDKyPEsiNtjeU0+tX8ubZLvp8jeqdJ3jZ9MJ2OVHQobu0nMrWcW2t2baysIZOd2bHSZU/2wHnWDdCfmyPlym22PoXxTsPHGjeIvI0HIIm2MD4jxufm7NjuA6okY4h9KHQQXXOaBcWJBJOFxxdZMJIXK0xIIWZAHwFi4p9tq2bJBa5CoV42iVuEAIRe3okglDvm6xs5oIjcUwuQYe23WKq6C4DaI5Qte8JU1pPoUAH0oCWeVT8TMzR928ELa+zl4dRJbbEG6cCRfUDw8CXrhfZ7KkIHTS8O4BXFu60wuvnUI+P/H4CIfF2csxS45EDTNEpCqqaiapxHez+9b16zp4D2dcjx8t+juD3xQykj1DkbZls84ZLCJqSta7CaMXjMFWfsxz7uuPtoBb2GW4Xk1WVE9CFn5PAM1Kte3g6k7aP/xhnY+3M2/N9lXRT6KpE0VR+t8IlZOIKtoCwkWUGEqDjw1eF27h/mWZ4/wU/MBX+Dd9MuHVGTu4suvJ+4ZXOyDUOWJYeipPZ0DxAz5FqIyhJsrT4MA9xE7NRzwsyufy++B/wWcvpParCa/bRaN3VDSpzUFsJBLZUjwg1ALEWk48yAV4a7dZlAaXxFo9Ga2Tv3fR8nB+nr9HLcX0rtN1Fbh6/OxkNnjHrXbpRfN7fdgEEseWifJBe8Pr7UFDZ7BS+y5KLrmS2KpvjPJLgXJ4vKism6z744BK/3tPzw1Q298go68EIpBJ7qWaS5SsLDWDqjJVzWK5/PeiW+Z36Ysw4tGw69+0W5Q9Gsj19og/+NKI69xVKqBx/PcOYZBJc/bFZ7IgCvgMZ8YhVDVe4pWKna1E45BakQSFTeZrDyp6kNODhIsdZqC3yv2M3zFOjPrKUtOMj/vsIacwo7f6Q62OutCiMnZ3NitQmebfBIvWR6SMy7cdy2lsSekMWz5vS0NcSmDQ/+mHQqRzJHJdoefIa+xhyJMjrgng/iKF5ND5deB8V13PkagLBoalatTvZxxvWnJu7kQw0kmt3lDcamPiN2I5rw+elqCa23+tpv7qA7mU7/ZIzuQc9iqBIo/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c742173b-e5f0-4b58-0933-08da9f0754a7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2022 15:05:06.2666 (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: AS8P250MB0298 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/amrwbdec, lsp: Include mips headers only #if ARCH_MIPS 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: InrhTwoonoxf Signed-off-by: Andreas Rheinhardt --- libavcodec/amrwbdec.c | 4 ++++ libavcodec/lsp.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index ea3812cd9a..b59066adcf 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -24,6 +24,8 @@ * AMR wideband decoder */ +#include "config.h" + #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/lfg.h" @@ -42,7 +44,9 @@ #include "amr.h" #include "amrwbdata.h" +#if ARCH_MIPS #include "mips/amrwbdec_mips.h" +#endif /* ARCH_MIPS */ typedef struct AMRWBContext { AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 90f2efaafe..9e7bc5f87a 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -23,11 +23,15 @@ #include +#include "config.h" + #define FRAC_BITS 14 #include "libavutil/macros.h" #include "mathops.h" #include "lsp.h" +#if ARCH_MIPS #include "libavcodec/mips/lsp_mips.h" +#endif /* ARCH_MIPS */ #include "libavutil/avassert.h" void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order) From patchwork Sun Sep 25 15:06:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1725172pzh; Sun, 25 Sep 2022 08:06:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zlZXiKChHx6sSiK4tOBurGdYbVj9fetVI620/T7obAcWhC9m9Pf88lW8TTMINemP6jtn1 X-Received: by 2002:a17:907:a049:b0:77c:1f27:1b28 with SMTP id gz9-20020a170907a04900b0077c1f271b28mr15772437ejc.20.1664118416974; Sun, 25 Sep 2022 08:06:56 -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 b14-20020a170906194e00b0072f2e1425a3si11133749eje.774.2022.09.25.08.06.55; Sun, 25 Sep 2022 08:06:56 -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=JrHaZIrQ; 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 0C09468BBCB; Sun, 25 Sep 2022 18:06:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2070.outbound.protection.outlook.com [40.92.90.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 619DA68BBAF for ; Sun, 25 Sep 2022 18:06:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ghm4u3AKuRDkT88fj7nYVTu4sVK9xJ99ud/KWP3LwHujezFZeQMI9T2oZrg8JzD+4fNBsE/4LzvfRUG7Wlf7r+htyPR1cf6SMNVAdd5PJbzlHivR6M2vEIBAk53lq7hPeKp6vvDhW+1EJGrKBhdfCLT5TIyf+zaF9UbFhODZCLmJonyUDUjn9nvh1ClT9jlD0Ti8Y8Vhto87PwUa0bBMsRs77VZV71MLDNH+Tnj5rUDLIcuRBiJfORGvKYeS9EESAYQoo/EFRAsGGnBTL+NiPhkPywXlblB3AJALm2PJbyjHHkhkJU0JJSY8F3CpnLr4CxquayxXVKsqrq638bqLxQ== 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=MgTKaNrc4JEU23BVzq2Iq+XQkKv/k0z859knE5kkflQ=; b=DYsaIeCYbBjxUl4PkOtBrLl8LHr8NSgPZ2KZbNF86MO0gt74j1gCcndoDkmiyOMBZSNx2nHyKHvmZNRkhkDiqrHeB9XJDGrs4xDQwkmi6VYDmyiK0WbD4SgGvwhFLWuaCyN6ZFuqc4PaPs6gO7RrwGsF7hPSl9O8aryQqtUKlIftiuObqDe59t7s7Lq0z824CKoJqCL75UU/TIj4S/ejZOUdiS8s3IS2Rl2ofjVgGyzyy+z0rHUaJCasHCIJFWEA9SItYbM/TnqgcK9yp0QdUOa0Qeh9z43N4xrSZnPSL7icJDyhzFCVJ2ICzztmBYOukOQeisiYSQ9o+rQYvfbK8g== 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=MgTKaNrc4JEU23BVzq2Iq+XQkKv/k0z859knE5kkflQ=; b=JrHaZIrQfTg7n7DLxXwTiGJgygxw1kV9WQN3mW2FnWTu3Hr9cajHnUJRp+3wkagvxRt0QoX6wVM1IjHa9t8ITvW7+WfVeVQX3tdHZp81PyrgdkTi3QeBNISefr8C3AtKM2tH7wKOxHMePsnzT2bPDpwkirk31J1TaieEKNV3Xskzj7Q5R1ySONeSnl4TRCnqzxgF2JNtoZ/Apl6xnuXPcmdS7YGW0RygreSZ22JTsFtdE/eawmla1Xj01eUopcavVNZ6Pr6yFC4rc4xcOfUy1ucCE0X+2N61SPNxqT2jgRnFoZoW2+32uy2XMPa/VsK3vfjY0ZeUuKHwcFwS6KAm0A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0241.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.24; Sun, 25 Sep 2022 15:06:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5654.016; Sun, 25 Sep 2022 15:06:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 17:06:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Uz6MfLQY3aW7r7B1dz1pX9sTx2FQdYcWMx8+dD+t2zs=] X-ClientProxiedBy: ZR0P278CA0028.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220925150644.2832447-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0241:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e81e6cc-863a-4d85-3d49-08da9f078fef X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHV50dRIjpPvUoZKIOJr1h0roJ1QYuTfqudSxwfHSyGIHAxk5zbDrMnDLLmKyICqXD3S5YLuZewD10ogz7aXuC/+VI4hx+FtfofHqyT76CUSho2FZJaBKPDTL1vJIudGznwJY+dDaMdjWtj3Yh/HkrIbiLG2eQfOWRi+vch8nALk/aP6mbK2JDgdPgGhh9fk/6o1U9bSWoLh/MBhqFaCcTq+hqaSpP/ZZc7mtZKbHKo06sAx+uor4G4WhubGRLrT2LohPtf3/HqLOVIwTQz9gehbYPyIpdJ0W7PwuyMDixurWqH0trQ4r/ANG+O+a/ygurqTjFFQKkI9/HLrt/EAECxnW97OnauRpMAzwy+n1d9NHSqVS/clfwRNuHIq0/QE/qtPTR3h+V9GuflFbAUc19OriH0a+2+8ulU6kZ3SX1a1zUEUm29blXCfMk2AWtMpsB9NV3Ik00IYIllxTVzZHUfVLiwEoIXCCpvI/0hUwSVZbiIhydNvB+RpA9UDjkxmaNpdGdQrRjsXPywhCWuy2Nc11PMqnhIFGoo8V6bvurDyBlWcBfLTpd/3ktvyDPgcB432pdW4PX6TPrPQq87caWXtFAN3fM5XqmZMxo/6oxENLge+II/03PzuClWdd7o66tmqGsxogv/JU+B4jJi5ruWNapYfn23UVdGqx2q81+dLZKcYgUeTQLdkFueH+fOzPZEbK3T9ZLyYeA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uHQAfirR2LNpnMAdZp3/FmCZK3I9VeWiqGkri5Y3qdhMGn2qdzw9qLOl8g19ENjSj3jvkAx/VKfhXeKhqoT24xzArgGLgb9Rxzz9ihoGPB1le80Zr4sSJllSbUpllUxlHAfj8ynVctypQ40MiTEqqCdgquCyURZ0OStS25asr/HQLdPdLkOSyntUzjhA7C56sygPjMlKpONGv4qrewb2WSu+Y/bGOltM4+haGyGO38tjqxo5Ui1AatFjRg8dGYyM29DxEh0dI5BZx9xhhXeCIUVb2sQImc7Jip8881bgHYazB7IP+zXKHikAOE/sXiFeFXStk3SomihNWhW6GxFbkM8PDYbHGE12BmLwY9nOLLmZoEZG+R/i/b0MoGBOPalrVJjg3tdc8GFdn43fBvbnGiockq78B/mCFbDYhAKiC6hAGW0EMIGq5RGYCiHU2wQTo+7GzioEs6iaGEpUW+Ea+fFlylqgEsffwv1f1eKYpJBeSFckdlnyzTqI4sHXreh3N/pfTD8gPqLXZJgH9UM0s3xQyv/y3raWWq5zd4Ejt8EXQ2vU+8aGaDDdQRtNw7QeLEx5oXNntT3Z3BvqrvfFBxqzWw+MmP5MIF9AJ1GltDkeLgV5BCuFJwnYLzxH7SLaVNdkSFL/SZ8Mg+tLquARyw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8JhjNGPTf3OsI1bsUFo4t0u5BTulTaxEAiUCFe3EYDng3vM1M//dIoTy8xOC1ytZay9nGlNrlydJf52MV/a4Hs7lNgtNJbMYFdU1/oc3X18tX8OK7V2yvT7TunxtbL01ujjG8VBkNJYZ10EGYrh+pvI3j4JBIZu+zfNSbvwGCXpaKVO7stwloZYTzuB5yGuhMKba9QZjbTb+g1DezikaSy7CdVQMv8P95sAY+VPuSSwk6ahCix6i0UkLyNM3RV+CxSVbW/s2ttC22PFFdDKeQ3Ff4oFKixoFRBRT3gIFYsnl3v06JAXxgKCR7YiORKWUZwHamEnRpnKBPCgacEFCNLm92gGrbCh6BVaeholTvGgcMauloIYPQXTi2uFzggE+ItEJ3bs6UxtkTY961ujFYocnCN58GeQIbiTfnsb/TR3yfHOjM3hV+Ht9NfZj2di7A+a7ZrQ+qLIxMHPdaLcnk9l+y0DU8qrt1EMcUU2hYGknokaGsPJ5IkzlNb4vlt6Yb0ANNtzGzpkpwv+efoAVNdtDx6CBfv41Pv/6WTPk4A2ANBVwA/7QFCZ08M9lFyd3FsDulx4+yKKE6GHBULszqXzgQrv/b4IBY67KWK19quWHiC2vNJxeEfME2vl4dtgiqxpsiZXr1IyFuO8wLMHxGAL7S6wKKNP6z/ViICjcl8Dk1Sfk7dg4NmUwLBPNJAsVn2MQsJbUxw7BNSYKR8feCelh3nZPd8VLbsGlJmUTT46Yv0f/+h8vsb8EPHPqckjUQ7RQ1/DxmjYI0sAz+2v9d27KKAI7Il3+CviAjVYrYqnGIpkgpaFpLWomcUK+RqQhxPs0rTlHOeI/D9qSLHs7rLqqHsx7dXw69j0KbK8NGBrHrIZWpsDxTsm/O9V2ymx6cLuO8XUehT0puKrirEXKX1eV1ln1F3bsa2CHSlHSfQ2YNljRslCIHwY273NFwBpRqbwn3bwWjNg9logBui1KX4quLVPuqXdiOk55q6g2Pjm8EwyIH+x3DSevpk4nx+AM7vNDB1nNsq09epSZlIkqBPdEmv0+OyTITAJw6CrtLES7nxENWg726oL43dFg8mRzmQMlCfnW2428buGbtV1yySuF4z6Ho11qib/IWwueBChbtXm5e456KHzmO7exBW9MUTBpaD+4yUUELM2ZNGsnzjmRDbgu/KdXpqjzEFI18o0RbsBnUE0Svge7GucEMLpA45zm1ljnE0ZYL47JENBCFqsZy3ULD7yWa/KlKnVJ6yvC3gGvqlt7DnovdMmafAlZ42lOshsB0C/ixxsrn6zETGXWxy3T7zSWIukZ/yCWhsh4YBgyyUtchPfmashXZN1z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e81e6cc-863a-4d85-3d49-08da9f078fef X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2022 15:06:45.6487 (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: PR3P250MB0241 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/lsp: Move ff_lsp2polyf() upwards in lsp.c 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: GokMbF1HSEHN Will avoid a forward declaration lateron. Also adapt the function to modern style while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/lsp.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 9e7bc5f87a..9536d8078b 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -124,6 +124,22 @@ static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order) } } +#ifndef ff_lsp2polyf +void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) +{ + f[0] = 1.0; + f[1] = -2 * lsp[0]; + lsp -= 2; + for (int i = 2; i <= lp_half_order; i++) { + double val = -2 * lsp[2*i]; + f[i] = val * f[i-1] + 2*f[i-2]; + for (int j = i-1; j > 1; j--) + f[j] += f[j-1] * val + f[j-2]; + f[1] += val; + } +} +#endif /* ff_lsp2polyf */ + void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order) { int i; @@ -191,25 +207,6 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd ff_acelp_lsp2lpc(lp_2nd, lsp_2nd, lp_order >> 1); } -#ifndef ff_lsp2polyf -void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) -{ - int i, j; - - f[0] = 1.0; - f[1] = -2 * lsp[0]; - lsp -= 2; - for(i=2; i<=lp_half_order; i++) - { - double val = -2 * lsp[2*i]; - f[i] = val * f[i-1] + 2*f[i-2]; - for(j=i-1; j>1; j--) - f[j] += f[j-1] * val + f[j-2]; - f[1] += val; - } -} -#endif /* ff_lsp2polyf */ - void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order) { double pa[MAX_LP_HALF_ORDER+1], qa[MAX_LP_HALF_ORDER+1]; From patchwork Sun Sep 25 15:06:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1725250pzh; Sun, 25 Sep 2022 08:07:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UZvLScT8qcBs/hscujnVG/SnuKiaMOKk30teFYxHiNoVOPQ0me/RmkLU/DKi6YBeiMBOt X-Received: by 2002:a17:907:320c:b0:741:1e55:7a69 with SMTP id xg12-20020a170907320c00b007411e557a69mr14953564ejb.740.1664118424642; Sun, 25 Sep 2022 08:07:04 -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 q21-20020a170906771500b0078183bdcafbsi11265525ejm.164.2022.09.25.08.07.04; Sun, 25 Sep 2022 08:07:04 -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=Ga33o5MY; 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 1696568BC10; Sun, 25 Sep 2022 18:06:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2050.outbound.protection.outlook.com [40.92.90.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EE7368B3EC for ; Sun, 25 Sep 2022 18:06:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mm7NouvqGbS0ycdWrFzdWgvST0QkwzJCeD5+JOcuBtU9f6FoUWyMTFnH1b3AKXhQ+0PFlWfH0qD+Oq6Q5yRQygcNUblF0pN/8GpEHIJTdicH+cmQT77SaHJVL/6Hy0jQUhzCHZJHsCwOIm/tDLvYKhNzEwOTfzqVOxAyJS8GlfhOiEFwcK0Vy7lQW3beAZe8gsQc440oIQsBRM9r6oojTkrbmGn5Rvke4D1KnSodUsbYdVLLMzxqYdRDqkp+sM5ywL/yHUshZSbLdLsS4haeUOu6JMAgZzSJwhmwwMQxHiruj1BJJPNYhvf6zEcY/jzIw1Sv1HP0pHMIOgE7HiS90Q== 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=F04j80I4nRMmARnOLepHDeZgS7fh0S4k/F/bAw5VYbs=; b=coZAB+C4LAhwtn2bHmAyZeJPBhGNCSi0g1mGbgiD+z3JIBYym3D5HtZBjGePbnK+IrFGRcxxNPVz7BJZD9bKeLg6eA0t2+OCb4iLUg08gyQYla5SXVb/3Bb5lOclbgdfylZiFuoYB3V18kSGdQfoLCJwSqCC+WcWcDq+JiwjApY+l11RRsCOlp5F65gaO8L8x9DZOK2EiwIJLdPHJcw7Vm6YLZMF5xAQArHm/lDAaQOGxT9A58OHVdaH9Fv2ei7xOG97Oe87DOeoOOEZ7G9QI0PCKoKnaL3eY9T6QYZqcYQtcmVs2xJY3URDXq7UY9vhRk6kEfxBe1AU7TWhBmIYbQ== 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=F04j80I4nRMmARnOLepHDeZgS7fh0S4k/F/bAw5VYbs=; b=Ga33o5MY9+/IV0DLv17WTjvOWDW3IzikMDRiKP8WxabC27c45z2e64AUwQa9HWZyFLyho4xM6XZf/zFKrXyqI93ER6+YNEuRP8Gg6iGXf2upxzTqF3BTElYDMOcFA9P8SFJiyeJMQdrwXYNS8D0nwQgMKQpmUxho8MJzYBmyfNO8nFWXnOoAczKs8OZG323gAGNYg6x5L5Ga8Vz3muL3cm4PLt7FCoNcVnOvROmiOD7VRdNbwl0XLlSoTEfGr+YHkNa8bpDwydO4KjtGtfz4uH86XiltVGQoC70N6ucqcDWWOc18YTsC8HMbEFf3YJUprc4Jl066GTxsZoJ79JS0GA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0241.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.24; Sun, 25 Sep 2022 15:06:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5654.016; Sun, 25 Sep 2022 15:06:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 17:06:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ngFM4h/cNvxkYSXAKRDRXIaPJKPQsOgpKg/KA+8PcXo=] X-ClientProxiedBy: ZR0P278CA0028.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220925150644.2832447-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0241:EE_ X-MS-Office365-Filtering-Correlation-Id: e0d8817a-a7ad-4896-d91a-08da9f0793d1 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxLc5tmG8wxoTilkTeNb8efEUCiTxXkZDAKokRNhS1wztoKTxoIWmJI0Icrbc6d9ahEwsdNRi3gsqvrP+0lxJQmZYM2ix5TU3XZ1j+j6teNhIV1pIalNWR8A1Dgdt2ZPjhZAx1HWbsthZlVODT71NjQB+IXpLX1XR1n6HbOX+thfFXXfBbd9NP3/lRQ71XCwlmf0IahwvtpzXugQgMOZg97VVFikM1j+4LLyoK348BkMQ+RF9lmJU4qG9KdQIAw5POsNnKDW3rdXfqxStROecA8rbCR4MSRjHD4k5PY8fs/YNccmqW/4MB20QlP8Lbru1DoIFds19FHTvGsOfm7ouJaqKHhA/gMtEa9nHgjCuzENUgbnac4c7Pu0eFMisPDnz25z5PqtynZvvah2mDRGNJEnfJbSvyFysb8pLVuct1E2iHGQGERFibFqiNoTK+XB5VdadDmH/rUQOPIXsz4pWP9DOF9A6IOFgHSlfFwPtoCxVf53OUDiErg+2zEHFV/wdnfhzAQ5+rh+xE8fYf/4hyZCu2S+l6JvRjfZ+fOXeg2zs3qy2m0VtZWDZ49FtBhJTDNSJnDE9QhDG3GwYG9S72YDzL6yzB8WrXBDml4cKb2XSvJAlf7hzPNmUzGs4l8fOXW6raHAw0pe+UrjhA2nqZg+12iubnXAEq5te8hcFFPOZwXWB6Cv52bWkEIZFiajEPOKbWJSHSbWKgF9IqoboAYtrieKlbryAY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EAP8C8LD7aaMpJkXT3Plhxw0o7FsnSws19aIGt565fI5y9qj2pHF6VReN3fuFBZ4nc5CHvK6tp/30X1s8EEWD3BVthy0YuiFmZ1K0hG1cG/f8wVYy8rla0W+qer+h6ljMLZ75Ejhgmmpe2W5j0CAQih3m9OpRl5p4hordi+xaEtqU5GXj0sq6/qO5KWcz8EWioGzaHZtpxKW8K5eZKngYMe9qCyP2IFU8WOpI6HimNPU1yKdO6DZrRU1mym3q8VfwHC+aOuqB9BORe7PtdiL1agMpsEK1zk9kRc57O7KX9j1Pa520rjeZM1ZPCa96Y6EKpXwxEKRpYdgR7yhkqA0r3SFBSyDSRocN2SVGcha0KlWmEG007XiEudUAS8QhM54kXeiHx6pRaGAPq6ayZZAahSDO/5HZ2kLErStQu106j55FjB0S8CVDO4a59PMfvFpO1G7DQ4A6qq18Xj/EJE69ogM9rV0ijRy60MZllgjgm11bv+fG523poPRPC40skwxVRzpR+7HmN0ee6mq5T1+sS1JPaQ/WRHWMPz+K6ws4NbMXN79ZIzVaJj+jgxsrM194/ABbwmvC1g2KcRAmZp8FkecE16nJlus0FTB1GfKENpzK+BPUV0YvKYX8Q1DiEScLUmSjX49W1tyTZXcAdwBSg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1eCvqUaQkNVnxL0c0esLo8c+pDKdThnIjleF8oas9fjdHpDIXi9CwM957+nLd9B84PyugtInCXYiMXGbp06Qwz1E8vNM5LfH5u9+8hNih2rLcK6ytImxhUbLvCkImo2p4rakVFBejnyi13R8bbDPTFP9abJzGwAnApnDwLJ9oPoEMibQKkd2p0s1qCVn6ILvxZbLdumVoKq6MWJk8jx+Hy1AASbcCwy6QdcyHAF2cvr3B0pFRuobPlVLJVZHcvWZa3SEe+md4LO4sGcw6dzrdYTtFZ+h+R1SE89UuSS6ChFU/ssONOc+/h8kzLVoCyhF7BUXxqg48wXT1W9Dj/1LbRGObl8zEZlSEwRHois+nwlW7qR2e28SSNU6AAioPfGG3La5MHRriqyzNmgDj7cMHq/Q2Q+oVCvDsqOFIveD/3fxUB1v3dwypXqbkFl/Yr3Oh5sXi+FH8rpJUbV/b9vaa650CGkSHAi54fIYRdYYXriFq79Umo6FEEWXBhewHqph6fit+lYpmUhafRMNxg9nS7bNkwtwxJpHp6NrKCRGk18xu/B7DH9d3Vg4n9cxH1zu/lRz3x8uShOYL3zT2WTL/58LtKQv6nxFYo8jsiXQ3IGysI8ZlF2nu8XfdiBqkFDw4IXXEdqCcjB6H4NMZGjOFH2yx2N7abs7Sij1hLYZZgbMxF4M9VjlnKs+mW64Fm6cnQyC9sVlZOOEnjgMyvx2MbjDHfM/4Ub+05y8VSPiak+pQF5e1MO4Khb2CI/KEtvWyt7htGgBtHERtNQOU5FpfAgXNG3I/Bo2NgnOmYikbU83ZB69ysz0kzmuNemrLvKqeFD4boJda3k9oF9eFyfbf+3cSw4j9RX4UZ/dPo92xH72NgPYtpKGSIAsp1USxkB84i5c6jzt4QlMRG84pxWSj7gSzibo25I9V1Getv4tPyAUkqKD6qoeqr1rn/MfsTVgMW1LDWkblk9XaAVhI/JfnQxTot4RxVXrvSXqQrBe2HwWlHBqiG2QJOy5u00HL0VKxdMp6mpRJfEO0+k4wLb6/g/QwQcFhUuGQOTzibpQa4HJPL4zPqU3i42bPz0uSrfyJaa9bKlC+soAdEES+3ri0+Z2esTcIUSFka7NbTpDp0oCkHezMfYc/EByuhXMtrd6RYuJLgCL56j/nnhZsZDceAjgSzl3j/qhputQHuWcnrckQavg8BhtCJIkpB385VuN9R+xUZ7ZYeyhp0oVuYT2oLvLfmf/OLllkTN2FXyzWBB+KSx7GCV/MP3TsZe0IC/+gPw2XQ3V4lMn/RHyMfGppuR7MFvRPZHniUPntmXuWgIVW9F5ZNkuqpMrFRqC0D4S X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0d8817a-a7ad-4896-d91a-08da9f0793d1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2022 15:06:52.1655 (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: PR3P250MB0241 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/lsp: Make ff_lsp2polyf() static 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: hTXMa9d41ZJU Possible since 48ac225db2563fe534b1d9e999bf8e70d5a577f8. Furthermore, the current code would not work on mips in case ff_lsp2polyf() were used outside of lsp.c, because it is not compiled on mips since commit 3827a86eacd04d9d7b356f769be553f7b8cca361 at all; instead it is overridden with a static av_always_inline function which only works for the callers in lsp.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/lsp.c | 24 +++++++++++++++++------- libavcodec/lsp.h | 12 ------------ libavcodec/mips/lsp_mips.h | 12 ++++++------ 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 9536d8078b..275984097d 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -124,8 +124,18 @@ static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order) } } -#ifndef ff_lsp2polyf -void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) +#ifndef lsp2polyf +/** + * Compute the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients + * needed for LSP to LPC conversion. + * We only need to calculate the 6 first elements of the polynomial. + * + * @param lsp line spectral pairs in cosine domain + * @param[out] f polynomial input/output as a vector + * + * TIA/EIA/IS-733 2.4.3.3.5-1/2 + */ +static void lsp2polyf(const double *lsp, double *f, int lp_half_order) { f[0] = 1.0; f[1] = -2 * lsp[0]; @@ -138,7 +148,7 @@ void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) f[1] += val; } } -#endif /* ff_lsp2polyf */ +#endif /* lsp2polyf */ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order) { @@ -172,8 +182,8 @@ void ff_amrwb_lsp2lpc(const double *lsp, float *lp, int lp_order) qa[-1] = 0.0; - ff_lsp2polyf(lsp , pa, lp_half_order ); - ff_lsp2polyf(lsp + 1, qa, lp_half_order - 1); + lsp2polyf(lsp , pa, lp_half_order ); + lsp2polyf(lsp + 1, qa, lp_half_order - 1); for (i = 1, j = lp_order - 1; i < lp_half_order; i++, j--) { double paf = pa[i] * (1 + lsp[lp_order - 1]); @@ -214,8 +224,8 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order) av_assert2(lp_half_order <= MAX_LP_HALF_ORDER); - ff_lsp2polyf(lsp, pa, lp_half_order); - ff_lsp2polyf(lsp + 1, qa, lp_half_order); + lsp2polyf(lsp, pa, lp_half_order); + lsp2polyf(lsp + 1, qa, lp_half_order); while (lp_half_order--) { double paf = pa[lp_half_order+1] + pa[lp_half_order]; diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index 621ebeaebe..26b1382eda 100644 --- a/libavcodec/lsp.h +++ b/libavcodec/lsp.h @@ -115,16 +115,4 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order); */ void ff_sort_nearly_sorted_floats(float *vals, int len); -/** - * Compute the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients - * needed for LSP to LPC conversion. - * We only need to calculate the 6 first elements of the polynomial. - * - * @param lsp line spectral pairs in cosine domain - * @param[out] f polynomial input/output as a vector - * - * TIA/EIA/IS-733 2.4.3.3.5-1/2 - */ -void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order); - #endif /* AVCODEC_LSP_H */ diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h index c69f8b770c..2d67403888 100644 --- a/libavcodec/mips/lsp_mips.h +++ b/libavcodec/mips/lsp_mips.h @@ -61,7 +61,7 @@ #include "libavutil/attributes.h" #include "libavutil/mips/asmdefs.h" -static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int lp_half_order) +static av_always_inline void lsp2polyf_mips(const double *lsp, double *f, int lp_half_order) { int i, j = 0; double * p_fi = f; @@ -88,8 +88,8 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int "addiu %[j], %[i], -2 \n\t" "ldc1 %[f_j_2], -8(%[p_f]) \n\t" "sdc1 %[tmp], 16(%[p_f]) \n\t" - "beqz %[j], ff_lsp2polyf_lp_j_end%= \n\t" - "ff_lsp2polyf_lp_j%=: \n\t" + "beqz %[j], lsp2polyf_lp_j_end%= \n\t" + "lsp2polyf_lp_j%=: \n\t" "add.d %[tmp], %[f_j], %[f_j_2] \n\t" "madd.d %[tmp], %[tmp], %[f_j_1], %[val] \n\t" "mov.d %[f_j], %[f_j_1] \n\t" @@ -98,8 +98,8 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int "ldc1 %[f_j_2], -16(%[p_f]) \n\t" "sdc1 %[tmp], 8(%[p_f]) \n\t" PTR_ADDIU "%[p_f], -8 \n\t" - "bgtz %[j], ff_lsp2polyf_lp_j%= \n\t" - "ff_lsp2polyf_lp_j_end%=: \n\t" + "bgtz %[j], lsp2polyf_lp_j%= \n\t" + "lsp2polyf_lp_j_end%=: \n\t" : [f_j_2]"=&f"(f_j_2), [f_j_1]"=&f"(f_j_1), [val]"+f"(val), [tmp]"=&f"(tmp), [f_j]"=&f"(f_j), [p_f]"+r"(p_f), @@ -110,7 +110,7 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int f[1] += val; } } -#define ff_lsp2polyf ff_lsp2polyf_mips +#define lsp2polyf lsp2polyf_mips #endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */ #endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM */ #endif /* AVCODEC_MIPS_LSP_MIPS_H */