From patchwork Thu Sep 28 21:32:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44003 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp153505pzg; Thu, 28 Sep 2023 14:31:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfTkePgAOEIAmEpIY/SN3gb99JN00go1OcNP8pRpY1hJmIAvIDSMoPw3cvV9mmhcHk0xqt X-Received: by 2002:a05:6402:60e:b0:527:3a95:5bea with SMTP id n14-20020a056402060e00b005273a955beamr2131321edv.32.1695936699694; Thu, 28 Sep 2023 14:31:39 -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 h25-20020aa7c619000000b00530928953f4si16182752edq.559.2023.09.28.14.31.38; Thu, 28 Sep 2023 14:31:39 -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=ifqsAkkv; 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 34FCA68CAF9; Fri, 29 Sep 2023 00:31:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2075.outbound.protection.outlook.com [40.92.73.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99FE068CAF9 for ; Fri, 29 Sep 2023 00:31:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AgXxAlEnjurxe7lTNiTy6Xeo3PIc8hqibtEH8wi4x1qb8l/xRZ3Q/a7Jagb8toh3oK4/H1a3+g1KyKR3acmUglZCVPAgOrazObKEIKR2HjWWYmx2XFjiAg7afmaa5n1v7YXOUC20LIB8t5RpGOnLxa0FQYRLTRHwcaVzoHMVf8UdfRMPnxk9+I1Iy0BnY5YKtGViI4zmGdi2efC972I1MfPHH66hZuhEGrBfoMsWcLXu0QGKvYm/LaSNagBXyqIFIYQ7QFUZ5v3gBgYhcOQTdaAacxI2as/WsSu1nFbnBrCNiTYAhv4kX4urUCZYOwI+xJwsOHA+0pVyJaJpOpvVWQ== 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=pYUaUwdc8iRzBu/bted/n3FgtVnp3YzpTn52DHfqoU8=; b=lJ+FKWq5qTSl6TQLiWzuwVn3yZa87kLcOzhcpG/XAzKge33Z63kLQrRfu4/ft5EPi5puZAM0Pz3z06i1ylMMCXtbAxTK+zr8I7k8k53/+VzZhJNJk7l/2DuiFBrWf4b+W9DO+hZrt4k0iqLkJJ9n3LIFDPvvHOt+BA7ySIOCwZuBLF7/IyziEcHWAS4+zqrbamqFuZWoVA1NeNY2CtdPO8J3tNBJiVU4on8HEcDhhun5X1JlMLDZ1nQLlDWmU4WrPDGSjll2Ae9ksoEto+bqMU+V8Tk7QAIVgHKwYX6lNnzngLNvfQAQdC3Zrp02974b3nE40wpiGYygC6wfmF1oMg== 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=pYUaUwdc8iRzBu/bted/n3FgtVnp3YzpTn52DHfqoU8=; b=ifqsAkkvYwVZZtLZkQSxUeL6Qihpd821907iFy6yyzxMTGL2F5suRk0Gpp2OwbZgtU8rbQBPs58GW1cPJTSnW+VpREWKqXkA0wCH7jaxh82dqdHhDel9OrlXZ74LarqM0XkNffba7CNaSiUnNfaVVKxUOsIJl+ob84ZgZxpyKnZoRtw6e6z7cnCMroDwC72BLmtxew36neA1WhdjvzblN6GTomIWaVLvAQf4XGldJ/lH1SJ01e3XeWRkU14u2CjIslCVFF9dmNlKsSHiOa7AJ1MDPJmTorb9Q7euuZjvUz+7IWOZJRPx3U13CDNoMB8ZyZNb84Gd7eHGWkWg99EGZQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0193.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.36; Thu, 28 Sep 2023 21:31:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:31:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:32:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Sza25Fre9N+/Ki96oOT8QE5r3UxzqAlQ] X-ClientProxiedBy: ZR2P278CA0024.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213232.1181920-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0193:EE_ X-MS-Office365-Filtering-Correlation-Id: 99337a50-22fa-4a06-87fa-08dbc06a453e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0/O1k69mZBv67ODmlOA9xW7JnANyGpAnAgYAX3EMBVppHPeIBohBVn5w+EpqnIBQ74V+mOkUhw2mraUqwrbaS3wYdURqpm9GxgB5Qqj8BLCFi5EcQyiKPxmc8zuvi8ZB4pyYucA4ng1fbkiN1dhETPpg6l/T0bt9MI4mPaQGbnLtVKohSXmC3amvXyC/E1HlRBY1aLHosjnAHWOsQ9xdSgjgeeaYwfiTAHGNfV4aLaWdeaUvPGxd+EyT7Dd3aW8CDAcXi7SNJyeegPwJdQftXO9vF48dRrOwBki+EEx681DGY3O5NPNnOvZjI49LucdblyuoU+Cy8eRlw8zbEZtknkFTJjnB7xCjWXSjBlq3IOivu9lWEGrIH4fv76YFuAqbVWiFp+x2BMs5wO+J/YId0d7HA3iwGzNkMkEQXkwIe2puDB9WPEn1oPzpcsKDw0kftd8XzCrEja09SX11alvCmeGcTKD+19yoOMvv8o8DbHYlmRgJhCIdI+WP5HmGAAOXEYNMxTn4MkO3IA4I8MPVuZOw5TmE2wCD9+klzaGEFrCjPQmoT/opXm5n3g+H7DIXXncXo2h4thjiqknodY6/iTCTddj+3GMo/4xySnggU6CiHnU8R+mTvLV2S/vNFHtl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 17nrblHvyStd0i0et+iH255qTeI7dWi2PFSwXheWmKmX6Be9isgY/5Kua681cUZf+V7meMz3Hcyl+tQG6ff+taBpMPigdlg1SebIpypYjU4FiWyoFh92eMWTBldPrAhCXdNOloM8lc48b8eTJTajhKX5BlNIINxn8jHvtnlkRQre7bSWpJmxa9SAoaMeI5az5757aZz7TvKin/2wc24OWEtu7Z+0qUWYkvCeHgvxus9GdOu/cNf5XajOByb3XwGCWewxAFqO1oK6qI7wEbrnruIFXBq4x1Vq4ECxrzbMMohzmvnl8cUMReGFf+DTNIbkeBdAppQsdk9jv9IZZMbg7MHbwThV1/KCsuus898KAkopSWvDX/M1xJvhBJ6F51SLyb+zrTMLJ8xB4dW98/8sEizY9WLRd+d5JEQjgi0U4lu1FdW33T2CCOh+73cmc7gKu7Lm6/AB27x9TKbImB6rWWkekPlaAkpOoHm7dEFZtFUUsXqlH9Bxiw7nIsgiTPk8JtX5jwTuhjC+LebDen/CqFTDm6An32vqlSsmrqwgdPP2vfGpQzmcZOvme/xNjRM1Tc3qoV8M+JyD7uq51G09LzMuyxU6AyrWgWqHS1CVL5VMVczoe8W09ZUWyvTnfzBBeN3AvbBYWAjFrcQ+qVC/Z8DMzR3dF91STeSG+P7hFonTA22mfmN+kwqKZuVSt9vF1Xsw1+e86+vEzVx6FZ3eOTptkHMNnmla60fK+ow1AUW+kA6Nvpta43I+R1VVGaiMfj2vnskfGzhlzd3KFHqMvX8DmDsB8Vxfm4n3HEHLzpp0BjL/ndEKVm4CwBmnD2VAvmXxKKkxEu9gTj/xDsb8Ro7ZkE9ASzE0qDOmO34Jj2ya+k7uoJBlZ4E32AKKfkroDMl0eoD6aGRWe8y7iERCpjXPy5DVWg5WPoOoSzeZJF/ypXf44SLLKAST2jFfCz3UJh1bRaB5zSaQNSUAHswqcJqHbR8t3SqueK1ffDJQXeeCX7vZlY52QEVPkK/eT5IM4hWW9Jj82ASd7v0Dw5Ll8E9ofXiFSFl1O3Cv2AIA1Q9XtHkcgONxELWUWcoo8szlHz8Sr8eETwpTvHrdUp0uG/edbThBtw0erFUuwbkwCSowX6+heXJPL2AQLvvb6wALPHMNhOcTrUPpbDxXdxn6+jkSDdlz53fMaz+h7Oi6wqyJw2oCiZLjmQipk15NznyqKzprLt4enOFQmhyozX5/o5pLeLXfD85qzTElrLaHSTEIYbhdytBmok8cVVDZ/Oij X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99337a50-22fa-4a06-87fa-08dbc06a453e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:31:26.6856 (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: PR3P250MB0193 Subject: [FFmpeg-devel] [PATCH 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies 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: VSzseGLM8Xnn Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e1afcaa586..762311ae51 100755 --- a/configure +++ b/configure @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs" wmav1_encoder_select="sinewin wma_freqs" wmav2_decoder_select="sinewin wma_freqs" wmav2_encoder_select="sinewin wma_freqs" -wmavoice_decoder_select="lsp rdft dct sinewin" +wmavoice_decoder_select="lsp sinewin" wmv1_decoder_select="msmpeg4dec" wmv1_encoder_select="msmpeg4enc" wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp" From patchwork Thu Sep 28 21:35:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44004 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155087pzg; Thu, 28 Sep 2023 14:34:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFMAZn4/NQs71QW1z3TI80lKb5m/cXxyBs9bzIAODXgkC+WZve9g3eZFr7gySynokmOw6g X-Received: by 2002:a17:907:8b8c:b0:9ae:5898:e278 with SMTP id tb12-20020a1709078b8c00b009ae5898e278mr3167662ejc.59.1695936891396; Thu, 28 Sep 2023 14:34:51 -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 t14-20020a1709064f0e00b00993686e193csi15967340eju.53.2023.09.28.14.34.50; Thu, 28 Sep 2023 14:34:51 -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=n2yP9zR2; 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 6400368CBAE; Fri, 29 Sep 2023 00:34:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2065.outbound.protection.outlook.com [40.92.66.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96C4C68CAF9 for ; Fri, 29 Sep 2023 00:34:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TUyeNaa3Nb34C4S9c9X6YWnqq5OGFAFB4zBAgsrwJ93+MBSqXmKQZYdewpIdfQQUhZk1Zk74VVupKXuk+G27A1iuXyg5ZW8lPzmRW5hqTYGWRWPVPTQip78GC8JzdyTAW8o+aLnwE+E6snUwbuWXcqnHsK55GnX+NIaiCzkvP+1bZFtoxk0sudNj7K5qtns9M5V7rQTJKCZajAbqAWjVe2mTDN9nlzg3w+54Y9iriBkzWXmcQ52Rm0vXLEABzGE9QAwGiVUWTz00fvfUFMq9YadwnbGmS9La6xWQSeZeMnRdJElgE2EENCjoZp/g3fWi+TSm/Bsv2UgCvX4SuPGEwQ== 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=CpjMRplzZ36eUMwAf+Ro6tzVZMm57pXV5N2TIUwHL7w=; b=JKyrbc2uoDETLZkPc5aHK+N1LcFUTEhB1fBW1VQ3OXlHn52hd/Gpc78AD9R+J2mnrPnBGCkgU6UqionxZcp5v6Xi6ZEJwxEIyygKDKQA0kiH1WOM5RvAyxD4nbgD9hnTHQEF73Jfk06n2Q7iAQhWswhhf4V47KYSQzDZw9qe+pduRMXgsjjfiJuD7iR5YGCHj6A7RUw/eMd+/bty3wGtuz0eKsjHRtxP7OX00yi/2inN03SPj0oqNDNsYab5oCET9KwxHWYGFsmO3fBg/fJpYicSiIo7MgM1y9MfdUnNVqj9aob1rtuIcvLSQGTvl8LtwZ4ytEax2jllzj9nJT3Vwg== 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=CpjMRplzZ36eUMwAf+Ro6tzVZMm57pXV5N2TIUwHL7w=; b=n2yP9zR28Q4BC74MdkQ/5r4q9IO1E1IipvzUugVQOx34WwTwhmieKo6SmQbOBItxzhNfMHNnN49WPfqrQg38UmvpuuznIerSP2IWk97Mf0dEfG1bNJbTc1tvu7oH1rOxtCBobVfYiDo44FYqAFeXsC41sqVDKUjDS7AAthM1IILSqoCpJ+72ClgtdXH33Y6zF9EbjL9qsJtDXyhS9aAzYHkMwrz3k7p5v0FVYdeqE3xU8hgJWOekKqhbvUAK+vG6sa7ucEGA2gJa91PXCMUXgNzxwT2RJ025aydNe6IIQVlUhDp8H3fW6gXJMSdaIoUkN50di1hI0Eqzs3y6xfC4/w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:34:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:34:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YGKNnIv4xImKyTpW3cFER2TsAyA3dNDv] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: b140e6dc-e45a-4bf8-93bc-08dbc06ab8c5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lVOUQit+LqW8tL2k3UY0JpU8gCzMt4iJbuNSHK45z9jCMfir2pLyFRAExVz1KgeXwpz4chURGPv7q8Is2+u7dHWgj75gRG5Ot2Bd3FGOmuxdxakH9D1B2t2Gg2yLbWqnP1V8a7hSfV3pf9Rb3xUA+g+lcbDwNIzEzohj8guiGVLo0QkW9SifeI7FpRkPbanGVL+THR1p8y62H2Eh9AsRJq/0Cq3LWCAZwPKTNgSeUgqPoL7i2WQsQSQb8aSANhIajptyeTfSQBhna1RwE0FTALZUC/SRI4bFvzXhiBWWnEyosFe6++s33+ntahm0bR+rXu2VU08FHfII3+eRf4ae86drQejY3BfmfbCj7r8EPHMCh4llXSgM6ay3YrRckyrcA5dVC+Ao+H85O0rtzcktGMBblF3g4aMuitiS51knuIED4cNx/gnhnTnvf4nzRijRgwirgS9piIpisgyvTkB/y8SSiliMbMMAPSbOhHXl9FmHrdLJ8CwyurdToz8k4iThqSdmfDgRyynB0C8dzca6tlZiWOpBW1pqJHTPka6ueVQz2K4PVeiB2W5pcTj4fCK5n1l6TxAbKW01tiAUdaprCSgGKs/4d+ayDWDDLbXYczI/aTMg/ES0mAp4ZJh3YJa7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: osIraQB0xm7Dhrd/bKi2n08bSXAxWLWDZjZ45kaJBNdDs+n0aG8P6yXVlef4WpLlAnE3P3iusk09H7WUyMJgdvEtkyUEtpuCa/rp/VtiCFLner+69O4QVePcpF4YOPVhaKWG0LrW92emFUZUZ/URwZxfYIE/iCSSeu3snjUbu+MEqRT1xunsqHhm8IAHQVB7w2vM3HYCdcComBsJOHj2TKMKRAN3GEwZQw14NwQWg2pvowvYZvijiz6g3U1/fsmNhOMV4UhwSW84zgfhQseKNkcNSvCrVUZRdx9+1ZYY0pnRzYA+olW/NXT70XNGv6X8hFPTg0eflVmAl7neJYutAGYvzrbimsTjFVccSUJagqKoBPf3uvFFG/xpWT/p9sSr9NPxdhtlz050RuyobceAlphp5b0LgK0gnHyldK6xfeXYt3OyenZoR5vXJp1ZuPWgscFNIipeVA2PqFq/s0ScdAeumnCsjitfZWJtFQfhEVJSzeHoqXQCu9F/gTzuXGnm0zZquT860Sg7bUtImNKywh87uvZNeD9vyPH+g+wqeRg6bZ+/+to/CfTUpkMMN+H0qccvdIvw1iLfiPL7i80bebbFHrN3G5BG97KFoYZ6tDfu+jXupJuHM4Owxq2djLT6C1R6aXmr7r+P5aBVcsKew023VJsQVXVsofXU+hB+3v4TbeoRL1cczqs00NCFvK8LyP0MjYW1/bM6XtaAoK1gYYdXQEcKtB7+m8IqLkcSQ2fhtP6xiGHzBFsUBYB8mV/iboESe/9giewkwuW7D/GT9t0aHkS7YoAIXayxJcOqlo0JsnfLxboHe19pCvDQqZD2ixFKjbgF68rHG9s5DFVyVtxq+2a5sUGFdsg/mUizAYQAiJPytZEceuQ3chA2m+9LdFtVQZXvyaG4S+Av7jPf7GyC56REUB5SmDsCszJnPJbZ989wTaa67f4HY0ypX20VZyJfnGR/BuQ6KtVVnD/xhPNuli//RdPESazx6JCASC+2ahWU6fBQ4epiSmZvMg4iXSrPskbUPQrXUqWYeJkyTcRD+edgJBAiRyIc8qKftpcuV1+sG0RI9UPd8jhrp1pdmuuVRQpEFo2GnkJH94X/rDUPLM8h9MxLLhBC9+ep5Pt5aecqOnTtcj66av2AGYTnLHRIuxUrI1/KI+XNTcScBCNZbGXOYwVNdEmvJIpwl6omXO6vtNNd6i3Cpm1HQsGIBWMqlleRET2kxvON8PyaE0fV7CJMpyutk/VbOnAmx+JboJKt1wajaEAJTz9Rmbny X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b140e6dc-e45a-4bf8-93bc-08dbc06ab8c5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:34:40.4760 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 02/14] configure: Remove obsolete ffplay->rdft dependency 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: cJcqGHLBxga2 Forgotten in 4acd08be6c4f39736179a3d90fd56b508e42ff6d. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 762311ae51..11f232165f 100755 --- a/configure +++ b/configure @@ -3915,7 +3915,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter transpose_filter trim_filter vflip_filter" ffmpeg_suggest="ole32 psapi shell32" ffplay_deps="avcodec avformat avfilter swscale swresample sdl2" -ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" +ffplay_select="crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" ffplay_suggest="shell32" ffprobe_deps="avcodec avformat" ffprobe_suggest="shell32" From patchwork Thu Sep 28 21:35:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44005 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155179pzg; Thu, 28 Sep 2023 14:35:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2fwzdyCW8BIPfTg88HU5bGTWxuO6TLDFsB8DFcgSkUT+eHLRtDP0XE1oefT37+TmoYJyi X-Received: by 2002:a17:906:3041:b0:9b1:aa5d:5d1f with SMTP id d1-20020a170906304100b009b1aa5d5d1fmr2275305ejd.73.1695936906292; Thu, 28 Sep 2023 14:35:06 -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 p20-20020a170906785400b009a1bf0afbd7si15032704ejm.81.2023.09.28.14.35.05; Thu, 28 Sep 2023 14:35:06 -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=pwV6gSBR; 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 6E4A668CBB3; Fri, 29 Sep 2023 00:35:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2070.outbound.protection.outlook.com [40.92.66.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A162A68CBB7 for ; Fri, 29 Sep 2023 00:35:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FQrskqd/bwOMDS2X1V/sAYVeKtVrFbNqAhez0xiWg0HO0D0SS4KjWKBW07/+hWGDeXY9Fo1anAoLwIsNEdnpMgev9TWtuHK+zw8pmy3oO4ytvr/a/4437qJ60yv+IWkOCco6jSvXNl/A9nYauEuINsTruAPkyNVejKHxr57fLf+oI28NYpCurW5oz5m+5u5KtxFsAPwnQtHCa7v774kXpekXs0hadZU7L+KmOOZ/WohEQqwyp0PZwzefiaLNo8yYXl059j1JXFZDwGPL02Vir8FLIo7dyAUQ1lx8RPWt8fER+d0wEOjf2efkf4m4KOe3T8Zh9hj3/eF6O3XEa2ieLw== 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=e2az5WjuMrOM5u68zcM8MvCTtgFccedpcCR3vpfCkO4=; b=ERoIadinRSlvC1gGy0kmjYkwP6b6R62aR9Py/DYOTJqCNxdFyA1sjh5TOBTIDsRiQAT5Q8mQJGStZLF3iEhrHz0qGUlVALbyAh7XV18lgwdLQmsd7RERrwBbv8Uj/WLUSwD5nqWxp2KKXolPJUL4GrabREG6/ITS2T0wU6lmNymJqXKwXAQSJyoQHdpt8pgs+O9ncpgGr8kdNoVJDW56KiXJfDnGjIUFDWQ86K3b3p9vPZ/IvO5ic4vhpX5Nj1s4ZkBv9ccyxFoqhYDEXORyZIxOM2dYxFKobrd+TOMS02IZ72S5foVn563TKDpl3ixAgMpqJb68zmAU0D4SWXz/Cg== 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=e2az5WjuMrOM5u68zcM8MvCTtgFccedpcCR3vpfCkO4=; b=pwV6gSBRprH5YAXpVjXxT40DRfBAeDM0c0tSQuIE3azbiKpLMIB3gHrZvGfbSAwc22Z48k6Tu37fFrxJdVQSbGbfFAPOHvFDhB0VSIMaARVk6teMOEmEOKjl3SKUUXpqn16lC1F29j1IeN0YkAzuK0Z3Xcci8OmNFZ3tcZqeyxCQj4HyPc0oFhqxT+E2/icccjhw1znu6eAi/8NQAVXLNh64z59Dvp4gpYLVVv9cUTVFVSKxusXV1a22wwfA1nyokP2O3399wgA98XP5G4Eq2t5QIRKHKqS7bHeDRCbBBUEBxj9prPgiYAzUkSVORCODI91yKbVFVqX9aYmayMgtHw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [m+HUHQCS2+Tn4rU1hNqrUiyMboqC6TMl] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 2671dfce-6135-4c37-e0b8-08dbc06ac466 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0axcSplG+A+LcXW9Sw0WKjxTLbqxaMaW0+w9IkPeAXbJq8GOZxXUPgpg71sfGi8ZOwMRiBoleo89XKZPBU8eJsg1q8gAcmp9kKokJmbtkqh/jYyuquTswjp0s/d2Kc0GjWmaHEFzF6rR0i3XalAPMle38zhy2kcd4Bv1jmlxh3WcTaajnI2uCxQxsKesG+D2TouuQMHsN/mENBHi6O/M4Ms7LVkY5Fa9cZWH93+lf9CwrpOnSiYeIBHff0EYwr/8ccC6ZycD0yf0EsPj8j3z0ZgXoa9wNGB8PuBZhMTsCzF3O2O4x6Wt50chWdLXEeU8jU0kEQEObYg7DUfETM2MyYaqFn0hlG4yq3J1UJk1ViJAfxE0eDaGtduWUAzYHSMnST4wG6+bNQIPWA8m2ZfsrYIrHJMfwxMwNpiD2fm7rIJlurV1VLfRMxEaN0LgtllBg9TyHlvu5zKmK7P+EsSO+IArLI8PuY3p5mjnMtIRSVwHB9qpYNyDhy5n62Eh0gqG1YTHXNnits+OtAthfhKc48uJicD77vQiGZUtP05lXD9stg9LwFhfgytuRwphnRkhdSVbuY1l3qiTLLiEGYjEmCr+fknl7FfBxJn/083177cZ3wXZCLjl0AguyPndWrfB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1n1dZUZXcfd4arbAgMIGAVeNlg0thR2ukHMdusTev7g4h4OIxSkP6MHgqrbKUHaHXp6ah1z0tbTENtkuJB2U51Sc0VLAQPEkgzFgpbZ2sfrrk3q741P1DuyGwgzmDqcvTZj7FC7f0e2/0zC5xkTwXQdPI5TAfYbKIIySKC2i6UAbV+XGy/oKdKWL7b1VwdQZYOSIAa2Z2Cfyk4eaeML8fa65x3DAUMVvISjSkldqxCiIpV7rJrl+jqphHh3B5q7UXGj+GQlW6wqM+UPtLc4m6RjEyCOTnz0AFAtebg01trPEse5UvTZZiCf0nXqwGOZRPbsDNJ+xlAVS3UbXEhXLk8HoGffjXKkfunw0MK1XtzemTYheKt0GAw4eT8ud2RNzhaRENHHIUuGs9hdjqpObG2pIRvKxQUGbj6Gj8/OITofjJo20YE+KymUDXJtG2Tqt31n4PJaXZw6+vjDkEte0NptDe6+ge59goFXI94WEmT5UqSi0O0FXLEqNyIBhICSlNxmY9PobHnJq/7bcanOUmA8QvzTNsG3mfzk/rcqSxZTA516cQuUyq/HAedrJYua+OcuorDP0Z18TY7MVv0cy0y6aJl4nhb6OgrqOQn2MAyRZbAv4BHCMYQIAwYiwYUEOA8am8KU8vtaQORCKhXlIH+MwMHJj54XcXy41C6XgVLWjT4sRBAnrSB/HGkxfultv0Xk8NZejyvpsSVMbkaNjnIB/6xW9QAZipFUHhQBt4vrOU+p+GOQjwpzRB8uxUgVOmaKvsT21kMjOGluDsVUohDjrpg+EbKFTmqJoUNJwdYJvf5QWm1C0xA6OrcHRe0NtbDINLfj7T8tIHxfwrfC3l+sXIIc5hLudu600vedTYerb7o6t/q1lnBYfHKo1xbX/FXj+m3NXZV2zpTKDrj5LK8MDWnhrfxullBnsvR7tEIkTPnFetzJA0pmPS3MIAYRDkH/R1nXunqbSyai7C9xYxWx3lJkwksQJAl/x7WjC5CzFSDfVdpqYWetSWZfu+SdrNpSveZ0OI7EXfXzh/73yozlUXsEKzvjWOkeAdChYpAuM8gNWVuARUg8W1OJzyxGrwDcWYK7HJLsdUIBbx87+6W3Ku+hPP2ZjPs3gyIPSfUlKm6UC/gXJv05AitawAfAOaUqk8KgnDQhgjlCoxG8hnB8I13SstrhuEv80x7CBF9t5ZpWXYiG1gvvKjQhuerqit6D799tQf/iu0V0NadDRJHd4GtTR0ae0H2X4RlZHc9JxNXghIbNYf7ixkWJf+owu X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2671dfce-6135-4c37-e0b8-08dbc06ac466 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:00.0155 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 03/14] configure: Remove unnecessary vf_spp->fft dependency 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: 1ASsavKTgJC0 The AVDCT API used by this filter does in no way depend upon the FFT subsystem. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 11f232165f..28f1753ecb 100755 --- a/configure +++ b/configure @@ -3809,7 +3809,7 @@ smartblur_filter_deps="gpl swscale" sobel_opencl_filter_deps="opencl" sofalizer_filter_deps="libmysofa" spp_filter_deps="gpl avcodec" -spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp" +spp_filter_select="idctdsp fdctdsp me_cmp pixblockdsp" sr_filter_deps="avformat swscale" sr_filter_select="dnn" stereo3d_filter_deps="gpl" From patchwork Thu Sep 28 21:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155274pzg; Thu, 28 Sep 2023 14:35:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpyob24Q+9YPT+4tGh0XhIrZhjpJF/W1A1CBBOEJCRSTI62X+dzi4haHPhOyj3yruSM69k X-Received: by 2002:adf:e9c4:0:b0:31f:e86f:cc12 with SMTP id l4-20020adfe9c4000000b0031fe86fcc12mr2257144wrn.41.1695936918293; Thu, 28 Sep 2023 14:35:18 -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 gb26-20020a170907961a00b00992d0de8763si12384315ejc.910.2023.09.28.14.35.17; Thu, 28 Sep 2023 14:35:18 -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=R6rtxx7C; 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 702EB68CBC2; Fri, 29 Sep 2023 00:35:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2032.outbound.protection.outlook.com [40.92.66.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BAF568CBAC for ; Fri, 29 Sep 2023 00:35:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ej/En4esitMpuuG+FbSqC9FY5zs6DUE9muvI6lUorAW5lgo2hAwgBRK1PF6umDrxk956P0bffxp95js7+pk5RDhM9q26f4IrtULZlh10y77GVCu9ScCHBSMHMfG5QaZhtnvlZ36sXTqH96AEvPY3daO2UyJ4h0OR+uMMTJj95+Vcj81YrrZUfOf8zfkiZ7gjXPSTH1AG5kA/Ik2AzDnGzZMZEz1/6TEhs8H+GMHL91cnEu5g8wxNDHNdr5mA3PG8w4Pq3UJGH/a+G7jsqpjha0wQUPi7vxwocG1GrtTK1FYnZFTxNJp1ibB2IgZEV81Yd+t7I9fdGZJdVnpToKjfHQ== 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=zTAG4GqUpUdxpYeBcoCC3AKspj+CmA7FfctmO3DYrQ0=; b=cQL+1mm+SOe0nlsCbR7kyDWdDyDKMsZ1/R5TKwR5u090YvFh+AfAxDd2GL9VT8FSYK59V1Lon/rwFKrF8p+rmHKCmDHO3BOXY9PdEQWgfAPubWIp4ucwUFOhyn04s3IRTOWOJZ2m6SrKzAeuTEWn3qs0X5HAgHdmRWtMmaVtJ40CwtxKsQAFAx6ua72B7/CLhSPQccMia3Lqi66nrZ2nxYdkfNgPucpqT7IYRUGXzXXkxxFvHnSSbpuLdRygE0l2FoDsIsiRx+vMAW82EpcKFwgtmKj2980bBPyacOihVjlm0aZClERqpbwjhPgc+pLYCTogDA2RgQpSb8st4Dhm5g== 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=zTAG4GqUpUdxpYeBcoCC3AKspj+CmA7FfctmO3DYrQ0=; b=R6rtxx7CxgqU1VWFZTxaCfOeR7+jcvRFhccMRgjkoOMoLoGVM4M/+vj8N9HspFE3+PGuaIsEIsKKb+Z8aDItAwuDpCHSsQfWslc1UfzdraVFM0dAJbFVDdXujbQquH3W507xHG3jNLgWtUqkfyeza5FAfE3C6PH5NX8/nE0ygvUd6EwJ4zkiG+8nXqkpsZ7ep+dYciloy9aVwpe/BE6a5ZMFaaUgkcAMO3um0WemT5k6HeywViOHdlcBUs+Y95QWE2EvLNo2fUu+QsvHOJvCO3orULSe1KEr15bmtb6gZMe2kKckhWh5w1D1xz5qLYWNWI+vtzmYIhhm/cYOh2pwEg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cQJABUZIuuufCgSF1x6C8jYULuE2az1y] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cfbc6ad-b971-4ff1-6eec-08dbc06ac91f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 084SVEZL4hwESIKRNWnCv5BAhcwEd0jNHf3Y/1y/jAZSGWIjmJiqWSEYLe3dyli6zwvCCEVtFeaejbgYzxMGBqhWGnp/uFRW/jvZ6R7pVK929GS+yVuZoj4RYvaMW8o3x7Oaew3VMZgHPKPUi/t4c3jK8uTGzVdu98L251NjVpB3Hro4gzP6nYVHbGX8FC5TaxAo1CkY5gGzCKkSH6YO/NHhcgURH+EGwx4ZNflXlIwWPEA4fwTysDIKrB2rah0gA3GGe3m1p7qsbo8zm6FKFO2K5ZsRk9/3AE5lT2nPjaQgv7OvPejMnvDpHPLnHPwJYXPXH+CM4qgCKHOwr/iAKd5bl+aB1e+oHUqXkK7VohXhXDkURFF2zz+JZuJJPBXzt4dEpMs5hmyJbY62+6UsRclxxy/RKWJ6Pj48VY7/qLF3dU/+HabTFIhY4LHJw2ANKFRL4ZaAjnxTLwYXSvYInuTzaDnLI1uNDRmEUYfP6Nj6iXhGpZi1TWgtXNEtaDDLhTBkfgYXmVdamczkqw3mRiKUvFujF4c9ihR0EgwoV+MQ4o6zBg4/rKIAEEPy7JbEG9UuOl4u3TooQbZllKRh6Ee2S0Bx/4dH3kIaxjpqQ85H7ejmN3me1x9Sw0CiNR8r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HOwzxtGFZNtaTWCKI+2tumyjsWxek5Ya05jVlSniI8HIo3jq/lohfQAU/eJKgwECxApZYfY9RpVTRvaTc3Ega+nRb4GAnoXyr3jO8SKSGDBxPTd/liSGL8VOswm4F9v4V/Aqz6LaaifajV4FK5/WdocS2iT77647RnacRfvW4PYX6l114NLh3NjR235J2FOU3tfASjzPWhzXCPF0aHnAKulG52lE3xg8SCibFyf0IWE/Idu7N/+mN90GO7WaZQzFJq1kutm5pEGB4J14B69vnJeI/hkNWrhkIzp8WhD6xBehGspPg27HCMnKYl18P/yu6ohA2/6f71jSpOgg9RfMdgjZRppDGtVq0Dl6PrXPV4AWZVowRwcNbocZe0nTTXiQAVW25zcribaW6mNIgXhdFBKSD5DbvOpsyF6ztw6Z9KVVTl+s3nbMZ+q4d/XXL3gnDrswbD4ncOyy6w0deAQ+3GFNLnGAN2kCj4GwgYPe/rabkUfd3t7bHKWmJ6Q5aXSItAW96GCwg08EDEzOWhL68leaSa331eQjtSbSyMilFOKBMvcgOu0h5pw6De5jni+Sa8wVmz95XY9H+0YJOyRAEStkCgk4Oqj2o8YGL9qgutiWq6cANDdAOCNTkL8hrGlCjLXhyB0j+N3nUgB2zxwhxNsyiV/eqIbAJ3wylcHWupzXB7CsM89DIJnefcVR5qzVf/TTF96sINgZE7UhxbOf8tH+TOzPd9gwitzqOaJeIU+C4EVQph0/kDbRS7MzalYvvfftiGdFvosr8WAsH4QTFZnfFVfeIjzyoHT5HuolJuRAJDXkWq0uheXQDlnINCzgtd9HhIsW0YkuLlsdppzbCqfdN9PEI+h4QEG9bTkubJsGas+kE4Zx8vUQP4XpZGxdeHabHDOfEHxocnEZ3nVCzQcXlc7Xua1p8x92F6PiOoNn0WVi2jClz1j1+NF+N/5g0ADWXK2QeFuwxzZb1hbvhL0ON3E0ptCRNvkF73P+TEYo/nWtV/7GDQQBy2NjJHZw0D66c3dRW1vU/Fnv7f6hSpVNJ+DKPlY3eex5uMECm6dCzFJFmFxFrGLw/z29QFW4Zn84uPB2wwfgiGjNeuw5muSFLVaKG7Cs9wOfxPKn+eG60I0jbImrpOZNFM+8zuCmcNUjeBe2Cay4PSU12HJaGVDx/LwSWniFqAM/XMcebMLim38SHbMA/oiqABbJrEIJXrpVEYlAjhEIkzcAKzFPtmc+rclya9lDf6XUI5NKkgM7gvkQTtUgIPTOF8JX95Ni X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cfbc6ad-b971-4ff1-6eec-08dbc06ac91f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:07.8574 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 04/14] avcodec/mpegaudiodsp: Init dct32 directly 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: x1pAjkQlL1qk This avoids using dct.c and will allow removing it. Signed-off-by: Andreas Rheinhardt --- configure | 1 - libavcodec/Makefile | 3 ++- libavcodec/mpegaudiodsp.c | 6 +----- libavcodec/x86/Makefile | 2 +- libavcodec/x86/mpegaudiodsp.c | 6 ++++++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 28f1753ecb..f64086186c 100755 --- a/configure +++ b/configure @@ -2790,7 +2790,6 @@ mdct_select="fft" me_cmp_select="idctdsp" mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp mpegaudioheader" -mpegaudiodsp_select="dct" mpegvideo_select="blockdsp hpeldsp idctdsp videodsp" mpegvideodec_select="h264chroma mpegvideo mpeg_er" mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cae2e773a1..0a3a8fcdf9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -134,7 +134,8 @@ OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o \ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_data.o \ mpegaudiodsp_fixed.o \ - mpegaudiodsp_float.o + mpegaudiodsp_float.o \ + dct32_fixed.o dct32_float.o OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiotabs.o OBJS-$(CONFIG_MPEG4AUDIO) += mpeg4audio.o mpeg4audio_sample_rates.o OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \ diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c index 5a5a679d91..0971c28734 100644 --- a/libavcodec/mpegaudiodsp.c +++ b/libavcodec/mpegaudiodsp.c @@ -23,7 +23,6 @@ #include "libavutil/thread.h" #include "mpegaudio.h" #include "mpegaudiodsp.h" -#include "dct.h" #include "dct32.h" static AVOnce mpadsp_table_init = AV_ONCE_INIT; @@ -81,15 +80,12 @@ static av_cold void mpadsp_init_tabs(void) av_cold void ff_mpadsp_init(MPADSPContext *s) { - DCTContext dct; - - ff_dct_init(&dct, 5, DCT_II); ff_thread_once(&mpadsp_table_init, &mpadsp_init_tabs); s->apply_window_float = ff_mpadsp_apply_window_float; s->apply_window_fixed = ff_mpadsp_apply_window_fixed; - s->dct32_float = dct.dct32; + s->dct32_float = ff_dct32_float; s->dct32_fixed = ff_dct32_fixed; s->imdct36_blocks_float = ff_imdct36_blocks_float; diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index b4cc5e0d08..2ceb88968f 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -126,7 +126,7 @@ X86ASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o X86ASM-OBJS-$(CONFIG_LPC) += x86/lpc.o X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o -X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o +X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/dct32.o x86/imdct36.o X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o X86ASM-OBJS-$(CONFIG_OPUS_DECODER) += x86/opusdsp.o X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 6586fe0726..43662cd279 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -45,6 +45,9 @@ void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win, void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win, float *tmpbuf); +void ff_dct32_float_sse2(float *out, const float *in); +void ff_dct32_float_avx (float *out, const float *in); + DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40]; #if HAVE_6REGS && HAVE_SSE_INLINE @@ -267,6 +270,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) #if HAVE_SSE if (EXTERNAL_SSE2(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse2; + s->dct32_float = ff_dct32_float_sse2; } if (EXTERNAL_SSE3(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse3; @@ -279,6 +283,8 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) if (EXTERNAL_AVX(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_avx; } + if (EXTERNAL_AVX_FAST(cpu_flags)) + s->dct32_float = ff_dct32_float_avx; #endif #endif /* HAVE_X86ASM */ } From patchwork Thu Sep 28 21:35:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44007 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155334pzg; Thu, 28 Sep 2023 14:35:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnIN/44WIsFuqewMFj9VueEJydc5UcVjH54pRmiEF9XNtWcQqtYFA3/OnbsiIhWFLIuc4H X-Received: by 2002:a17:907:b10:b0:9b2:78bf:d8d4 with SMTP id h16-20020a1709070b1000b009b278bfd8d4mr1983823ejl.5.1695936927228; Thu, 28 Sep 2023 14:35:27 -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 vr3-20020a170906bfe300b0099bcf9c2ec5si15660617ejb.967.2023.09.28.14.35.26; Thu, 28 Sep 2023 14:35:27 -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=NhqCzi1h; 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 797E368CBBE; Fri, 29 Sep 2023 00:35:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2027.outbound.protection.outlook.com [40.92.66.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E23968CBC4 for ; Fri, 29 Sep 2023 00:35:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FN8ATRe2/m2EPXfoj1em2kF5PO/RHEH7/s5l5E2KXWF/rlulVZ6AYtvlnFS75OWHKcnUBq+/8LoBFrbfgMH4A+SYZS2k8v92TZPenJK8oBxqujcJRApA8OVqbGTr8iC983xiKmcj/IiaN8xdG7PM9+agqGVtLPo2aAbjWzoFEtNfp2/rP4Szc6e5+sIdGw7IFfBAdnnZTwNXoVf7IFCFePqOAlkstcq3oEJLUDx88wghpAfk2fyimkN7fwHR9GFBYNgPI8k3j6Adbqoe30GRlG613YZ1SF6RqtNq3qJ2Izy/JajxXApEPHDLNMsUgM1bgsCog8HF0dDQOZi1cVNnFw== 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=D/IimmvjaCJ6HJJIt784MANVCwYCRYK/6iFqimQBwVc=; b=kqs/sogRZLrrFE1Neyc3D/YqY+VK5AAiQhq+2WH5LTpwkatyN/jJ72xSrqqjmpuEmUDpdN7uaM5WxEQ+vx3v9+xVBf1JnIe6hpux2TpPM0YHv5tv3UMnb0+b2BUt3JNi99fwQ8z7pp0uR+gEkRiH4qk184e91qwrShrpuZL1jimjGVb8CIBGD2Djg6CxLAd+P0htCeQDwEFMG4YSx9DI3gW9Nz4VKMIcu2D7oB1FWeVUHZxNt1cyCB06mcTGRhtVAxZ10i8O9r8hfyf6oyDhenCe0EekjrT4o4QfRPT6T+EWPYiNNOV0rX23c5f2Atu1+eInBWaN7NecTyPVMWz7uw== 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=D/IimmvjaCJ6HJJIt784MANVCwYCRYK/6iFqimQBwVc=; b=NhqCzi1hdgyZorewk+59Hc1w59Yznzd/P+Qbq3k14sII+BSMCFfd7ROX6X838m0ZKDD+unS2yTAc66wKOtxDLvBa3jtL6vaezYi5hzPF37rRkMuAkMjIweMFAMaiM06YI1l6pYOLDFy7R72gT73olksci298Czo48uWdurHSmIRDx0UcpsQf/zwAuoqPstOA9pc7N1lzoeHzKjZKhNH5Ihya22JzIo88lvDuqAu7u6hOmz0R6cmMlf4zZSbFFpzfAC6U9EWxbywcXgwxKRBXSvhogmV7e1DvEA9ASmicKDk/fBud2Rk06ZaQ22RRbS7p1RZPWVoFRtgBD3in/x9VrA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:40 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [b99LeFsnBwKSLoB/DwKvgxFsLHNJsVFu] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f2e81f3-6bb3-4d7e-eab0-08dbc06accf7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y+1pJa8HG3n5KX8yNAGMO4gxGOmi4xdOztCmsph2BZ1wSpgEq4BLEUzXT8seyRBaSpToFo15JJWn6yxKB2PGYx0siJalf8xtIzx8DZQW5yN+K/ugeQP8ZzvO6DMYIScTKHadTY1ltWb+jxVqZhu8iG9FGV8Ov5K56xP5ad4ZOul2lipaKaf2brV8wfsEmk136OXP48qqTVKO1OZZk7HtAqmB4HDgF45bj1nVU6wh0Z/CnosTIcefUNZgbex1gt42q/NxUXVdEPzqPswWsP8tfPQMOoDvG3mpZ/e0gzUfa7wL/mh4NAJThCMZ0dBhNG2fKUt4+Mw9JTtKVJyd28BEYzGl1dBglqs3BHShqYTpMJtIxIJFB8tK1QqsgIka4SMjC6Mcg0N8ilCGREGhmYFUWGLcM7MfVQNOJiQZPvn9xZ3tlvJdWk/hdmtvQFqfA9RZnMT/iQHJ6OedMDnAPm+Ahyn5CK3dbKaali67wmNi8hNE5xUVKLqvW8LszZAzO+hy9JAJBKc7ptojND8z5/Xbvs4gVueqaMx8lftyG9PikvV0pAggYKaPNNTeV+fO25xgXytslXYHpJb3Uo/Rsf98ctwiR7CBZF9eojdVWfS5VgC44wD4E+7R9KMWm+gcnDIc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5RnLsEjVzKPz8EXpkqEDZQvsSYi8kgCEsDme4uF4OW+Is/eM2+cnuzFQbl/DtQxPeQtOGTlFZENJWsj1Z34LVfsNuXQy6/bwF38aqqjwYEcX141EOxSV66z3pcRMOq6r91iLoCnYCwmypcCsgknO7ZIxyQLyxvQIz/zUbsnNEiO+KzVfkBXHPpc0I9ZWxZTg15pEiLNNwf2rWM5j3eDfUTK+XWMR0Ydza49IrLtImcjPGzhW8+PjSEXfOW4BbFswg/cu41BZf0agwtaYaoai1wSnBtdqvv7Xsps5sWNR68XyLW96Yorj1JKFfm+NtgvAav26xLyU2PU0sQQ1I4KZyZO4v0VhVDY7SBw29b/A9jq/n5wwKIDoW3lnA06cms8+3YxyoVvUkW1o9UKbjzEjEjFpQe11fjPgEs6axqVTDBajvMVvDgIwzOljFdIkQYWSBsx1mSjWAreX4O9HnGZK7boifgEXDLbyRtCeXsyjd4lpmq6C/Tse009QnzGXo9s7a1b23koXo5PTgiAsDY7ZIKXvcato++00Ow+VOwIe5uJh6F9Qgh/mdNplpkWw5nnL5Wmb5Xc3qYFnXE3xMYxHEAsquRRTVmAJxUoP8vWDY+9jYy98O1xhBZuWdyJXNcHB99WnIeQWmBEyK2E6kdUiFawiyGObI/T6sL9/z7rDD3+KYZ5PeICqWIigBFTrdkm2ivn/wV56FuIMSAy3uGu+mulNU1dnR26ourNK5zK+HYnsY5kISXq2OBhEhHYwhxxqlsYmKVRyXfxgpGB9JfAqb561hriZrCODJ8Y5ybTbncwB3vkxjirX8KBKX3aQ1eGiUvjmCFGzGpfqRaexB0LrBmFIqK2E1lbnc6IFecD/TX9qtS2VgpXgp27KdxUcHpbUt6PzOaaJqZujFVJBFVVUrsv/mMkrM5DOF3TMI5orRvPkM8vhTC2GsBoJxR/AF9frM4oy+wzEH0OQtGcsh2Eo07WxK7nko0aydx851F8cjWfuTprYrOul2MqRpVkuq80C4hmUcUa0esiU44kbN6wxMwDR0faZh3XCcJoGTjfYH2Xia813HD7O8RsMjj8FOxH2eoVUUKorNE8xBICfUPrTz4bFnSLT98dllU4bfCDQFyeiKM20+geuogX8f9ZWUzK0isQTSlERHn+/1sRnUzCfrzRCG/wCQDlDhnap4pWrUlNmTMEG0VNpgHDqEZbbGAneilFQ/IaKbSjPzXd0TImLhMumX9OuZUatsxVjdJxJlPTWSU38M5BeUckSbjICKqjB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f2e81f3-6bb3-4d7e-eab0-08dbc06accf7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:14.3070 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 06/14] configure: Remove dct, fft, mdct, rdft subsystems 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: hT3q5oloRV/J This may break some command lines, because the --disable-* options are no longer recognized. Signed-off-by: Andreas Rheinhardt --- This could be squashed together with the preceding commit. configure | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure b/configure index 885c58b631..5499da3594 100755 --- a/configure +++ b/configure @@ -136,13 +136,9 @@ Component options: --disable-w32threads disable Win32 threads [autodetect] --disable-os2threads disable OS/2 threads [autodetect] --disable-network disable network support [no] - --disable-dct disable DCT code --disable-dwt disable DWT code --disable-error-resilience disable error resilience code --disable-lsp disable LSP code - --disable-mdct disable MDCT code - --disable-rdft disable RDFT code - --disable-fft disable FFT code --disable-faan disable floating point AAN (I)DCT code --disable-pixelutils disable pixel utils in libavutil @@ -2004,17 +2000,13 @@ PROGRAM_LIST=" " SUBSYSTEM_LIST=" - dct dwt error_resilience faan fast_unaligned - fft lsp - mdct pixelutils network - rdft " # COMPONENT_LIST needs to come last to ensure correct dependency checking From patchwork Thu Sep 28 21:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155414pzg; Thu, 28 Sep 2023 14:35:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEb+t7u2Wpl3S3bCrUxHfxqOXTEJmuri0y1tbihto5fmaTw554iqJPxRpsY2ctYoGL8hZ+H X-Received: by 2002:a05:600c:21c5:b0:406:44e7:ef93 with SMTP id x5-20020a05600c21c500b0040644e7ef93mr2278301wmj.1.1695936936528; Thu, 28 Sep 2023 14:35:36 -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 x21-20020aa7dad5000000b005332caabb64si14449344eds.580.2023.09.28.14.35.36; Thu, 28 Sep 2023 14:35:36 -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=aAFMiIlz; 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 9AA4F68CBD2; Fri, 29 Sep 2023 00:35:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2011.outbound.protection.outlook.com [40.92.66.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23D9268CBC5 for ; Fri, 29 Sep 2023 00:35:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iWvy3GlP2Ngvo1hEAhLd9JwN+Xu4VcW9DHMoBwujsC9yYGP424HcqMo85Q87U9VfeJ9LhHFdk461NiX9UDhm9pOei84RI/cA0mRnb8RQjmRgjDCjgJKmGxhzME4GEmiyYIxxvtqt6/1wvzMiROjIj3x5EBaZLBTksLdQ8CJvxIXuJzo20xwUsSUoYvt1jIej8K0yT+Hy278bIbUKomdODG832gpuEO8Mzn7MygmYF2KfRq9uilu7p/GGqZfj9TqHnRfBxX3YZehzeCT4WpvrDKKqFmlXNl0jKpPK6a36l3cxFffNhU0xLawPFCu2wkq+RezlKoQktKJeLLjBSrjMcw== 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=+p1VQH5pCvgxWTuL/oYOWungyPWKLR78htq37mi7dOU=; b=L2rUfZ762cXRUa/z8FvoYMnt6RyRgWF0pccRqMxz8OlTl0NY/k/kkQ1Hd9JTipVspJT6hwDL0IcboCgnKlx03u03RXXQhkvOL/icWgVxBVC5Cl2Bi0Gj97LkLbgU7xAXO5oECtp30vByH6mcORrdn9ffZ+zLjN5XQCIFGY3iSfXDQXdvBLasNbHyfsLzMfZB1DfZLNhPoPa+9KjoFA83PzP6Is1zkcDUZsvVJAAOSQin2pN0uZMf+fbeew9Uas2djj/NYQvPqgXiMdrNYVL7ZScUSUyo3DTR83SVTtSElIQuE7UUnsxydbl+7vbKjjoUNKe5VHy50rcS09jiuv0qbg== 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=+p1VQH5pCvgxWTuL/oYOWungyPWKLR78htq37mi7dOU=; b=aAFMiIlzevuCvJZcyqJJWtpR2TjJlTWj8ifCJSdtDZSlWdTKF5earqI/W/uumerOPJ/lMK1rUQgoUc7Ede2E8QvS/JYD/ujHceLSP6UOY/exJZPHjUnKxOtkv+0yc4hcU67oRU2P3KgGNxx2ve9bB6i7v8EWzMkW6t8nxLd0aU6w2jMIeHUdkZt8Osy+mbclya5nMiw0Spu0DBewyaNGuyIjOGdr2WnOH1NJPUNDlgFyT3z+zWxGU7TiC+CtjCUIlo7os8+Ur9DHRzXW45In8Ri6d/ReNPma8mrQxRi1EO7OPOCI3Okm7iYfYTNplZ1jfF6Y0nq4xCvhyrmgxgbKMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [n6kalOKJSRcgpUJaEfJWrwapNNPk3pLz] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ebdacc8-dd6c-442a-7e88-08dbc06ace1f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8nFgGntlIX8rl0YVly+Bk2yaZhwD3vEvrS+s1h1o5XtSUyrdBjsDt9+poWHhEXowOx9608BSPQ+JBooZB5jjkeNbzbxepnYuWBnCda34BFjx2rHek+7cjqNl8fzbnAfV9aNtu8tvUQIyPOmAtI/bX9DRykZWxknSFJqfngeRwpOs7s7vuBOECLtC7fHtAxqYl2xRUca5jiws8Zq3KjppWMue9IJhikwPdkY/2QdhlhvqZXUecGOq6szhPJ9nfmiAInA3WuMRF+mW705yfmeBuG4oQAmxo4xuTANa5z0jwN6O9+Y15JAi/Mgki6EdJvgI4tp8azh8/oACUVhmqbzgvysaHuwQF59MhwZn3RVBXCHAJOKrfVmrnvh7Phn9w1VYXht8ZtcDjiN+C8STD+kuv4gOlk8iRJtxaywdfUb4YzOC0gQbiY8CnKV0lnTxHsTcB8OHpig3nNYI4iWdelbfvtor3/nW/dm5WkhBo5e/J2nES5ZY2yo4rVyxi9OrpnkIpgS+ofnzdtdCTH18OV7TlrFQ01uWDahrgbzujqGyc28hjNhqcOwB8NtSIG1iUOiQvB2WtmW3R+s5u0tY1lbDvQVR1itsSGBMfJIynI3bJSHS0lRjn47PK8dFDKySlN+7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MlxIq+OcggN9e6xq4LjzpTMb4YroT+o3DYCiVeRmJXbOzdGU0wlqHQaas93IFlZnbsAH0wzNOkLBPZ+JKely3xGraQx6qvRrIwh1tI5qKSxbIw5rTOkM+yVCg8cTlb5IrcrhM8hKsDvOODdJcC+EuCBOHXcj8eVyB4XLi0va6jGGo8n8buQ4pS5OoA0rQhNSsw81NGz3sWwC+uwVvbqWu9pORadnagS3xbrvOUgI4fKUrWeUMLhoIeaB9r2EjEcc73eZtLROFte1427ksPAcVnmucKSas7SJC8iH8ROqjOse0TrRf5Kv/LdfRU0VOPaHOstlL7ACdUaxew4+bo+2h3R1jw1VzJMqABAsfxMHVv4lzt7k87/QHZqsaZK8bkVfQBQuvTd1qa2sHlPuzSONuM4ibrWoE0P8EKNEIzA4cMk5H9JT+3ByccxZU/YoubaagG5TRiW0FzkbMit8nN69WE6zK+VgJd/xTtKGQxTuoHHeCq9vSVrNpRWCRG9wjlEstlFFLD2CB5ZUuLtvIufJTJuEVOm/nJ9jtvkk1Eth/ooXH60PQexcPkxAJKObBOIDr2gM32DLMcALikEztQ3ujqRMaVkJwpi5zI4RJFW0d9KyM/1ZsLYU6d5v+kxzQxUu1mfewysVhaCYvlCUcoWiIgm+RrJ7WOnQDyhu9myTRVQjdK9tlwjxtVry3L+TYn+j6o4oGWN3aNPlrWQZewRZXSeFi1nx1VSg+lSwfRjMnYeCdzj9QxhNDLLBlT4gECfMJFok2d2MLaNABRP2yeliL5oOGbDZitjczlaJNP/oK7u8OWyL2r4AnXYI9ZHJUTG01eJch4AR3+m1F5jarQuUIALUc+Kkct2OwrgtUH85eGwazOpPKNoBVL5bXRI2bhgkT+MFe+1ImXc82qZz7fvTl/XXrfDa9xwYhWx8jvnAoEsexJruDdZVnIdoPU3VqgEBz0MLCW6NtKBG8xBGEb044SliteDBvtJGza11f8SHtVBPR3CItmoqZ3cBtgpoETIz2NrstK9jgGs5P4EDgoFHa8sM7rFErXXAtSVNcnTHGVH3ZAZHRbJ0w7rzkB0Qcq1IyEXNuUmNgDPw4Cu1oJK5WOnZ2BteSkWQvCTijlf8OQ98ylx4bNNMoBsdbkp3M3Y/CyFT9WbepBmy70RmhnLyWgRc6QczcKsBVFC9dl7AilCOyI69tKbWztSPLtFo09pirYBE958sIS6wiFDVKt832SnuT/gLAw+1bLAeons5yva4Er4rdA+75x2GidmDddK5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ebdacc8-dd6c-442a-7e88-08dbc06ace1f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:16.2710 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 07/14] avcodec/vorbis: Use void* logctx instead of AVCodecContext* 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: 0SumcOyZMoC8 Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbis.c | 8 +++++--- libavcodec/vorbis.h | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index d0b660b44a..3d85997576 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -27,8 +27,10 @@ */ #include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/macros.h" -#include "avcodec.h" #include "vorbis.h" #include "vorbis_data.h" @@ -104,7 +106,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) return 0; } -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values) { int i; @@ -130,7 +132,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, int j; for (j = i + 1; j < values; j++) { if (list[i].x == list[j].x) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Duplicate value found in floor 1 X coordinates\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index aa1ec5719d..7190465f0d 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -23,8 +23,6 @@ #include -#include "avcodec.h" - typedef struct vorbis_floor1_entry { uint16_t x; uint16_t sort; @@ -32,7 +30,7 @@ typedef struct vorbis_floor1_entry { uint16_t high; } vorbis_floor1_entry; -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values); unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); From patchwork Thu Sep 28 21:35:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155476pzg; Thu, 28 Sep 2023 14:35:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPIRc1lYrkRWgKMUeNOnhFBiCLza7LtL3MSBYD5nXjpMSvuhmzi5fvl5S1TiwxgetBnbGX X-Received: by 2002:a7b:c397:0:b0:3fe:1b4e:c484 with SMTP id s23-20020a7bc397000000b003fe1b4ec484mr2239180wmj.5.1695936945586; Thu, 28 Sep 2023 14:35:45 -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 u7-20020aa7d987000000b0053479f11cdasi4356829eds.151.2023.09.28.14.35.45; Thu, 28 Sep 2023 14:35:45 -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=f7gHVpmX; 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 C2F3468CBD6; Fri, 29 Sep 2023 00:35:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2013.outbound.protection.outlook.com [40.92.66.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13DC968CBAE for ; Fri, 29 Sep 2023 00:35:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VwtRTS+UM/GLl6HAls+zflH/wvdJedaoIYVPe4xUY5Uyr77tvh0VqkxrKtT5XHoVhbo6xXZ38ZILGoFLkCeepDZc7L+11hWENPE5FiYMbl/iu6SbncRmGnXRd2ta1FQLz0EEcrKwiwJZxyvJXxQVaXbIFdzAR6g1G7Wp5Vl5M4JwEuJlpXBD8aYc+E9Cb5OPiyEfEczfExqZ9Zu1ohXDMUxmeh/4zbz8OubUp5sOJ+rw8Pv5wZggg1ECwYDeUsV8K1/dlvG7qwgBdjAEPJ1R0aLiO21heT3iPsOcuSkC99rKnmHfvbdP9pHRGFn5NsHqsl4bwaQQg/0g3daailrClw== 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=zToGWSTq/9uLCVensI6Q2w/hlMjc09zxLd0BRWMoBPE=; b=lPnx6UJvuu3VMOBTkyRinsHWM5mys/0RswCMyS4cp+5TYJWInK9LL0ULTZB8IQuWg1T5lgkifj3V+PPs/xKu60kqvU5MZNFJxq94kkEzmPyTjcfMtosah7FQre/w/w/qiD1N2JOXzqxtIqzPHs6Dl5BeRwm3UGMNE1uXwVg/EeWCHPZL0LRjfbE0yfAjBJWyEscPWI9T+2c0DdJ3Q+CMdXxjxP/64pZUKrsb+Qd6wqq8DooQbIq/JcUh8MYNtgouOHaj9+8DWFKeRRzc4bxGG+y/ldpUTH3Q3L1lg7OMy/VWEfjcDjCBdNt9u/qJ481KO+bJ1WZLgCzhW1D4RNWeqQ== 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=zToGWSTq/9uLCVensI6Q2w/hlMjc09zxLd0BRWMoBPE=; b=f7gHVpmXoVTAvJm/rS0RLSM059jnMT8Uip7ebsEOCgpKd6SNUgeT60X/2BmcvFHUewel8hnwW6N//f2DZQpzIM+TXzS4wodPrsIv0efi7R3K1zyXbpQUpgtaGNukhihyLsndK0Q/onLgNxPS3DXQV1CrOObf4yDh1p1TKRQ3P3AWps/fayeIay5EvVDvO/ecN+Q/aUXQZPfYstS29LSL2hsBvqXfgMbLh6w5UbhridRy6+Dm3tF1eaFGAJZ0fcN7HwCVQgoWPMf1klH3RDl270GFdNZCzfF2RJatwAhp+bphRgcNkUZ0q+Rbm+VMx5StbWTeQuOMyCbM3WOh681PwQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:42 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [q8LeeEqOXgrv9Ke1u4QdAAGukNFWY+J4] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 03a60703-be29-49fe-35f4-08dbc06adb00 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0u/7ww5E86jtdOYyURjUT3Uyw8H6sDQrh/IPnwwJsC2BsH7mMumZ1itjy4IZagOlanRqtPC9dKiz5TPj/KXZED51kKNqfw4jO6OLDLtjp8EO0YYYpWZ0atoFyqvEa39GgegQB3HyBfJfwOcZW7sxp0PgDKUqiCcAwEGH7/Dclz8eZwgEofFdjt8dG3m//aF7yXGvMCCeVCNp2MAcRdhbAY79JnjjKRDG4FEHMx4RvOPBStf5s+eIQU67o4ytjelSze7u9ybvuZTi/ZB3hFv9GfdjD5ZNwMYBnAHIM+Jaf5SfXlOJ7mav6aopSmL4HkTm6liMyA3ClAEv+lpFBEE+ILGtz4vtgt/JJJomqVA0Mmw5XEUwtdQ1ewMfwdfkLfAThBvg/l48GjkGc9rjtoEd2zPYTTmZvZd75jkLYkbsXE0hSCD3ZCCKHLWz4epxyrIhyAJclkMLqdkwimYvLLAgw386w8Yz24EzJCY0yqle2nXXjtCbFshfTS1f3syPzlmiGFzGX0lBJJhYGt0Y8puuuElBIUyn4v4zDEkBgovdHx0tvE82bgb2NZGEUvL5z+2y3zJRfZNY1zqzWSItaKWeKrwyQ2M5D5LYg4a/pSsrCOnESGGCJOYzBMVT6Go1Iedf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fPfRiNB9MmE9NlglacAvrv1AgcIvrMoOdht6lpDloTZM5Xm4bVTi6vM3Vy3lC6tLJFTwawl0UibvI9RNeyqxt9ezCNnuyX03zuHX/UfovwFOEC5bPEReX51sN9yyETKzOivb5MZz2pOI3lelt5L5GaONVX0vSjumbsEeF0fey/ZlFdDLphxAElkeTuJnf5vbUElN5DIGLy6Fbq3xtIKiBMDm1uk9Frvudz6Jj/lTsEnI6uxJDb2PIVMcVOKYGgnh+ymOum5zh3p5Z4N7RDwy3qh2PMxNRhFMHrSZLu0mBeifnJoHa/WqSw6UqqVav6H99agoA+bwGbYHZuiosaVjOI+eMf89fKR/F4frU8S7hHS7yxW2xn+CgwvY6jkOhAOTfEo2+92AealnucCbOe+nSgobgdxAgeQc15xkBTU1JVZcPX3mF8PpiXleS/Q15lEQU2IBeUUfAlwRn8/R6XByTyT6PbG/FWJ2lfyOCWYfK6t6oVJuSSb4T10/vOx0iLu6MSZrwuDNYdNu2cf+rPXZEAgDjCPeapt62QdQsoQDYcPW6hHRU8RA5RF8VHTqTveCMgtGdYnhqVHslghMT1ZvQSfqdW3PMs5jWycQduKlX5uQoxhTB2V7xdIqj3Y513Tkh0ZZC6PWN0k6iF2nU8itDfRoVJw9HX6pSAdiDBuYt1zh4k86Et/g1PLluMrcuxeEk0U1GScDg9f8GZ5P7LUvFIZq/vZSigXzRJI2Fas9WZ+CE6u3zgtPncCLM4c20VP4SGW/EY9APdJm15YaUTDktrZSx2kDQoT8tJ14F9httAPfKi0WgxMnu5vIN2rIBAlbuX6TiPLLRf6VUD1mCRZJRU3bJwS6lQSUvwNYz6DPCLgeFjYkrNMSHVck33YcTlMC+sN7yF1D5Vwkaoce8gM52UswSsDCzub08GnCGIg1CRwAp0Sl6M0KlkPzPod3B97sBMDsjaHishpfPbMwIn85xbvt/Iv4j0QkppxBBSN0ijyb3qUiIm7kBS0Q5qbv9QANcp6Hyn483Kq1OovQivrkmFTKPoKGgefP5+JN0khQDwJRTWrZO7SSuWQtUL6JbySWDCYvoxGiFxAn2J6LbDKhRoF2LgoPi7eKnTChOjvr7QgIRcf71xK9IpMaR3yCSvM3P97cV9Pqm5nJSGpnLwQRWE3LrdwdFGQPnKpjr/QQcHHPHE3UtutdaD524pCUlqSa7P7u4Z7o6Oaj9pwa3ZXU+VgxGOB8Tr29oj4PeaHzTyw5k2fkSiH+S+fMQb1Z4gR9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03a60703-be29-49fe-35f4-08dbc06adb00 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:37.8613 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 08/14] avcodec/utvideo: Split UTvideoContext into decoder and encoder contexts 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: YeJHH0D59oWK In particular the encoder used only a small part of the context: The new encoder context is only 128B here. It used to be 32992. Signed-off-by: Andreas Rheinhardt --- libavcodec/utvideo.h | 35 +---------------------------------- libavcodec/utvideodec.c | 28 ++++++++++++++++++++++++++++ libavcodec/utvideoenc.c | 18 +++++++++++++++++- 3 files changed, 46 insertions(+), 35 deletions(-) diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h index e5160aa394..b081b50a2f 100644 --- a/libavcodec/utvideo.h +++ b/libavcodec/utvideo.h @@ -27,12 +27,7 @@ * Common Ut Video header */ -#include "libavutil/common.h" -#include "avcodec.h" -#include "bswapdsp.h" -#include "utvideodsp.h" -#include "lossless_videodsp.h" -#include "lossless_videoencdsp.h" +#include "libavutil/macros.h" enum { PRED_NONE = 0, @@ -61,32 +56,4 @@ enum { UTVIDEO_444 = MKTAG('Y', 'V', '2', '4'), }; -typedef struct UtvideoContext { - const AVClass *class; - AVCodecContext *avctx; - UTVideoDSPContext utdsp; - BswapDSPContext bdsp; - LLVidDSPContext llviddsp; - LLVidEncDSPContext llvidencdsp; - - uint32_t frame_info_size, flags, frame_info, offset; - int planes; - int slices; - int compression; - int interlaced; - int frame_pred; - int pro; - int pack; - - ptrdiff_t slice_stride; - uint8_t *slice_bits, *slice_buffer[4]; - int slice_bits_size; - void *buffer; - - const uint8_t *packed_stream[4][256]; - size_t packed_stream_size[4][256]; - const uint8_t *control_stream[4][256]; - size_t control_stream_size[4][256]; -} UtvideoContext; - #endif /* AVCODEC_UTVIDEO_H */ diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 7ee07209d4..fa80cc577c 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -37,8 +37,36 @@ #include "bytestream.h" #include "codec_internal.h" #include "get_bits.h" +#include "lossless_videodsp.h" #include "thread.h" #include "utvideo.h" +#include "utvideodsp.h" + +typedef struct UtvideoContext { + const AVClass *class; + AVCodecContext *avctx; + UTVideoDSPContext utdsp; + BswapDSPContext bdsp; + LLVidDSPContext llviddsp; + + uint32_t frame_info_size, flags, frame_info, offset; + int planes; + int slices; + int compression; + int interlaced; + int frame_pred; + int pro; + int pack; + + uint8_t *slice_bits; + int slice_bits_size; + void *buffer; + + const uint8_t *packed_stream[4][256]; + size_t packed_stream_size[4][256]; + const uint8_t *control_stream[4][256]; + size_t control_stream_size[4][256]; +} UtvideoContext; typedef struct HuffEntry { uint8_t len; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 6e87bbc2b6..c2a7728574 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -33,11 +33,28 @@ #include "encode.h" #include "bswapdsp.h" #include "bytestream.h" +#include "lossless_videoencdsp.h" #include "put_bits.h" #include "mathops.h" #include "utvideo.h" #include "huffman.h" +typedef struct UtvideoContext { + const AVClass *class; + BswapDSPContext bdsp; + LLVidEncDSPContext llvidencdsp; + + uint32_t frame_info_size, flags; + int planes; + int slices; + int compression; + int frame_pred; + + ptrdiff_t slice_stride; + uint8_t *slice_bits, *slice_buffer[4]; + int slice_bits_size; +} UtvideoContext; + typedef struct HuffEntry { uint16_t sym; uint8_t len; @@ -76,7 +93,6 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) int i, subsampled_height; uint32_t original_format; - c->avctx = avctx; c->frame_info_size = 4; c->slice_stride = FFALIGN(avctx->width, 32); From patchwork Thu Sep 28 21:35:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155550pzg; Thu, 28 Sep 2023 14:35:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFoezTa7Llq+BpNwlZOK1dGSflHVEJBgbf8nicEwOd9dEAnF6BR44Xa6YeRKcyYtCfPmr/r X-Received: by 2002:a5d:654a:0:b0:316:efb9:ffa with SMTP id z10-20020a5d654a000000b00316efb90ffamr2180813wrv.35.1695936957059; Thu, 28 Sep 2023 14:35:57 -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 t24-20020a1709064f1800b0099ce780a194si14746744eju.667.2023.09.28.14.35.55; Thu, 28 Sep 2023 14:35:57 -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=kYgY2+RW; 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 E604A68CBE0; Fri, 29 Sep 2023 00:35:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2080.outbound.protection.outlook.com [40.92.66.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60DA168CBD4 for ; Fri, 29 Sep 2023 00:35:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ktIt6s6bUCx6pA3hgG+r2BotS/fylypLIoydmsEGCKzgRHXvm+AyJsGae/L11sRV6uRqLIS6RohtfucXLUz61FXAC1xzxRiLdcGylhYDKExTFMcH9gZOgjz6o0RoUigP+FqXTpOeVNVKCnjNWP+vOv5QO1vxy5gj94y5z2IyUZgEnF6uK6PnurmBy5vEFxZS71taN11AEr9/G2U1bbryMwr0t3zvOnmSDF2p3XiQkNaP8U29y5WU9BFI4s9YaLIy6x6X3g6Lj7oSXliY3NDuiGy7HgsbL2WAF5YWtkuvNlfR4qrbRgiwyDKedvEdbnEiD33P/MHsgF8GJgPEg6mRDg== 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=xw4Zay3ZJcPY3fl2LTPhDJDMgeFsL8Wup5leIEcBqLk=; b=Qguq/kcSNA8CWXQlTOFudrgewTpplZzgf0kpmleTNnQDdSQ2SHfYE153c6MIQAmNwOKVrJTaNCmtnG2GtWytRs+NZhheoSA8Bz5NJjMVdFQbwZF0y+4a9I+0/cJ1SaeDcEkYOWqHoeHdmlm5n9ivD6MPfKA8yulq80eGq/au/bXpxORqVb8VZ7i/+jnlGwZihTbcLdpH22H2yzoTDcVGVfrujK2zcFdsCBDEOH6NEuJ7DFP5y5Csy5KunqEROBJ2JrLBmZrLxK1/Ao2nbI3XMBkUR5Qf5/LbBUnDEY2V9e0BXpS9/2WQrcZdJ2eU7Ivb7wr773e+Hcvr8wop5/VVSA== 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=xw4Zay3ZJcPY3fl2LTPhDJDMgeFsL8Wup5leIEcBqLk=; b=kYgY2+RWDvPhZV+hmSrPiG4VXCFEMSxjBlXLYAQPr5gQYm9aVrcpnIedgh8X1SfmklqeYg8hOZkwVPv6hTtlZxkzl/R0Zq/6oFhk3IoCtYtARP+iwGsOk7KwY6rNP8X7yhvwYjtcAgtFJ6T3ruyrYfHvM4SW/9aHeFK23ZhU3NG6uODxisG3Za1j4Che049WXU+8ClbWIFZGrIw1GIYH/52vmJR5H86tyrwPLmDKdlFycQSy1rSqEp6Seir2R1lZbrLiJCUZI4fv+Gi21rSDLeOPZBYCQl7M6i+k8dvUSKbP0k0Hl5HyZ0mSfZLtpZ/cVaMlenkJiYVKX5wKPdoIOg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5+BgpkxyfIzYeVdxkToTF6XEqUFUVBVA] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b7c7fa4-f52b-4c96-d2e2-08dbc06adcb6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+zGbc9AvpYvKpb8wkORfCITf4J9nx95S7dnRR56oz/G3kZ46CKNieKMpifp47sNd1k4I/bfrjk2QrcTfjlSX30Dkpa6ubYZOl4xFk+nHv4FN8OTQgXgwGDm5U13TJw5adG5GruxFN1p3NTEeIXplhyV/JbrRLKY0cPyj7AYZKkN1koA9AcPd6YM0WBXa73cAhk0OFIkr7Bz42tfefvUU36x7wj+Wnb42syl8boqIQtilSxjdRUt6kjtOi5K+0iqxrxSOcHs58Oir8o+mTxzsC5q0Uy3IYw0+qSDks4OT0PHmx1GdBKWdEsujt9IsWjCiS4PwjJhHIl/yag7/yfIFe6gai+sOmjYzd6AwEwn9qahmLRjJO7mFqbIobpihy5RZtsJQ/REHr7+e8jrA+9cut8Vo0JaomSr6mnn+KlT05aIe/ijmooVM1Gfmq6aaLPC+KiBrwvy56uN6lbU+z+l16AuYXO0LLtcbGfoI8TolHpkH1CxHtiGrT/aWstrn9bS2fi9FbUBTWS/MEVLDpUwu3sK8XvbwPKaKQG8ccSr39A4ADQ+eD9YwuTY93VeFBzcFt1MquiB4MWuxYc/sLiA0zKzGISnpACmpu2jdxUeXoD4/ra16YldMEnaLReWl65I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fnNQhaXx3HML59+RjMORj1d9vSGBfHuUBNMPI1u4JI+PT2QcrVHBl4yOuG/ixqobTt0LIQRhnHMvSXfrWH9DOLNmNjpPmfDfy+CQY311CdPll+BOVdpVetixfamoVwfHJ+sICG+C4GUpRvM54yeMj2F+CHfRqcGC/CRzSM8NhALaZ3RC20HphqD3lveZ31bKXN375eiDVKIgGV8yKFFxSYyWonZr0ZmGDIKvENGu82euSmgI3MtbX+Qk7gNgzGsFr6zzfZ/4hx2H9WZPKxqsq05hANI+xhxZ4RSbbORvbmpX44RaODTwJO772vvMvjfqXwUkyQBZMvZRMvYU4d2XLhNpWFMZCURYF+wEcBhR05OggHFDhDfN9qbGOJuG/SJcKubAE1JcJvQIKgd00D2rjX0NjzwNXYitBDwlegQLghQVcuj+ZwITUdKHkDk32EUhaSMRas08tl4kC4VHqRNi32deW/3aCxBPn96iML7eOB6vqrff8E9k78nSQFvCEls+SCKGToqvCkJHhm/P/02WfDKlWpNVGmySXo4f3a9GIvf2d9JzlmndUUKXrwM98veR/5Txbhl3PKVgn1HfsWgdIDI1fDvVj5EdXFLg+AT8jEif7ptg28DQ3aBv8MJujZpdkDMeqyFsgQAo7BYngXcdVSeArUwa2cvWSb5OJe1DSopPsJoVExfMCJgZgKd1n9fO8iB+OA/gTm8h7n1eC4wfzF8C3d+2Eo3Rsjjhj59NwlunzB7+Fm0GX3eQyWg5htxgK6kAIq7h5HAV967KAsttxfUyCA5AKIgWSBntnbWe7KEaN/fLZwgMNamJsIAH5tlhd5N7xQJSFFzNma68qly3cRzxcyWI5BpiZDpn1aZj/6vyj7mDSfOv+bslctKIuLNxOudGK8EWENevxMzjdt3Gouf31wmeQICF0Fyrd/iZzBFdPp75oithKycyMKk3hZc65sjaRiCdQUMzTuL5TOF2cDBcAG0McYX+MfOHhVsbUALUTnV+PJljBgMatZlvIKdcKH4476yonwmtqLbdWNcfe+Ovg0VBJqS+dNm7Q3iHeedUrLxihAjdy53aK4CAS+dsvhADPhd/AqOYsYn+/FkLI5a3K5QMZStJeCSRYkNMiqUffOfJak/o35X8Kma736Tpc+AkoII/XFHNbM1BcyxCNkIWMUARTosJKyEhyT3cDVfcfbxCbpD2l/hMyElXlo5HaF31ISbRPWSQydepDnGI0gZmrhdv6+q7/xvZrOJBDtuDjhMgpNDMaU3SZii2AVPN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b7c7fa4-f52b-4c96-d2e2-08dbc06adcb6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:40.7522 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 09/14] avcodec/sipr: Remove write-only AVCodecContext* 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: kMfFRfNLXLFS Signed-off-by: Andreas Rheinhardt --- libavcodec/sipr.c | 1 - libavcodec/sipr.h | 3 --- 2 files changed, 4 deletions(-) diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 692b59b3e8..3ddc579f09 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -532,7 +532,6 @@ static int sipr_decode_frame(AVCodecContext *avctx, AVFrame *frame, int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE; int i, ret; - ctx->avctx = avctx; if (avpkt->size < (mode_par->bits_per_frame >> 3)) { av_log(avctx, AV_LOG_ERROR, "Error processing packet: packet size (%d) too small\n", diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index e1ef35d658..e7073987ed 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -24,7 +24,6 @@ #ifndef AVCODEC_SIPR_H #define AVCODEC_SIPR_H -#include "avcodec.h" #include "acelp_pitch_delay.h" #include "libavutil/mem_internal.h" @@ -63,8 +62,6 @@ typedef struct SiprParameters { } SiprParameters; typedef struct SiprContext { - AVCodecContext *avctx; - SiprMode mode; float past_pitch_gain; From patchwork Thu Sep 28 21:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155605pzg; Thu, 28 Sep 2023 14:36:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhSYSeC1Hk2h0WYVd+k889+qRYGw3hY7+Iz8KnUtJp+8mRrGc0LL4cXpVEv7N1/RO9X3I3 X-Received: by 2002:a17:906:31d7:b0:9b2:b119:4918 with SMTP id f23-20020a17090631d700b009b2b1194918mr2456802ejf.13.1695936967326; Thu, 28 Sep 2023 14:36:07 -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 kq18-20020a170906abd200b009adc86b75a1si5326393ejb.748.2023.09.28.14.36.06; Thu, 28 Sep 2023 14:36:07 -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=mqqrE71f; 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 06E2868CBDB; Fri, 29 Sep 2023 00:35:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2106.outbound.protection.outlook.com [40.92.66.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D478D68CBDF for ; Fri, 29 Sep 2023 00:35:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ldoOd0R/TXL5mdAFZJ92I8slPlNBE4Lj6MraHfOLEyGhoc2PDr1f2rTM/uRoRo66PKdaK6VW9Q+x3Lvvzxj2GaAILRRaw0Aon6LnvJEuUxLGLGAg6XxsGmxp9qNZ08DRJ7pW0oEP9ySd5x9c7DczVCvZHta8mPIaczY55T0pSwdiQM8VRgOlin8SKMMR2ca24VkFPaUcugWqIa48zHnTvg+wzHhC0B7EXOsFdHqUe8/WzvAR2eDLCRAzfdJua6EiNHZAdynBnRnthm6d5jRhNy+cli13sejZEtLAwwp0iFXhT2pH5nIeCxzII/J1s/IkJOMd/8394vQBKdj5HZwu/Q== 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=4gvSxc1aF14CRRjgaVjARmmi1OThZBPtFFmD+wvOH1o=; b=AdVP/lKFHCI9QqsR5GUFO2Oqqy8km66BS+EuxPvPC5i8ARVevMJqcBSPQgk/XZ5XHvpXchDtEG0sOv64dOiXiH76J70iB3k0DntlZxcMy8cUh4AuISBS5VS0VCyL6sHg8PIBGr9vprK5lcSYVDvJuVhI7qLr2OeQc9F2eqbYv60agYF/dC6s77U9xrI/h2pxvz6btMVI8ksUF+n3htp2TF9waIhDxxQ8EMJnHuBKBPeZOtVf2ronMnPY8KJIdQe1Lv0Xu/IJrRyCF3/Yb4vOGQEupkHBGnn4VpJTQmR6g24mUelXPlK9u0otGaMpq0VaMqAncOOv1RTYHzPLc3GbDA== 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=4gvSxc1aF14CRRjgaVjARmmi1OThZBPtFFmD+wvOH1o=; b=mqqrE71fr2zMcIOvDafJQqI4GkQQMUgg0cp/vapZNN7YTwo4CFJhncsPUKbmnRA7JofPETTocKqx3rC+vBMtUrfb0K8MVlLmWV7Gdl4zVOvu0ad2llzzVxJCJf3Xu0oRtkHrXFbxgKyYBhHaHHJHKaFl/973mZzLS14LxZ/aTK8cdzfbR/LXvCE/2qoCth8XMRdlAebnRl0SJl+ilTfb0Znpvo9JPPLgaiOKORpntMLBOOybNg1LDLtZ2nxjYTSq/4g9mx5/KsP8ltg70Y5tWAKcIPfxgpCloNonkjCjljcWHmEh2h3aM2BHauxHKkKuoN0Fae+Xj7p/ZpgxmekhCQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rNtHIl9tUU34osjW2lb5k59PajFDK7qR] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: bc77d471-386e-434d-5519-08dbc06addcb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1KKDI/hgBeuKMmF70HVu70zMJBwNA3QTlMkSFwwnSl/b5dbBJbRTxrshFgzYogSopyvXcZ6jwta3Kmbkgx4ybiMMkhM5cJoIlaL8YE8F8XxJ9Jq/PvY78jthkSK9RJKYkjUi/lV8TVYSk+ZUaIWiTrk0aNluFiefrQcWxOHPEXkEPPdJRz16P5Ayhtn8XQ+B2ERw0P2b6bRYizcq8I3p78QLgtDlFGeB5tpMHAkRh8lN+JHlwf6sfZO2GUy/f3oa3DkxmgJMODL1wOq2iSY+cCkJZsTbsJRsEltYxvNN8MY+1X4fWjvU/GVZ9nngQnr1HIGxrT+YSfLkEyLuts7lOuc4PG8iWT3ZLgNIPsTuQCZpB8wMGhJSyGq+3Rg1BB5esUUswb7Up++IbjvAycE3Gm8Ic/Nd5MQ7pc6CiRRKInkMegnCllCPW8GutHYV+8RM+ZPC056PxaNMgQMjzAiQeJyrpHqHxpt8p5Xz0sXvQS3ypit7b45s8ISR0hc5rgkJX2NzI0UJiwJVnT9j9eK3VUWf49e9SUE7sF9mKDXfFNlq/cdEMfjW/rf9FNBeNY+ZxsSuBaZT0OQACfL32pnZ8O2TI6BsdIi/KqBV5/yHcWZNhyQUS25EPR4oAARJYAwt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fUSwVJFMJDEnNzsvFfcu8Nf4MtiMOLohmocw6lp0Koo2/584re+Jem2pI6TsIcy1j+mqHAvP8AIDR8pqeHGMk7bPTGbw7mi33SW2vm2YC1Px3LQEamz5UYg9NCKvzw6/XPFx0d/NLB9KvWhESCdnSkE6GnRz6+c+SFvnX8HjW/X4R56IYW7WZNZj1KlY1k+GvjxcsuCUb9duTSOTc5+07jswFl+qiZkc47BVXneavEukLgy85Vu/Or2Cq50Tv/NB9ji+SsgjHV7VBxXC2mi7hDViYbxkNhpH3t5aJxhk0SLcDeU+TmkJxnRO9ZkLokb5SKbcOTDtF4E1ZSujKPXfMTRRYDsXXhxk+5Urfn22R66r3WMXGIjqXYa5ueIvBDMGUjPqyoToWbjgAJCWDtZ9Xbpob/h4KOdUWQXKqpabtsuESHpUtPMrKJ2QlLwO/DwngrN6a76qwGr8dDSpUWYoEv9Z5+893fB9uoTzfBtSPH8noo1RxuZfxV5PgMiKQSKfb7lNqvYihoXrmL5u7QT2LarOBT6sLV8XEypizA3HzyuGMtdtFuLWirN0KISqy0i5TcevwBkP3HwDD/A0HSpoRcH3lC5NaIzBw3dbZpKTUAa9KIctpqUE7jaCL7HxgvmQMsHaYDPxyLYt4+Lv4bvEhfc2esmhlFR5undinU8hzG/NwfHmnFB9pRzgvzis/P4MR5h9wk0kZJgqnyMMcRtuOw5YxQhr8unXigI5gvNZkRSEXPsWJOSMK3NnzfGOUo+FmQhPgdGuzWeMWdHsnneZ3zq7msNojmILWj2Yx8ICCe0xjtAYpHiSVLEkioOa8sdME/TEmrpGpJwLPpbWvgGJ80Qn2/TEgOqCXsdh5kL1IUFTKF0H2cF14td2NL/IErrKaHw/blKFqYPduabCYSHBW5HsDEbT1jWY4Ib8va0enVHFbTl719Tn/9DZaScgF5i9fTNNRPbNAg285ZOoJzmnM0p2Z7kyLJpl6Qt2z1dSdjcUTBEgwI/ptwJZGzworhUCg2a0/KSRMSk7D+lExTT3/NaB3RHaoIal4pDY4e90X3qXbovYRuRf6mn64KasyI8C+OH92gljXZs1M11GObzux2Px6I0qXIzSMsFg5A4w2i0tNNXTNGW1AYej7pyZJFKqK4OQUuHjnwpY4kDRkQJFhv/QjsftIGvWCv0i4RMIntKNouEbwjDkjuyx0tj8JxlgTpdhc8GyzrM9OOrTWPJhSQ4syApBFkFTQoWdWDIkYz1MHnslBiHq2oTDyBTA3MYK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc77d471-386e-434d-5519-08dbc06addcb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:42.5666 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 10/14] avcodec/roqvideo: Use void*, not AVCodecContext* for logctx 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: biogo6V/S9ki Also stop setting the field once per encode-frame. Signed-off-by: Andreas Rheinhardt --- libavcodec/roqvideo.c | 4 ++-- libavcodec/roqvideo.h | 4 ++-- libavcodec/roqvideodec.c | 8 ++++---- libavcodec/roqvideoenc.c | 8 +++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index f9a3c8e083..ca8c8de967 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -111,13 +111,13 @@ static inline void apply_motion_generic(RoqContext *ri, int x, int y, int deltax /* check MV against frame boundaries */ if ((mx < 0) || (mx > ri->width - sz) || (my < 0) || (my > ri->height - sz)) { - av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", + av_log(ri->logctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", mx, my, ri->width, ri->height); return; } if (!ri->last_frame->data[0]) { - av_log(ri->avctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); return; } diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 8318b6e5a0..2c2e42884d 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_ROQVIDEO_H #define AVCODEC_ROQVIDEO_H -#include "avcodec.h" +#include "libavutil/frame.h" typedef struct roq_cell { unsigned char y[4]; @@ -39,7 +39,7 @@ typedef struct motion_vect { typedef struct RoqContext { const AVClass *class; - AVCodecContext *avctx; + void *logctx; AVFrame *last_frame; AVFrame *current_frame; int width, height; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 6f2e48d2f3..bfc69a65c9 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -72,7 +72,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) xpos = ypos = 0; if (chunk_size > bytestream2_get_bytes_left(gb)) { - av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); chunk_size = bytestream2_get_bytes_left(gb); } @@ -80,7 +80,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) for (yp = ypos; yp < ypos + 16; yp += 8) for (xp = xpos; xp < xpos + 16; xp += 8) { if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -114,7 +114,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) if(k & 0x02) y += 4; if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -169,7 +169,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) { RoqContext *s = avctx->priv_data; - s->avctx = avctx; + s->logctx = avctx; if (avctx->width % 16 || avctx->height % 16) { avpriv_request_sample(avctx, "Dimensions not being a multiple of 16"); diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index c25aa39b73..0933abf4f9 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -911,10 +911,10 @@ static int roq_encode_video(RoqEncContext *enc) /* Quake 3 can't handle chunks bigger than 65535 bytes */ if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) { if (enc->lambda > 100000) { - av_log(roq->avctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); + av_log(roq->logctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); return AVERROR(EINVAL); } - av_log(roq->avctx, AV_LOG_ERROR, + av_log(roq->logctx, AV_LOG_ERROR, "Warning, generated a frame too big for Quake (%d > 65535), " "now switching to a bigger qscale value.\n", tempData->mainChunkSize/8); @@ -972,7 +972,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) av_lfg_init(&enc->randctx, 1); - roq->avctx = avctx; + roq->logctx = avctx; enc->framesSinceKeyframe = 0; if ((avctx->width & 0xf) || (avctx->height & 0xf)) { @@ -1057,8 +1057,6 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, RoqContext *const roq = &enc->common; int size, ret; - roq->avctx = avctx; - enc->frame_to_enc = frame; if (frame->quality) From patchwork Thu Sep 28 21:35:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44012 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155693pzg; Thu, 28 Sep 2023 14:36:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNsWUwG87NeC+P2ATbam88HJDydP7lO0cD7MHNk97Th0+nPHtM0hxwH2OsEx13ubzVzbkL X-Received: by 2002:a05:600c:2303:b0:405:dbe2:df10 with SMTP id 3-20020a05600c230300b00405dbe2df10mr2165316wmo.35.1695936977750; Thu, 28 Sep 2023 14:36:17 -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 q11-20020aa7da8b000000b005309278af44si15674237eds.274.2023.09.28.14.36.17; Thu, 28 Sep 2023 14:36:17 -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=RokeXTcA; 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 4318368CBEB; Fri, 29 Sep 2023 00:35:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2022.outbound.protection.outlook.com [40.92.66.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D43168CBDF for ; Fri, 29 Sep 2023 00:35:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y2RiTM/UBqzdBPn+C2uPQFLYlOVvggzxi5DcWIM9S6CJPcBS12wI2K/Ot5qXF6qHwIUT5i/Kp7BDQWfCxUxtMZ7q1qNEGTGz7Z1rjfEZeDL1afLfn6bSIjLjfR/Sa91m93HmRlx/Ep4v8C2vF0yoOEtdtpAhZz+MumAVuGdyPdWsb7v2KnlE/DeHGCQ9sTFXLXbySLlZ/NlLpkhNLZJ2PHRSfv2soF67zhRJwHTy9cXToGBpvMaCL8gyeaDYGEn6dkgeBMmbunNv6glZl+pTxAy9hVHl+/aj3eNlX+2MC/1AAhVHAOhSN61QsTusejdymfFDLZxLXucV9dvCNYI4IA== 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=O5LoWekT7WLxayxlKSmCfwpPSSGv42QJI866NBFvSOc=; b=J0Z4idlE1SbKcHeaiDpOun3yZuAfDkqt71l4k10fnBtOVPyfazcls7hfhA8g+tp/zs6rl6POwxvNpXux8eS1a6Wr0jl+aDY2Z9vzP6+OQ1yveKeG9O9xwSvjX9vGxuRt0lkFYwHKcZQ7MXIEXnSQVFN5O4rr958wkxHcqttsbLwplnM1VFhRZMtySDPtTQiqH4R3h7cQzfU+4jczEKCq1amgYmK3ibBX4PjMwbpSglKtWJIbQLubTM2FO7WW+DqikD9Ob1wV6AVORIDDH8315ybbGYn+7FeRtjLY1v5BKK2rs4PL/621gtMelhehAULjuryjT6jTkCm65dDz+p5m3g== 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=O5LoWekT7WLxayxlKSmCfwpPSSGv42QJI866NBFvSOc=; b=RokeXTcAQqUYUVJM3X9C+z8g6wtIURJzLnH0Af8nLHnN6t4Pq5NofxIT5qG12A8M+Q8qpA/Q3NLZXzK7kUKoiamgtETCRA/XQIHhXbRg9ygSVtW7G5KVpZKexQkLHYZK5raFXgM6wV1DJc11f7sARBgfhI1G0XU1yRAwr3V+LRsHAC3MfZ2yuixJcJCZ6iMMxYzSWmA35PlVHvq+1ysYHLCurnduLd/RZrq/Mqz7Tarh8TanC9LXQHxFN8zOwB3GDBoLu3q1fw2vcFaVDEnpJlEox2XHyRtrwlagURT4p2nzm2fM9XYINp3QY2uRko92EzD9LPdBAqLDnDuqwfZ42Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JugwnXcnLka+1sVZgd94r3CLrMS9V9Sl] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d5a307a-0f24-4b4c-7c70-08dbc06ade9f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ye7g4ifLhFkaUStYhE/BeyKtIDmEpqAVKb/2oHua0ZimVTuOmAG0+TEUvm4iJPMPIETkRc4OFQ1nToL/1Cp4ynMRweqW4CGDb41dJj0u/K4xwgeMbbpzh54dLTomOvgnWkhZDqjSTUGrwGzkd2+8BIs4Qb57ToRgqV0+7JG5mSSA5cBzbjyQbGoiVJPid8dIP3gmyofhMuRMo6nFT0ejuzORNRgQLkAsy13sVY+jbZPgtT8fxiTbFS9N3Nb2GavsC046fWb7B/2LZ8PwzBhER/pEsdc2XSXO6CsnVcg4UaJdIFPMokmWB5EDltKf+uBWG/DWv/YXtQandNdqCzLbfoUporBcQR5g4qkGu5uKcNf8VGTO9msJIbF9PI/xNaw6HsUdp9t2yA/4QM6AoOxxxn0Knxgz7zKuO+Im1jSbvy+lzHMa2e9qn82oeOIpsnmTDaSxH5kqldMaFRYVBX95mbW5GET3BJd4XiVihWjSDxx2uB92Azd24pa+WA0m5fPFvKxfF4+BKgd7RqLPNDHWdsg4jgitKTFPMSHQ2xyqdpz2pV0RXSa+wqBhOgKEtSChnWTFWty3sn6sOcuj/PdIu/JVPjAVTFzXRiDUQao1mXmHfjOnQZ6bopssxsDbhotK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pVUdellFq2Zm39jSAcpsfdtatj4hO6jgv8d6qbsdduVyG+l4ZyPX3yMY7NrcQ9zQSmxIoJ48WWUI3XR7YtwV86I2C+tih6yePuvkjVcmzz38qqHrf8ftTWFqSzB4yS0+yeMsbkF0EOVhEyQGpr+Ql/nRzu9K8SlfQ6Vxys0569NsQJ+tuttyqcbnSM8v30wiWvLUFeuawCNGWuGzrYP3FB335/9xBHzHkNud8+IW9CGG2i9Ebmrc2FQks36HCinxA0APPDGNNQRuu30c5uQsxeUvxiPJ/bKVWKdL75KruJOwe7iQ1TtotagC5y52W7NVOkbg68317yHXr5P3m/0t1So7Reju7hfeNcfYeR+iusn1tDF6q0u9nbrcGlptRALoHFW+qxnhwWcTtd80J1b0dGMQCWjtErM/IzV65Wo0c6LI/H4Mm7iv0tTfRgHnXch89Lp4+dUovQBeFDwvlWI7QhJLoCbH3OOu0sEzpBhIZiB8ng6biVVXYBb6NiGm/HvsNYCOnjfw/tq+hN9Rd+vLaI2EVDmsO0guSEzBrkZUNd+TKD9AvFjsZQO8FuiUUfPo1PO8lUW/yUkH1hngdtFS6SsauQoJCdVNqHQGzfnl4Z8c7BhUhzKmMLuK4sKxPQk258iUBq5tqsIr4hR1OzMB7g/+KYxP0hCRD2HSEwcTAdjKpyQ6ANQNiEt60qwdisylyE3MwmMzi7n44TcN4xcc1s0bpgUw9SAvKbLWFe7i1/m6hPPCoMajCFbZPMsD8ODOte2pq8Z05yx6MGpNb/G+ucreJmj83r/Ejm/+C357L5pORPJ4aKQHoKxeINJPBnlYAI9toPpTf1N3VKLhRUeGXDPKnrW5xLUinElfKSJp8jQJKzoj+YY25/d0wWIOfc7jVNSKubZgpB8ppvTQyLHa6G8kcf9pVT0AFQBOBCKAwJZYB5kTXGXpS894NjG3b2ATKS3Gi7lgnLrjpM811IcB+Arv1guf4Cyw8gSQyDfNTNsRjeQzPEK3md+YT96A3sdmz6zcvFft//Q+YTj0u/+Fl//UiiRsMTF+7dUbdU68WJudSb9Eo68uZXZMnf9y7D602jyL4DilX2YXjsiJOH9yTyMeFCLe5a64L6r3Nnx0jO1QyIXoUdT/w/p3EwPi6OjIBCDnjOAgv7WyVPlXBnZ34tTRve6QHPyL0/KyS3vH3Sj+tl2uJVBthY4F228ZUxzqlHcnU7lcE2ApjSrAYx/RvP5y8YjUnQxOOBCxz3wthMiUsxX8hRwJO6Ko56v8nbAu X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d5a307a-0f24-4b4c-7c70-08dbc06ade9f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:43.9425 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 11/14] avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx 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: +NICVmCXm0zI Signed-off-by: Andreas Rheinhardt --- libavcodec/opus_silk.c | 10 +++++----- libavcodec/opus_silk.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index cf8b16acff..27671516a0 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -48,7 +48,7 @@ typedef struct SilkFrame { } SilkFrame; struct SilkContext { - AVCodecContext *avctx; + void *logctx; int output_channels; int midonly; @@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || coded_channels > 2 || duration_ms > 60) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " + av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed " "to the SILK decoder.\n"); return AVERROR(EINVAL); } @@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s) memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); } -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels) { SilkContext *s; if (output_channels != 1 && output_channels != 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", + av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", output_channels); return AVERROR(EINVAL); } @@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) if (!s) return AVERROR(ENOMEM); - s->avctx = avctx; + s->logctx = logctx; s->output_channels = output_channels; ff_silk_flush(s); diff --git a/libavcodec/opus_silk.h b/libavcodec/opus_silk.h index 6552c166a4..4b595da2b9 100644 --- a/libavcodec/opus_silk.h +++ b/libavcodec/opus_silk.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_OPUS_SILK_H #define AVCODEC_OPUS_SILK_H -#include "avcodec.h" #include "opus.h" #include "opus_rc.h" @@ -32,7 +31,7 @@ typedef struct SilkContext SilkContext; -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels); +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels); void ff_silk_free(SilkContext **ps); void ff_silk_flush(SilkContext *s); From patchwork Thu Sep 28 21:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155765pzg; Thu, 28 Sep 2023 14:36:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGihyDGauEB1jbKPu6bA4ciqMrG4NOTsFVIyllzob7995oUYWON3VpzNIkEkevI1OPp7Y5y X-Received: by 2002:a17:907:985b:b0:9ae:6a08:6f53 with SMTP id jj27-20020a170907985b00b009ae6a086f53mr2360631ejc.63.1695936987525; Thu, 28 Sep 2023 14:36:27 -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 q12-20020a170906770c00b0099332c48e49si15259261ejm.133.2023.09.28.14.36.27; Thu, 28 Sep 2023 14:36:27 -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="ePYT/T0a"; 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 42DA068CBEA; Fri, 29 Sep 2023 00:35:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2029.outbound.protection.outlook.com [40.92.66.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3348068CBD7 for ; Fri, 29 Sep 2023 00:35:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C12Sw5Bu1A5EGW/JaLX/Hzv0pjtfeky07e/R6880fuO/SJ/a9iPyfeKNOs1MityWnK48E8eS9JEQAAiPihVA7vf0NJYK5BFtRRz+s3Jl00cb8vgxJ0B3w7PhJpWgTFMgCVPgHYlLFMbDgWVqYhkk0SVIwDZqXAFqnYAmPD/DdLGNPUYDoMKICn8y5158TcEhrKBI5cVAau0UqGdQ3DIlQPYNTzlkJmDludvgoFTnA0kz2t4IdozczIBcKXw+tirw2Q1Kd1YedKwdOarLR6dMpfNElgmb0SzdhERhFNJXM6sS14S1en9vd7UTFVjIJA6cRBVqoaHx/L6eqMFLropdPQ== 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=8ab8hbE4djebwM0gJ8p6YEGtfHNZgilRRJMOImiCgrE=; b=k0lyeXcj/+LZLaQC/r8bpVGb+jNtfL2hSwMPY8vL1DaOtwlQGudxjs9xkt3Re8sdanc18GD8pMlLWVfSX2TmY6XD9jEpe1SHfXeRFZettxpNsYBiYw6HXDyvl4UbSt6Lx5PxM+8gK/OHRlRtRGyt/Q3sxu1dRxb+0Dnf+FncpORLO86pxrm6jYW3qX/n3ZEjRrhQiMt/KiUrHB2arND/K8DdvhuuKdz4R7bFgaqdxTckuR9/y2s4JKjOrfxzNpWmiSJdl0W9fLaj+m2sdcLzqwnURrhWsiFSNDInBdY4EMVr+YFZOxzvXW5TUudJ2ZjeE/Y3GnB3m/EYnO9yN/CArg== 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=8ab8hbE4djebwM0gJ8p6YEGtfHNZgilRRJMOImiCgrE=; b=ePYT/T0aZtX8V6TzC69FtjUYwf7RxOVIsYB/qr8kOqk69vo7tb938QL7QQN29pheliqLbhLg4Hmurpli4ubvryReswbVbuj02zyzv+ncw/TEQZwLErKfEcgbK2aZbzpo912qILU9RRxgD1hhaocQRYxi8klxjamYAyRGPnjgzGBZirXizpLNLlwa1u8pjtfD5TMbldPNo5M1R8iEIiJkm/+XXULernCgKwxIYzeXDoLRXAPP8OY7vHYzQPpAC5wcTbFLHvjgvcQb6yUfEMbzeFHyyj5UZn4H4f1DxxWJ1cSGUFv6kSeEEVnF6lSvWoDBPZrUXi89FQC/2nfRpHjVKQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:48 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oRvoSaEzVyU5oi1bO0sAoNsExJ21oYUn] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d7e9a8e-c42e-482a-ddfc-08dbc06ae108 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P4m8ETFSkfUQ9T2Te3EJnChipjIKletTXr6xezoe8N/Ziw8QaVQ3a6lStLlRfSzsxNBjNIRU7gQ0Oz4tDMxaEMVpSTqD4oHCnkj6N06vqH8sqXRt+Ro0DUsGAvM3vx9+Hvdu+hzj/Lr4sV8FJ8HT0MwRH4btT6jRTaLxjVo2QgZ+E11zfQTKj/CiS5JVU6k+9QamBmkQno38y3ARBPJ/yqj+JCYgW4xwN+hfEdwtwYJNwVO+Cp1j7foriWTp430J9iSUDysWbczsGyxGVfmagkKqLkuGq+RrnFVzdsD+WGjTKpFuFOe82rVR37H1KPYj6tN29qpLpET5pTSWd9Il0BMn28am2uf7SQhjD0tw5Lj6V4fOE5eUhO0oFhx5UCofHB7CwugjdV1e8OEjo8d8DWV4BGew9xGqCEuCFVAoEa2r+pKlxh7PH4XzuA4j4jKrT7rgFIkUNPGge6LdekT5zln+IAFrO/Zr3BqzUc2f7ss2lbLLpFr8qnjt+VJFeOc2Yr/2Vj2n9XolfvsZiLkFSeX9zPjQSoWma+HNPSVL/dV7Z95Nqfoq9tpfOeloKfQtmFXOKSBS/iGboAE9BaHAlEdPAPxR1B42MSNzaAxbtCg4d1jV8iw6+K5O+7gLZG3k X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LfBgLf9GG2s35LlkW/lk1hx8d4k3+wc+n9wq+L8sG5Tr26AfbniCQpQhq68K71xtzADoPoIweDxuBj3Hy5EKCad4ADcOxp1n/L7T+q0MZPI7jQC0aZWybnBcqDtZtI6CpByPG7Sm0GurmPVtxSX3IM/fVneBgrpu/8dAsoEp5h2Euy9Hhb8LQt6xpwiRVRYTb8kNPNjfxkwIJcBrpcL1eZVIRuGEuJJTq0llnhB5rYOLfqsId4NG4SPabo15TcAhhCVqJ4DkIkJeKLRCRvfA7dppbI9s96u6DlwcDwQLT+wWdng3IDi80QCUQFPzpFKvfbjrc/4ZI58bz4+ctErw9jTppVK4w9ROij0QYMy58RL6+3LRtwvHu+eFWmsOI8+7SS1rEt1oanbxDj6rxhHXXc1+INzTFChX+FIn8zzx5NnVRa08DZIEMk0FNn7JpOwGmIVs+2/Xxzw9DtvwRyxLww5zHswXYJ+XjN9sFrLOtkDJwqCyADQV3M0cz1VmSsSHESsDlDdHmPY/yzpsNFHUVZIY53aCaAWlvpWVNisIreABakbGI+iZoL4/1VP5GL0wq8zJuvvcUbNXnlQXCGVGPMlqhSKMjkjUI7u41t0JhoK10GRn5TYTvdrgvNOSDwy0Tddz6ul3R69RmNyen/5QO1V8CKRKveZe6YWjeSax9GYRbEvf2M+dSvZdyAjMPRrlPwHL1F2MRJ/JgUxZKipus9ZWJ1CI8aPaoML64NF0CCIhpdt13hr3JYrzWa+0jKGjHJNl+9EbGgaHfkq4MCdQZIfyiIgX0Dv+vcb90Aq7PVgT0K/qFWV4HjuoxVLyyvHf5Zod40W1+819eOwzbwnn1wNVXcNXCPavPVWt+FPEh7Sh+9PtfEMwK65Nb4QRlOXdBop43KbZ8NeMwC/9A6Wse1aOO/M9WbG+rlxG4WMR8SfU9qQpxqI76ag/elv1lykACxATAfg14RkkFTO9LKAioDKaghnsxGdPU4sOHQjx9TBjNH2+72VG+B1wS3gQAEtK1XGHC1eG+exoPPHBdlcQH5b09SAB+4Rjt60fk00/wsgxxi3dD+akHbtMOlTc4zeJxNf2yiKZWSr5Js6DmXyw3fe5m9+DLdAe8x6ukqf1y48OKd5W6Ou+yO8prk63FZ7iiJX2DsKyeHiyD2uqHieVGqIeffEjKqAl6poFHvV6k81N09WkuM7jsSYUw9syEcn6o1yA8rIM3yBqA9FfFttZNso+wB1KKS0W5f3SO6Pv4tpNLf1JBX6ZuUexphgUESeH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d7e9a8e-c42e-482a-ddfc-08dbc06ae108 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:48.0450 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 12/14] avcodec/lagarith: Use void* instead of AVCodecContext* as logctx 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: imHLrhLVlKaX Signed-off-by: Andreas Rheinhardt --- libavcodec/lagarith.c | 14 +++++++------- libavcodec/lagarithrac.h | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 3288c0517c..9574f78871 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -166,17 +166,17 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) /* Read probabilities from bitstream */ for (i = 1; i < 257; i++) { if (lag_decode_prob(gb, &rac->prob[i]) < 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); return AVERROR_INVALIDDATA; } if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) { - av_log(rac->avctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); return AVERROR_INVALIDDATA; } cumul_prob += rac->prob[i]; if (!rac->prob[i]) { if (lag_decode_prob(gb, &prob)) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); return AVERROR_INVALIDDATA; } if (prob > 256 - i) @@ -189,7 +189,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) } if (!cumul_prob) { - av_log(rac->avctx, AV_LOG_ERROR, "All probabilities are 0!\n"); + av_log(rac->logctx, AV_LOG_ERROR, "All probabilities are 0!\n"); return AVERROR_INVALIDDATA; } @@ -207,7 +207,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) scaled_cumul_prob += rac->prob[i]; } if (scaled_cumul_prob <= 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); return AVERROR_INVALIDDATA; } for (; i < 257; i++) { @@ -221,7 +221,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) cumulative_target = 1U << scale_factor; if (scaled_cumul_prob > cumulative_target) { - av_log(rac->avctx, AV_LOG_ERROR, + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities are larger than target!\n"); return AVERROR_INVALIDDATA; } @@ -463,7 +463,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst, const uint8_t *src_end = src + src_size; int ret; - rac.avctx = l->avctx; + rac.logctx = l->avctx; l->zeros = 0; if(src_size < 2) diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h index a31b054dbb..2c8cb7385a 100644 --- a/libavcodec/lagarithrac.h +++ b/libavcodec/lagarithrac.h @@ -32,11 +32,10 @@ #include #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "get_bits.h" typedef struct lag_rac { - AVCodecContext *avctx; + void *logctx; unsigned low; unsigned range; unsigned scale; /**< Number of bits of precision in range. */ From patchwork Thu Sep 28 21:35:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155826pzg; Thu, 28 Sep 2023 14:36:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIRXh2KFTQzVmt3gQjoW2lymGZdAQrYlgD1S1A7AwElS6EqFsooktq1NohIdZM13WOAY9y X-Received: by 2002:a17:907:2711:b0:9b2:6b4f:d5ab with SMTP id w17-20020a170907271100b009b26b4fd5abmr2426118ejk.29.1695936997221; Thu, 28 Sep 2023 14:36:37 -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 k7-20020a1709061c0700b009ae4e1743f6si12495360ejg.641.2023.09.28.14.36.36; Thu, 28 Sep 2023 14:36:37 -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=QWJX2vCT; 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 353FD68CBF9; Fri, 29 Sep 2023 00:35:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2059.outbound.protection.outlook.com [40.92.66.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9DD568CBEA for ; Fri, 29 Sep 2023 00:35:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NoPPAPGBhWoE5113hP6SOLyqCZPhrHLHWRlLbnVM2TmMH1OwcDB/q6SiKVg9gvaNPqxyYvO1g9CWczllea4oLymRmjth0L6GTVIn1vr35aNNkk/yMoSln02502egyrhjtg7obMtWAnfipvPG+a62mPFxSKvppw3jw8aWwvrHF1Pxa81QCgZGtXQeHPc3YGPGHoTIXhaZWmJujcHLNcnGWCQoBJKvbfZXTNNyyWM0wXajMMaz7vLYzGt8d8eNB1aEQ+CV1wL4rOPIXogrNZdbjgEVjkLnknioLrdYegF0savP/cCtHvXN9Dqt4Uz8yxt0llbVqIPwrYMk8XtooXcuuw== 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=0HZWyWhF7MQ+8FVpiOdtN2QrczDbQTUzBAy+yRlYtUo=; b=mxjt1R1Vilm2VYOZwuv3d8U8KVPtDuwvPTf0ZDwZK4fAkv5395DiM5ycMKK1PysuBlN2Smzo9kgjW+01MIXQFR/B0J3oi0TAKwmeHp91A9QzCmhtist76YNc9eNZKPLJh0oNGzBq7SycnUblAq8HBJHsQuMDhbCz8EV/8VvjcVB40uQ+VEEHGTOsy0UnOFB6Cvw/y+s68ZmVhvsXim5LiZvXGECLxmcuf+Ux+fS5+B70TnLUi3OTJgQA7oUUUIUngcat6aQruomUsDQnXw6x1hfODy2n4WOPprvY4PPEJ41kpa9TrpVix5LGBWfgwOE5Kkqu3W1XRcPEedFaHpcytw== 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=0HZWyWhF7MQ+8FVpiOdtN2QrczDbQTUzBAy+yRlYtUo=; b=QWJX2vCTh2vtuxOHQ4yYEpaGrBz0QgP1kcytaEuOJnhq+0RfeCq6d8dCOAWQvUrDkU/meMCoxleJjWqK8ghUkW4duUzt24KroKQ2rOK4yuFCTIG+q7ZfnDjj7e7yOQW4I3MTSv0U/kwEGuOOTSbTJm6gNVlPpEJ3YaiG1TxUC+Gu4cjoP6L8a9eRfY2l8x1KIwYuqbxYBEgcWB5eOpK5MWmfjcYiCRzGmfL03yfU4UfhpyhtwGIpbXJWcycsQo3hTRlX+VI9KoGQmOKcMGd4mbJZX+j57EYol1cVK0/jNkjCRENG6sPw7N8sO9pqOun6bAtPqhmnhfcKyQDx8I0xWQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h0xq9dBlZkAoyLjX1+qWywDkuNfVuk1i] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: dd39c64c-4a33-43b0-9429-08dbc06ae1c7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JrA0e+eoyGthdZf3HA/W3prIocnUKFmJhaeqw5jSX4PSXK/pq19cHv+iPtQ0Htiqkvx4n0PDlHgXUniNESBFMr41YAi8YKAnROQS2pEcd8VXg4mJ8uhm2Esr0Bh7wnjrVIcXqX/WPaRGw2KIspqA/KxvBwAL7Fv2oNO5v/UuuZ7gk6mqVlkOxdnOyNAHXsJ2mxp7pJql7yBMZdSbcRhkZYAj7qTPabtCdMcrsk46zwcf8h7eXC942GJf2n4iQFeNjf3tRk17OisIPRxksweibtKvzqdS2MGaYBewYq7q1wB8kOC3QAdGa7OECup0Mn4NAGoT88XhyJElKEJ5uaKrJ/SBbJtxaRELOlyMUx8BsLAMZp8tIhmoZ6Zv2acNZH1SGfqpwlJKmVCC1q6EoyVj7bgnF2QB8hYVQkfwW8OJ0YcCdWfJKCKHUJ6xg7jtCYD5LYIO1po2hutsLWA3zIoTE0bgP+fdgoyTGrEoc2wug+j0+7CcKS+VpfFI8Lx/mszZ3T3HeTKpnetT/CMwYa9vWRkOsE1IgK3MVbIk3Sq2UY5nJjaO0VBAW4hHpbHjJ0hklQZet93+cRh2cjS09HkiFx0Jl8gbLgb0384z85ezpeY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Uz9lDTEAGG4o1KRoYtOjYelPvot9V5fODAXCiP/2SCYZP2vhlwzHz69casy7xGRvzxiwGjQn64iWDWzMGc4Pb7B6Q1CikWOeTZhHlcMH++Bh+Z+CF65jYz294X0+ZgT1O3sJ7o67GfNjsgadQ6xmOWFKRJ/ed5onEOFErVilKtiB8gu3wsYEJppZjqGNvEh4KtDIf+/28a3KxUNCu0ZTL3qkKCaCGIe/JGwhXqTFIRpkm8BnB3/pYaskdEcu+WwOMEH0LBpbw25hvyYfSAU9+/NwOLNkzSrIQsWhJ6BPw9TDmuFF/t8EuPVIU+AhRNpOOgJGjF6/sd2V83eFwLIkhDWxMPeRP/jx/lo6WUkEQ0MNiHuCrVYL5fHdlvw1eHDjUxpry0MAuCYilZr83YOcrp9T8DFG3Zqb67Mfj01wfooPdpA3oZ59PEJrgBzWoI9JOecGeZODGdZflmQhCV2tDQWk5M9oq8ek/A1CNBV3sG4RQTMjYqLzF417oSdib+I7fRgEQly6AePUX7yEQZBMOnEKW8PTSx1PX9xCQRzzoBcFK7WemiRAVBa43TM8yDPC5++KVwyMFd+b+CVMGallwKY5X3VH5e2oTjM34AUhUvXXMnOAm8biYUPuvDxNBmJidDEZQl0G828z1nbzLLpvv36l96aoaAmzeVgO9w/dhaMaf7Psp+K+U1CEbBXeDWV/Ka27bTCnVKeH4IzxKNH2Dv+JwOMBOZQEFU6+4JQi4dH95ft7+axJkSEFGBPCmIYCERWuf77E5bVGcSGMQUQ0t/9x56ghXBm9cy7wraVM9TUWmSp/+Psn4wKZHW8lqXKBGzd65yReed7C2pXn123R5ZFGGrlEioFULVU/qJzZY3sgcRIYMMk0mveeqK/IqQ4pKfxmL0kcNWWS8zMWbP7prK8j2j5SntGAxAqbwtlTNm09C3eJ4q/D1HK1plrLWH8J3zI1Lq10AJ9syLy+w/EQQwe8+fNOsppTEWo3xl97DYJUVeEmr3q0wrc9LvW94aFovm1LilW3iV7Ee7DXfM9IWFYPkH+3j3kJQf0AzSG4zUCAsYYT2iOMjmargm+5Gk6P2ed5zg6L9PMPrQ+XcuYyZmWxnhTU+nf173bQaQzHeMSr2oRRq0BtSVPcjClrLuXXuQmqBr6asKuUjOJKt63LQIR732XDJpZRiGaASaXDb+2wA/xEhHdDt7lQS6cZMQVvGttDI6l2hOotUfa4pu+crCG/woVBLYCrMCIi61C6ogVV2UQD8ee7l3EggA0u0I64 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd39c64c-4a33-43b0-9429-08dbc06ae1c7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:49.6101 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 13/14] avcodec/flac_parse: Use void* instead of AVCodecContext* as logctx 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: b0j0vs1glmCt It more directly shows that ff_flac_decode_frame_header() does not modify the AVCodecContext given to it at all; and it would not be allowed to do so, given that it is used by the parser when it is still unknown whether said frame header is even valid. Signed-off-by: Andreas Rheinhardt --- libavcodec/flac.c | 18 +++++++++--------- libavcodec/flac_parse.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 174b4801be..fac4cff9e7 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -48,14 +48,14 @@ static int64_t get_utf8(GetBitContext *gb) return val; } -int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb, FLACFrameInfo *fi, int log_level_offset) { int bs_code, sr_code, bps_code; /* frame sync code */ if ((get_bits(gb, 15) & 0x7FFF) != 0x7FFC) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n"); + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n"); return AVERROR_INVALIDDATA; } @@ -75,7 +75,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, fi->channels = 2; fi->ch_mode -= FLAC_MAX_CHANNELS - 1; } else { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid channel mode: %d\n", fi->ch_mode); return AVERROR_INVALIDDATA; } @@ -83,7 +83,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* bits per sample */ bps_code = get_bits(gb, 3); if (bps_code == 3) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid sample size code (%d)\n", bps_code); return AVERROR_INVALIDDATA; @@ -92,7 +92,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* reserved bit */ if (get_bits1(gb)) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "broken stream, invalid padding\n"); return AVERROR_INVALIDDATA; } @@ -100,14 +100,14 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* sample or frame count */ fi->frame_or_sample_num = get_utf8(gb); if (fi->frame_or_sample_num < 0) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "sample/frame number invalid; utf8 fscked\n"); return AVERROR_INVALIDDATA; } /* blocksize */ if (bs_code == 0) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "reserved blocksize code: 0\n"); return AVERROR_INVALIDDATA; } else if (bs_code == 6) { @@ -128,7 +128,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, } else if (sr_code == 14) { fi->samplerate = get_bits(gb, 16) * 10; } else { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "illegal sample rate code %d\n", sr_code); return AVERROR_INVALIDDATA; @@ -138,7 +138,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, skip_bits(gb, 8); if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer, get_bits_count(gb)/8)) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "header crc mismatch\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/flac_parse.h b/libavcodec/flac_parse.h index 67a7320bea..b0cbad825e 100644 --- a/libavcodec/flac_parse.h +++ b/libavcodec/flac_parse.h @@ -75,13 +75,13 @@ int ff_flac_is_extradata_valid(AVCodecContext *avctx, /** * Validate and decode a frame header. - * @param avctx AVCodecContext to use as av_log() context + * @param logctx context for logging * @param gb GetBitContext from which to read frame header * @param[out] fi frame information * @param log_level_offset log level offset. can be used to silence error messages. * @return non-zero on error, 0 if ok */ -int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb, FLACFrameInfo *fi, int log_level_offset); void ff_flac_set_channel_layout(AVCodecContext *avctx, int channels); From patchwork Thu Sep 28 21:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155900pzg; Thu, 28 Sep 2023 14:36:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH45AtxqHyztVWLTqjQLZc++14pVZGxKmJnRuRHWGw2RWVxEkYkY98t30xT5BLjFhbbaXoz X-Received: by 2002:a17:906:eb82:b0:9ad:ef31:6ef6 with SMTP id mh2-20020a170906eb8200b009adef316ef6mr2623770ejb.20.1695937006256; Thu, 28 Sep 2023 14:36:46 -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 ka4-20020a170907990400b009a9fbfccdc2si13477351ejc.369.2023.09.28.14.36.45; Thu, 28 Sep 2023 14:36:46 -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=a3L4YmOb; 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 738F668CBFF; Fri, 29 Sep 2023 00:35:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2056.outbound.protection.outlook.com [40.92.66.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F19368CBEF for ; Fri, 29 Sep 2023 00:35:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VTcCtNRjl0j5XtjPmsKPKb8QSClmvt0vg2iuQCPdfrfu8UFvkt3xMM/8O9EkwYnLlmSkkmShY22J9lrJA7eH/BW9lfhALWInT26yFOBnRGjaabbVFgIoSiWPIyGA5auHD6pIV7iRQ5FJnRwmC4PLoccFuQESQnRea9BG0phwZ/0GZexuMFv6sCkWA96B+ksm2Io1acJuqcaU3dHXr6LxSnuPIaZowGL1fgLr8crPjqwSRUW2/H8G2DOdrcPDErJVwtDl47y3+77SwuAqLU7HAIRQJFb0/B+7aDy0f7pKutOErn3/aeC3KoREZEOWt1KDw+UOhRO37II3bG+LsnyGkw== 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=qbpBIv8skthrCuB1u4q3+XxwhyllmuBYxRt5xhI0qaQ=; b=kfhdXE04a7UT/HyHC/8yQP8eT/9RnGNUP3reVO7GZNQnospqLI6K+XaMKbgDOXCjkv8aVO9jXyXSS4uYn0UCDm1FDYeUWlyO5nwuYTPjURN7VeCbEqPQPuGP8kVZchIVEOgWcsr7DZ0fBWWVPnGq0g/o27nW1vRyjNunMm8mY2vei97SAzdrJRlI6VdnsBCYkDRi3ZhWJDBiKR9KgrZnspDoNMvfWdHGFWwpE9dyARxa8Dl2OyBV89FDS//EVzMTwCI6mgQbUGzr6bh1ENiodUyYlzyh6oGbIc9basLvK+3bIUXq1F5g0gFiowyP4ZSWjy/OE1mXc2u71LQuAEkVNQ== 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=qbpBIv8skthrCuB1u4q3+XxwhyllmuBYxRt5xhI0qaQ=; b=a3L4YmObxJPbzAy2e/3Z72a0axPu15Lq7MdxA8zl9m5AxlH0Fio9xyYOiJVbHe1CyVLTwk/vVc8FtkkXShbfgFzfAb+6UPxRv4Cmd202Zne8WVQSYh2X8oO1v8k/gYlZQfv7C3NH18N7XD19Ay0yptACe1Elkqj9k6RLTEbtRBXKxkl9iRsnZZtBk0ILwVDzWTvO4avsttE9wLhyOWKuNKPFLeH+5MYZaFVjo0qx9O0oBr9x9D+Qt2dgf6L9hA6RWLhinlzY06PlXWRzQbcHk2mlT2PXMEEFjTwxZj4r7FZIDKMLJqbcxh5Z1g8CpTwt2K8mbbU4/jJyBxO2clTcBg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ehuWlI56mU5q6LEqw83HTqgkmy0BQHQ/] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: eaa51fe0-e403-48ca-d8ea-08dbc06ae2e0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7Zbd9+wb9E5lgZo0llHiddTv6hny3DsgpYDTTFMoRbQzELJqX1SZUJHc4e7KytG7R+gaBd3Ubvt0MNUxQek3b2JILjOq/rmtNo2xJHJOLqV4bB2Px75hgaFOUGuQVCDrMvj1kuKKNxqhCpsVqaGdnSJeALa3aSOE4O5ZgAoiANniCl5QvfDpQySyUJRIW5E0Ec1AdRrZx/7F4tL9K7CaJ6gYpfabnI4C/CpWNnRjb5brOCDb2zmwDi1JqYK84W0FJEdMyu8EaWbiq7S7TJ9JcpCGDS/q049CCh2k9xC34a9u4gqE53ZTckfdGpP0Y2RlHTTzl4TaudHrYAVShX/Ku62s5HIR/G9qK2nweoffceWc7fYXpn+HKVaz2SsCr9DYcBMRGev2E10zvLUWG/KnKql5JXM5zAgxEIjoDs0BdoGot4Hq4ZzkKGAoQGTT4jGYE/jo7Wu2JzeVBGCkh8mCKinKayykT7Gcj2k3QNjxD8nEIwYkL2JmQhL9HwIkWVhz4WhdGb3hWHg7gMeQiBwMYTJ/8EvevSgUJAozdntnaQrksiCDCEveQkU4GhKiixNmZ0zh+DvSk4H6ty9hyh+CpOUkvgRfr8Ja/lUogD4eRixGYeCWQB8X5VHu0rMCvZtI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0NP6dPW4OKATasfBTyB/Y9Pv5oxdJ7jMqw5gbmMX34Nh8i7c5unmoATgZPp6VgA94Z0OE3hbHOMUh1UAuDS4fViVeWUINnM2c3e4Awoupuu9gYp2TTOVZ38iS6aabrI7YWndoDvuXNJvkqFpa5PHasYW4jaHByFXZw/6+XAnu2yHj9CHpOm1IcKBJlhZpTmDjPY7/pzjKnNPSJn4ejayWb++OrwcT3NRdoLMyq72oXQxTLYKxKl8M23GISRmg1t0msX6g1gUzzIwUI4wd2xxWskrarZXJb6u/O/rHOAZuyFHgJXRCB4h7bZk7P0r+KypWNWpLCbFwVBfaUdkGsW2AMwhR40KnBMqgcsAOWLXxPV9ExNBcq9NbYq9MZBFLsIxnEH9xMSfqZoVpnrP8ttVokN/RcIVD8gQbGro7qlKr6Du3m27eOQtpKIy+tLiZNa5mPSUtVMe7HGGZm+WZmfFUgmUglSkbuoKSStIbgYK+3OsE/OIDWfJO1MmTHo2JVh+wlT9uLQMtQbi/2M9duPizPeJinJkS/VIR7YkZz1vkPaQ50zwAHzlXXQ7ZPK8agq/+vqNW5EbL5C16E66fbQ7cDoAmmSlJ0R6YBQfYk/KLYMAGt/axpSXdSntsqU6RdT2hTwmoaMdckIrCxQ8WFOJFpQsLGAGJ72fYz+IRjKgrVRmMIZSdq4msdlGOM1W/bjdrjXesNZTJu3qevCPIBx0/YLzNfytSlfMerMs5YTUpd5hWlTMemE443BPAnF18lkX8bme9urYaJuw8qVedlqKbyea33zQ+HOcy9XYZttXYuLAtiAV/dWaGgLLc9D2m1MJNU1ZKu+fWc7B104BH3ePI8Orlm+CF2jdLfjF2vvj2AI3tITT9HEfYqCaPRPelHriyynd0WD5LRsRxVVsMV3Snxgpa+gXlpeHeqQOohhmuMr6eTLHP6ItU/KQTddY78iD6TaLWk3thFC+OgqCnO8bvSm1R4r4Zn5tym6Ebs60guvSOekROwQ0Y1w7pNeRCQgGq6BS3pbXenF8szLJ2kqaOOGDVbDJgqX1Rei8Yzdp6DOI+Es5xaWW9ntAgRawgLfpLMS23e6YnL7yOtm1DM1e/eLIuOJLaotONOdJKBnYWtRbn4WQHoir/NZ7a06/MGWlbkgUMSCUYUIEginA/nx6EoZoaj3S+mzLXsEmplVLwyZ3TTNWRMj4sx9DLaTTREHMZNfSoOTbBPxPxQi8oY9dbWGbW/o3V1MRYKLKrQIyLRcYOgikl+DQXev3cgbqoXkn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa51fe0-e403-48ca-d8ea-08dbc06ae2e0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:51.0870 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/bgmc: Use void* instead of AVCodecContext* as logctx 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: YqqJszjg+a3G Signed-off-by: Andreas Rheinhardt --- libavcodec/bgmc.c | 4 ++-- libavcodec/bgmc.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index 361f7c52e6..0e41a39e00 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -457,7 +457,7 @@ static uint8_t *bgmc_lut_getp(uint8_t *lut, int *lut_status, int delta) /** Initialize the lookup table arrays */ -av_cold int ff_bgmc_init(AVCodecContext *avctx, +av_cold int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status) { *cf_lut = av_malloc(sizeof(**cf_lut) * LUT_BUFF * 16 * LUT_SIZE); @@ -465,7 +465,7 @@ av_cold int ff_bgmc_init(AVCodecContext *avctx, if (!*cf_lut || !*cf_lut_status) { ff_bgmc_end(cf_lut, cf_lut_status); - av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + av_log(logctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } else { // initialize lut_status buffer to a value never used to compare against diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h index 466df31a2e..81771d4aef 100644 --- a/libavcodec/bgmc.h +++ b/libavcodec/bgmc.h @@ -30,11 +30,10 @@ #define AVCODEC_BGMC_H -#include "avcodec.h" #include "get_bits.h" -int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status); +int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status); void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status);