From patchwork Sun Oct 9 18:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38628 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29290pzb; Sun, 9 Oct 2022 11:08:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM640ZvMee+9u72dIh0c44kdZqhmT0kFi/Ef25vyjohB6bInUg4lcCVTKISbvvHd3Q13qGyq X-Received: by 2002:a05:6402:2554:b0:459:b3e9:a6b1 with SMTP id l20-20020a056402255400b00459b3e9a6b1mr14423137edb.124.1665338921087; Sun, 09 Oct 2022 11:08:41 -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 o7-20020a170906358700b007818378f560si6999312ejb.383.2022.10.09.11.08.40; Sun, 09 Oct 2022 11:08:41 -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=bSrXBJRa; 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 56A4768B049; Sun, 9 Oct 2022 21:08:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075018.outbound.protection.outlook.com [40.92.75.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8A3968BB7F for ; Sun, 9 Oct 2022 21:08:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YJr3mY7j5Cde1kFuMDvv/VHtI2UHs8GYtKuCNSVHb6MMN1L1a2Bh2Q60ubto1VTNvuJlO8Mnf0QNtlmMj38/zJy28dU2dH4jI8UYR0iDGlcVxVi4Vv2llD7zLyTX51IO4/mJ5fs4XD6s1pYlkYyk2xfy2JNxB5JM+7JLGWLbu7QP7+HRSfwMIsWz661ADJJMFTDQX5KtHJE3+2UHtWv5NP7jAXcJlrZqlDjQi7P05SL6opsydSjG8dd4V+RHf3KrrEpYDktXfjcXzNQzDP4HjXMcHg4AxqRMtpmQKDFJkmkVWIYHDBUFZFv1kDlCLRB2ADaZhcWbmGjctd6L2hhhKw== 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=8GglwXuHf8rCO1Geq0i1Iv91iuV5f78au2yY35GU37g=; b=abVb/LAYoMxmi3z7pRvC/GjycwiRjVGWMGyIXgiaAmcvIIBc+W7WP0cKAU+nw1EZckb9cQs+Yvaz8WzbRXKIH3k+lAEnuzlRwkbyhhPLta3DFMZtmT5b/2e37O5GlXg8K4aBxm2LfKAXqVjmS6lpE47SS9KlMEPywxy/FmD8JmO7IqBAuTEQVmPaXtOngn1jabQ2JUapzGQhyK/aVaz0XQ/a8JQjJUOSbqyewpJE1FUYVvWWoVo+MG2U1qcNKecPxsUkhgBRSmoRN89ENHK+UQqwEn+MftnbLdbtIXBgPDIJH1KthL/OC1Mq1iRZVKiWQ6l2Nvb2u05YyPY78spfWQ== 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=8GglwXuHf8rCO1Geq0i1Iv91iuV5f78au2yY35GU37g=; b=bSrXBJRaeTrUgUAe9MJ1VghRjBmAePsF/+FPUlVu04cAe38OEKceFc0wsb4pS8bW0VK/XD57HjFd+isFgIg7LbBl6107Y+S6UIkKaTyfHLS15fJI1EZC8RHy3h+C30u5eFN2l2Pad9HS7RU8jBl9b/BRXYONDge5yZfHwOzPCtg553V9NAI1mvvSpRTvy1LrwngHuiV2W3hfoUC8y0KAgnVHrJ0XLmqjR22tU+X30WDaX13+wEofOcVOmgbZ8CKwFS5Pu0vT6p71z6H/HwFtRbxknBZTOiUgE7Lq6i81pUyCw7FD0+JSNb24Nc6SVrSRnC5Jcp6r671tSwRJWN2p4A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:08:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:08:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:08:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Ovh8sne7NydD9xrgbB+fq6vCyFF4oSrQ2Y0QRDN/Fl4=] X-ClientProxiedBy: FR0P281CA0103.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009180831.910758-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: ad9dd840-83eb-425a-9794-08daaa2144b7 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVhNefPA9+BXsJkeFbnbHvjlHUg7DJIwXxsm6gvS9kSoXC2kFIlRKbRQJhCpY5VO1OpT+lxFDWHDcdDL3UzG5WX8PZHINQxkYMYgM+JOEUru3IOQFAETZ1z/z1XwN/yKNH9cWmsBKfMF0c7+59EVBwCm8YGnm7hLdFHviMlFjOoAmIMv270rthh5lwxgTIQ2rh7V1YTp1XI3h+7UAhZofANXZ2VhvHnNB3sHREkd/91Mfz5XB9ocXzU9OLlYMMqzU8ha571KSKhuL62YxGnxf+IvgW4O1AUT4osvcbJK/yAyZ3vipTcnTGh3vKfU/x14pJoWMxNDLgeu9VnjXlDjEAlHm250BzlAgtHxl1D78ujWmYt3MiHb51JfZL8WhPIUBdolFsSfo6a8XFdoNVKEbc8J4ntUhO2JoRCT0we3pjEW7UxnTsJQotaG5z0rLV2KdGFzTwmc9/c1VyVTLgsAbf8zR000dgcjlYVKi365ct7Z+veN7F0I3RpcMtEO2z7xs45vDpo0r98iYWXl8rT/FIbRaflebhN0SZ5P8iMj1WvDaIM8gg6BmpaIIo53i93WJoAyRzNoFN8ozJyeWE7wwgt4yANfyzQ7AQvGty2XXx9XWD7FnpUUepSg9TczUp3hz4szqc/1C0SsGMTJuPtgndIX3+JB4vayHX/ySnZJPlNpBtxnQxFS7n3yesu9PjCUmwP+T/9wPZC/yqhVHj4dk1dxU5E1Lrh+0dV+QOW5aitKE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /x5eJRj70CXmYzDr+z+TcPX9PYjFm20EWGfHKEorxX4/hKFJ8yzrDz+RqySbRSry9lLoV2N7jXmP4ailUYyeuLdaOU6KkvdanxALicVE/CMH33eCrnxa/z+yS0z7e7tcIJQXqp20HXmMRm1NLQuoCcLb42BJXpHNU4prERe8yDSdG/Tp+RQ3vMj3paDzFHropLSgiKZuOCcWoA7JKgT7qHNUCLi9K6h0FdCStsBeeL4CC+PNBkq5dKhwZbQG2u54YzBsTAswYpTjq9VIDFRl38uCzV0WTHIJREe5QT4lbqmrqxKiMLl2I0ObM3lT2wgIi5gF2Rkcrzmfa7D1iBU0n/RO33Z8IqzojzQ/V1SxyfkAqJ5EgAchFdxOZYtI2xl4TWSoqoEPSeMqqE9yfu4Q/R3mo/vCLBGjFqoJbgpoFNGiTLcxYN7puY2LCvyCruwM4RRhIIlqzdmqH5JXWsv5p3M8aufYcCDLrAI5sq3itPmL2wMnMS8K7hvcs3V7tBa/4EEkGMxbRrpfmSf5ZKV9m4iuZzFJXU96Erv7c1MB7gjEFUKeu/Sg2DOX3GN5b4qJDp3DVNxXBlIyWMly/ZWcfQfWwvv9zESYlMeswMwZbjrA+pQp+9X35QdDoiBe2UEdb/SDNht11lDo/8a4Om2BpFLgUV2EZsCAe1ZipJ/z4ZfVrHks0CYSMOK5L6oR9zQV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QEtgBHqkjPZE5c6zveUJyaDwEuljqfxKrw6+sGtimhxrUBkReBK+Na256iHkQ+uhLgUcz18Z6cVLa/xhUhngLBVTg+tIaREhuOe9uDoTTQovHTGDPbXJ8RKgYO19R3sV6UTQN4ur4wEgfEDaoCgJJ2wv2MIVmDXysvDOZ2/toIhDXO6TphByQ/Oz7G//zXeOyBXrb9+8GcbeRmAExJNR5RRb6QTLabUPNLkoRswy2unYl9txY3DxF23uM6s2BhBvQN9jPNTVAMtW51RAIMUvfhhG0gNU1/XoJDGjiUydq7KTqAz/SabU8Q7VkYj+JukUjvNBjcNyUkbXP2p03P/tCSu79Ck6w4zst2ggWmEAZZn/EdlOfrAavg4ZvkoQeWpJqXYjWNNYRZp2V4FXRnQGXJNAYIPG6n0bKiKjXRc9I+gvmO8oxC4zb1TqTtJJh8fv0iWjuA0PxAygAzinLUryaLFNE1bJR50WvzqqpjTjaczBUb7OMJL/tVrQiDlLJwafW/ELU/nhdSOdqVcDPkhwzw1Nwg+KHm8r4bwwtpgV0RWuaswVqyE1BfmOUg3SOC3xBKz0h1bVPpPtvKSWgONAewR9E8P7xjZmYmuRHfcXog9AeB+KKCu3YQrqslC2yhV4Htrn5w5rEZdGDTfeTWWV5AG/B+AG1oLjkT23Trlm7VMJmagVqGH8E5RJKcyanhk6RYh7w9aQHF2EfXLgHPn5Mkx+7tEHODZVs8zoVlzmWosSxpIcu45Yanc+UUpUmD70bbl10krHRHjGeg/bYv+5mCHKE/A0r1GGdXmexbaUYYVF6dKIzd74QLZ4CIpPu+phdNBtIO02UcEYFjuxA5t/jkCYW2N45J/qwDMXrW5aCDLNR7sQCJX7eHMG0F0J/E2suqEW4EMdQTLJy4fqjLAbateZyBD25+5dCc/7gMbGJbR2xiWPySurOolilc/btpQlXRKJXfyd3uNn1FeBBrFNN9XvPjw4WtorYPSlieA/EaTHv9aFwKfyj0/GQzMMN0M+e3OjP2crLezyTk466zMjgNMHncYcWPxi0rzJOOBCSC9KH53XGn61pVJefySd58GsRJZZiK0uTw6SBMs7EY5OXvOZZpTaBGooJCAjkL2QP71mM3d/mrMvNsbiFE5x1Jq/8FUi7hcquOwenJa2AlEHZGRnRLSU6WrAys/XLvrcKso1RZrPvoj0zQsj79mrQK/FbcjkxUuDMyh8+1n+l8k0l3JUK/8T4WNJY1aEX9KVPSh5OaUGyauXU/8XHQtwblzACePEBVACcGCMGdQI9vFwLKMYge89Ms3GSliNA55hnzRNSP1W5F6cHieTOUyuFRqZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad9dd840-83eb-425a-9794-08daaa2144b7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:08:29.2215 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 1/8] configure: Remove dependencies of inexistant rtjpeg decoder 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: 0hNLPZub2CUT rtjpeg is a mode of nuv and not a decoder in its own right. Signed-off-by: Andreas Rheinhardt --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index ab6ff27249..2c4f5043d5 100755 --- a/configure +++ b/configure @@ -2934,7 +2934,6 @@ ralf_decoder_select="golomb" rasc_decoder_select="inflate_wrapper" rawvideo_decoder_select="bswapdsp" rscc_decoder_deps="zlib" -rtjpeg_decoder_select="me_cmp" rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" rv20_decoder_select="h263_decoder" From patchwork Sun Oct 9 18:10:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29835pzb; Sun, 9 Oct 2022 11:10:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4T/yJ+MxBKI2CVEmnvhlB7ERiwxZgbK5jYSNCbPGBWnk0H0vwEYPNNM+0wpRkT1O/OmhoJ X-Received: by 2002:a05:6402:550e:b0:456:f79f:2bed with SMTP id fi14-20020a056402550e00b00456f79f2bedmr14519000edb.106.1665339028895; Sun, 09 Oct 2022 11:10:28 -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 dn15-20020a17090794cf00b007878f030816si9085583ejc.109.2022.10.09.11.10.28; Sun, 09 Oct 2022 11:10:28 -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=aONcsTrf; 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 7CF3E68BC63; Sun, 9 Oct 2022 21:10:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CA2868B73D for ; Sun, 9 Oct 2022 21:10:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ELn2g8AwtMI92jU9jh1XxiOlUke980EEHWKw1hjefpZ9CMD7+vXU0On64jN8HvARc7RkI+sPmfKpU0IZ27kfqcKS0ST6nP9vGQKcHZ5r8iEgD4yH6x1Zwbr3nfyWZ4hPj9/NjBogYrrckdRRo1vbHB8xexuWfGIAuQTM3Usfbf9vPXIIVAv4l0p928M2q8BYkm0/WL6FSqf/i+vzedCChRRahQNOuIZ/jEbbMIySJ8rAWQu+a5WpeQOEgE3TQaQKNoMa4x0KQX5lauTSv4e3lTcZur3qhUby/IM1kLnICPVHgHW0OQCOEhK/SKWbv5T/gW51/3/z51X1e4Vf6oHIRw== 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=4p2m59xK6IFBBdNWPPHHfDMSx1f4H/2ZbL1e3L+V3/s=; b=NLisK8r+6FQijzj7UPNDLifLHY/taiX3IGET7sL1Oe+kQjoViSgYPxclvfGmfOn0JPJ5OZ1GknjmqI899cvrEzySfRfFQen9IAAW0ed1ZudcBTU3Tf9UNzXgCsSbpRjfI3hEJhDpGTneewEQ0GxWyzYqgrnK3DLnJB3VajHlbzjebb0j65ONf36HqMl1CdqU6ZTvaRFknpUDcpWtimgKLaS7oKqhc2PwvskJAc012Pr8obl/Nx7+JCCoB0GdWHb2tY8n3nc0Bsvcz3lUKhRGI/fypFpz2jicZ8Ery8KOt+UM39DThj0V4evQ8PVAQa/dtcXZh9tA2QkVNmcXDUrQ9Q== 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=4p2m59xK6IFBBdNWPPHHfDMSx1f4H/2ZbL1e3L+V3/s=; b=aONcsTrfshPEuwa1ylenM35IniWUVYTsoXjOgN5AOQrXA5scU60t0MPgSdqnHfhm65p8xscqDGSaUJz8jQwQr7Hf4s+tKJ3mW3eVaHdEIqSKgNJD+NGBH8+aZIgBwGmEKfJEmFQBoWgrgkC7mp9uYfIAMGleVp0Oy0C/7UsZfhML8VStVHv/0Tl8g8maAfKY6xo6EpweEF7EiqCQ6/NsLeQ3QVPyp732R7g6Wu0h/7yDRo+JyUYwKxUw+n0ABGx2b75rlOzHabUOqF0fKOw4yAWeA5b5Nb4dmm9Zuo8XqKhX8iVPh82402k5Q+K/JCIcOepb1kgCdbVyJmKqauHvrw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nMJV5d3KX4dN8W4Amv12sYL0o0+XSEBdBiLCadZSRVw=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c23385c-f623-4ef0-360f-08daaa21862a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueV4sJYhw+rn9aOXHr8aRrRypqXJJy5qXsz7AxYTJmzIQBuCIk2mzuTnvrlXLR1Ok9C/ZYoD2WGzbo46C5lBL1etjhFCHW6TMKkRN6c8J72Vud6HKC8Mvn9vjv+MqoyfJmwNnz6B2IwyZOI0oMoT7PJsF6vlOlT3o3FPjah5R26Kb0Jx+Si4s/5UkneIyheAhtJCV0CvK5Jbcufg0+9ybhmfkhAeOolKApmw5nw84ObtHPVCTAUyYkIa7KdHDMRegxJTLhhnlCsAhnoMJbPtE+9Qdlw2EojyuFn2hmh7anmJul7P65Lihb1FTNVIBfZao5SOcTpHOXPCb2c8wZWHEG7unRcQswtcIhQGkbZIUVv2GmuH6vaO0KuBjPBkC5zXp9iSLn5Sesoll82haWxNF2qqKWjOc3YPoWOrY94CE2dKLMFy0OjX+2PZcdhwQqndntH/YPKh8aiTB5b2R4UWY+OhjCso9ycH7RPP7UW/qAOTnS497B/oAZ4DDxeS5eQT1+kpnrro/MwGELqeBEbJf1gii/C5rzk3D7qggKL646avaaVw060DjlYeNdivpW1JbK/F92b2GpvntkDcRkxQQe+x5pPdDLl24jf8tjVJB7q3b0qFLMt0XEqcj9vJSRgPU/JIBH2e/5XLsUwRNsOe5T7QCFg3Cop578g4i/CTbc8HUyEjCPRMNwycHxE+p/K14iXjT+NXdwOjdYiXY1QhPZZc+IOhZzCOHtd7P+LLI+SoTU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e4jVHxWqgPCYZh9haTM4SNWXWbgm4ZxZdrj/w4wGaKpwa8yVgt/HJrUPo9yOM0dqp+p+5OvZ611UnTa1r0nG4e8DKxhKWv7Jpn1gpxHaeFMjD9KWP5ZCgNv1+GwZ32okoSvFqXuJXqab5hNccU8dstgqlmingMjJoiyjn7fGigKKuPAQBfsFouZNeLJ+rGn189IIajvEsY7dsytczWVMYTYlQ6aPX4UwcxxBq3kJK4rvdOCBAIVfS++ynYDCXe2kDEdoo1PFsTTO5bPkexZeD+dbbtwn67Ph9hDBUbPJSQq0gmzxaM4xz1Ni8ghJi6Ga5xlp3ju01juE6NOOAYZ2niMq7sXN+u2nGOg8nlhm72+vpn4+Pdawd58pEOk0ioVZrkfdLhKlzfyt1f8sdg7MmPeE65ZXhW8quPBkDT2Z+PkdwExyf/OPqNYzllsXz4s4LNSKPh6ZF43TtDld3pxvst3LgzBNCD6zKyceapULRVIjRFfpZy/BKFvJ0qgia9csiXSCXi8PdwhA3GNkwF3xayO7443Bs+nsA0/bz0Y8ehPV50PAhUFLeZxwwN+DqEYupGHYTvWN2nwGBcwjHer/AN9k+2pzdXe/TVvJ1Gg0qSGAFLFP/Kgj3pXS3rfueV9Q4p90ZHzJDIbmIiG3G8SxnVSyLTJwwp3WAyUnAgGEDWR4Haz9AUeRfzypVq6gtG9/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NNF7JtCAJ1lYsrFv18jehbFAt76pqyU69b4hBQfV9u3Wm0NV+Xwwfcs95oamysleOov0gcKwfg3W5ezfHxjthsZ2Msrutb+j1wzgcifZp6uRL69pfMUhNxY9z2FJbNsaSaQbLnGXD86flTa8fD3xFQFI486CimnN+cmm5WVKhtBuvaAByvNtoRw2GRUDQPr4ftIhr/ROfT6yCHlMghPUvJk7QNfYB1DBL7LoVe7bZ5Fedvausj0+vsXUvW1FuGcWQRPLNTbCJpw19oop3UA8EVgTURxWo7cSa3Biee0g7ZQF2CkIpcIQP3GEHh2I6GL4MKrK7Pi+cGHKhoqOv+INeUj8Z7NhctdRV7IWRNSBF6RW+mWA5yc63461erylD3FJkQ407tK80Ok2qbI52clgOO+aQkHrbvk7aVzSgHVE+MtVEKV0Ib8yww3AQBg8Gh3nycUv2w+zt6suD8cVjYtMcRyaoVJ0MBWvOlnW+Gi8I8EN8aMc4O+cfAVz0qXQsVKTp5RXoeo/9EPnMvOqLJkUk8kxhZaIMHsszGMlh9XhTT9dnca6LwcyT5HsN9QB0AOtcljgcEDqImnsnjuxeJyomUYxnmTlXJJxk3PCWL0Z1GrXE5XAp4O6eCe7KRPu7kN6LjtCxrlgPsR9/AtGIsiFtfpVN9DfDMa/sl45wNWC//yg1RV6KBpGo0r6U+kkGOQpADqBguoLdaz7SW7YHYrKTBmjm0shLi1CoXrLLF8TYBJGU1rqURbfdCbe9sCo2Z57nPKmO/uMpa+meb2Ha9lNNVaWs5eZ1uZM0EyQIWaXDN2j0QYqf5pm+RlEMBfnif2VBulOl0dLf6TEGGBFIHfrDCSG5gP5J9EQ5/g9OhHMMA0QghfBhxKfn+1/yadCjaZReIxTuI55XxTkMzCID33yD8q5tgL+AHBa1sBhpeg/TAgffkrJKSoZx2IcfYt/8q3L7EEcuyw5rygQKPH77PTpwGoqw7TW6HM+8eBfiwalYA+oJE24R0977R5bhGWLn1HBcd3+DaG+B1iW2n5ZBWUgl7dEg0hMVZMvifbBMaGueQaIRI7xUx/qeSEOaPug77gGkoBjLj2Hi+7Mq+xj6qyR1Rwpagjm0o+ICv/1GjkKo8wN/mFc/DcUU8vNmci/MPnY2eGzFkDdVC8MoE0uCXv3dzUTLOaouCbO7ZEpH1b4xEsYnWwhK/WsssZZiUhE6JmS6NVzO4NZMotWhPP7V/sD8TjARm0oX/QD/SaxeMRrl/Nzc8tUU2kPXCxckW/rrqBDrgyUFF4ENitRckMWof6dAVlEhMGQmlQa3sKvBxiljQq6Vt1rof6q84a0OBK/MR0y X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c23385c-f623-4ef0-360f-08daaa21862a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:19.0089 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 2/8] configure: Add missing prores_(aw|ks)_encoder->fdctdsp 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: iHrA0P7Gweao Fixes builds with --disable-everything --disable-faan. Signed-off-by: Andreas Rheinhardt --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 2c4f5043d5..c983c689ec 100755 --- a/configure +++ b/configure @@ -2926,6 +2926,8 @@ png_decoder_select="inflate_wrapper" png_encoder_select="deflate_wrapper llvidencdsp" prores_decoder_select="blockdsp idctdsp" prores_encoder_select="fdctdsp" +prores_aw_encoder_select="fdctdsp" +prores_ks_encoder_select="fdctdsp" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_decoder_select="audiodsp" From patchwork Sun Oct 9 18:10:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29874pzb; Sun, 9 Oct 2022 11:10:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+1WeJjLYzJVdpu6bbfwYgFNdbu8DIkYfLO8+Ht+WX51zVI4gVL7RDsfvg6fW6/yxd49j6 X-Received: by 2002:a05:6402:3c5:b0:45b:55d8:21ff with SMTP id t5-20020a05640203c500b0045b55d821ffmr8427146edw.253.1665339036270; Sun, 09 Oct 2022 11:10: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 f13-20020a056402194d00b0045bf23171d5si2820598edz.165.2022.10.09.11.10.35; Sun, 09 Oct 2022 11:10: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=UQFqtn2h; 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 82E7468BC6E; Sun, 9 Oct 2022 21:10:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 468BA68B74D for ; Sun, 9 Oct 2022 21:10:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WoKEad3S2Vyt4w3hd7sZsH4JfXpUInZpDHscZSRnls2XgUg/N+wnHq/Kq3stPhSYHFM8c1azODGfZxoM5m1EkDyIml3C9F1WOo4lqGq808020GfbaCVOpT/r/zgvjkkrjO6ioW1P0udDYXEKgM9z2mz3sRfVxI3+3wa0lr0c158tFX2vBWoJrPujnSFQ7TEqTP8FKd7+fWnQikC4NXwwS6Ifsb7UxBl/PxjtCwB3Fm9x4YT2TQWg/jgUAyRE0XCLpnFPKmPjQOWrKXgkkBlo/7+SqyLaOoQ9IkTEHDCt0fb9XjXu4ySgMSqweu3oefqrDB2nqw3Mcp2tNbtI1PJVsA== 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=QeaUa21yRZBoqf08v6bgw/0dylHc1x+v+h09+jeyeMo=; b=NlUZ9f8UkL4y5BKVQdLzSeK0D8/qapvko7b7a9EALCpMeHUB0ns2Diek/6peYOGTUK4fD3sHyPtAKU7N3E3aXJF/L0ChCL0+WWWi0yreYugQ4sCIJuGLo8ck7953cd/HzeYTHXJ7P0kk92eATCj13XpGKBvghZ0l9MmsVrXbeaBOIkVep23W7lJ1DkrtN2RcJlBPRZufNpa8i2EtJsrgdNChWXCwu4kMd1EALf3UVScWPwqWIjAzzTlN1JtkMXMPREQVRo4M25W/S8x5ZAgVL8Qdm/OAkIP57Dvkkw5VlizfWj3GEtMNM6IXuihQhd1AgUlMN8QgI2fFgRc2jzMe5w== 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=QeaUa21yRZBoqf08v6bgw/0dylHc1x+v+h09+jeyeMo=; b=UQFqtn2hc/honsrc5qiHzPmibCZkryQ/MEuxX4HpeiMIeQqjy1FSDeZ3/hBhVfNQk1IByIkw7YlwhhvsuXG4b83IO8hdYIHrJPMHVn7YgZxnDBXiSVAQGPLuQz7PSj7arr1/wSZUBu5IMR58CWj3pFPn5u4Wza/02afcZtK87LUR6s+Omyrpv9W2crEF2ASdLinnjl87r73O8yXWrcKH0Azd4YQxf9C6gPH9uvbufw8u6+2bcFBJaF/FdJUhPDbf/oWlCB/6cXDSwNdiJJDfWZi7InPl2uI/IZlpzbagqTFBVihtf1xiLUhaLoxZQWcxAo4xLcm/Y9KIcaaojwkFXw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:23 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [C0822uqTnpedmX9ehLVUIzs9CuK2i53t8IMlurh6wTI=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: 7243ab91-343a-46a8-8a61-08daaa2188be X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVMH9kptA5qR6zyJrsdKUxGGLeND7k4XBxkXqtp/qWAvarar8OjkgKxCErnoNcGi4wV33RSlrzdXCoO9ZOWmscvEu/yI2dVl9fnK98rhv3EAh9qGOM/GleRQWR/OxbhSU+nkbBsvSMF+Jbu2Mj4CLNUeSsqdbpuEJcN7nJkI+3MEkF3aljFkMpQOtYf4JktAr1LBfxmjfnULRksD0k3rA0DY/hXAhZZ+kT7d6TzXcj0PBFClVE4D/f+a5265vAhbNktp6J/PDZ/dMSLeNxDRd3JVawBoTQBMKIig6PDxP8l1jpQCiJT268Lz3UEjIjWOldKLaxrZj/eojalyh0TltUMiAq02EDlgkSdzKKzzqZzkWvSe6KMIJUYvtRnL+5QYrSIqMQyixb7sMdBPUb6w9859Uwy0u1MIIOz3dW9ByG8tUvMqrsUSvrEzHVj41Q96pEp7vCnHUbK24m/w+u9xV5oQvUOiXCejEg9heFoGVMn/DcA2AbtRUBRoLmGG3mFcmzjBEV9r++6Ug7qK+UnoQefLA+hwYjDpV4FrWDKNIq/Xo0qu+B77iAQFA4+bWt8PTQgD/4VmeqFkouf8Qu4KfhPbkjgNbF4kJd+SGVBRk9X42wzNXV8KIkf9fkxzKQy8txfes2yWstAYCSvFROiuYs4t40cI/XO2Me3pDr2cp//IAxGH50/jRNkPc8PKOiPGH/1EXcBIdOqlaLxjV9N0Dl1P8GxXnybamDA/UZuxegpi8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SinLHtXuQWm4dBVehKNtLa7VLt5b2hQWckHGeYOiIjrkyYu5ZAO+oIlUkCG0c01I6EqHEQFcLf0zUn8Ht1+SJwhbCtX6hK1kx9NYwz30Iiv3dEfuo4XUy82r/8MkDorSQqexNY7GMwlc4J6aqwUx2ZpwvtUOdXd0ZRsWJE/yL/1Zqi6q44m0NBqGrtUkL9NmtX16SH0LBcZUPOTUwgINdT6qFZsm4ZmEqGPIdaJfF88AeSIEFqDuDnJbkYKfFMhP36uOXrsFjsfXpEgJXS9XVCo7XKt/z0tggipb+XLPvUlOZcZ9QmI6yM/VIU0xG1PovxYoM5qOF/83WHQEDXOQ4zmWWRABlxrb0eXSwhEyjrOZOU136I8pGviGFNhWy+Awm/pQXmS8sie3MXxzXAvuM+lTchzS+203QeMwsl0Hd8s/b1DhvaddyxSt1geg+EN2jyu24UNfNt436vA9yEAYKJl/nbI7//dzcbm2tpwVphAQ+N26Z40zR+Z7WVCVoUdjvEI3ufPHyGi43unjrzl8j3VRNIHFBCSlXHFkOd3kTMpMBk/5t+rd2GxZXNA/PzWZVLbdg1no8OMexQL08Kjd2jOp/KhdLjkH/wQpF4DxVElKgOyJy7Zp39/GhBZudNI/jenjO2g07ccoG23NzWcjVQ16uqNy0+pu38Yp5XNHlD0zUGX8gubeJ7BTH4RX3mCA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qd1wcUax4EHT+Q/6BQbbJxiSZzUNahF/da15U+/hsEBcx8aYhvLlUHec8EbMmMcmjHKYyF+jPTgh+0iZ1uE3U6Mti3yXSfdLcl1QPeIp+s7uYB0P9NBun8MM7sAsQzp8w70zVqcKgc90vgxHN0+J5yYMtCH/pD2WWdpfhPSN+iiVzjMtBfKp9j3mpQpRMh/lDPru86Aghm4OWwwTaywPQcku6wtZuWc0hH2XDUzbRrAiwh95GaIYEO5GzQM7m9MTQ1ZGkQq3a3OOsEMQrgIYmSR2ofmHvC/2L6tD/UdXNjQLMc/j4t8RUDdfiYgGaueHz/2oCqw2ScOqvIkwM3x71iym9VBgAN7Q6FD+Y0xtFgnCzGHTp8oorypDXmoVQemO8apqJr3X+1qSvNrH29CEMx3hcXORTTnm2IfvpgB2RC0b/9iN8/fANBcHbU5FRsrpYTRDapREADG3q2nHkeF3n5fyRvtIq3BXq8eG/6GJ2li5gslDjoaiWF2NIVvnC9adgBAzXPrU47Tl3PpaFW7dgI7t7msi9Y73eFcGzlP1zEXG1RpSGy8xiOPWjxUIZmsVz43prnWFKBSDRQvXQ9SjhbGBiXjxdCGdKXY4FqaDKRZGdHr3GdEtVSq+8nFmC7ozrM8xxCnjEc6o4M4nxq2msRLPDzaIyfmdmKYa+PyegNFfcB8sABlj4bRxBgaGTiD/pVvl7vMAR+kE8sStpOZ1RHwnN//BfgGkJJUNHlp1+kdlr3w1uwV9OBO/8rq80GIiLGSDM+Pvi9oI4tLg+2TDCL6ofUCgE27cnsnwbq2twrp4FU62spkKdILcbuDZDrbUPIlZ4XON7bnLvITbBnRM0D71/H+sWzqk1kMyktl7fyg1M5fxNifkjHKZQtoZurQL3FJhb6cgUx/xLaUH69byt/CYFbYcU3PXFKLixmKK9NsL3b+8lelF4tc62VRY3QOybzirsY2Y6FS1ASxWjQ+2Hv+/lN+JdvR2lbS/RMvLVyocAjpvX+46/vT98VZwBaLVz0BYz5ihHvCeZb6OIHFFuUoBDn4/dofDZMBfeHDNc7MO6HWKCCbcyLbc/3vtU5A2tsUEKTwcKMqqhRnMEKTWz0vDP4AunziJ0jGV9F506FZX77T22eCRdDPFwh9R/afgNX0VUy14kJ8RkBl3kOf7EETajUBwbkA80BlOC7Yy49p3/2IaQHhjSqgRZByrjZ4lgecFryTX1mZfp2A5Cf19UAj8x9Cf8/yJOHJNUtWkjMyHKW4+Y5pakgDuYIb5lBWdNlTeoxL1jd/0zTdTxZjynZeWSaKMKeQ7J4lUFd5beYU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7243ab91-343a-46a8-8a61-08daaa2188be X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:23.3365 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 3/8] configure: Add mpegvideoenc->fdctdsp 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: S8T83PTnc5nO Currently masked by an unnecessary me_cmp->fdctdsp dependency. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index c983c689ec..406ac996b7 100755 --- a/configure +++ b/configure @@ -2755,7 +2755,7 @@ mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp videodsp" mpegvideodec_select="mpegvideo mpeg_er" -mpegvideoenc_select="aandcttables me_cmp mpegvideo pixblockdsp qpeldsp" +mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp qpeldsp" msmpeg4dec_select="h263_decoder" msmpeg4enc_select="h263_encoder" vc1dsp_select="h264chroma qpeldsp startcode" From patchwork Sun Oct 9 18:10:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29949pzb; Sun, 9 Oct 2022 11:10:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7H298Dlqg+XFnKkrvgupipSs60OtL31BVgZadcRVhF3fvefCyghMKYpmM8lkNGAtoV37bg X-Received: by 2002:a17:906:dac8:b0:741:545b:796a with SMTP id xi8-20020a170906dac800b00741545b796amr11776460ejb.240.1665339053348; Sun, 09 Oct 2022 11:10:53 -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 ae8-20020a17090725c800b0078234266a78si9704670ejc.894.2022.10.09.11.10.53; Sun, 09 Oct 2022 11:10:53 -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=SDwP3erK; 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 9C1A668BC48; Sun, 9 Oct 2022 21:10:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075048.outbound.protection.outlook.com [40.92.75.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5A3F68BC65 for ; Sun, 9 Oct 2022 21:10:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JfevUXuFe7O/kaPkG438aDe4OazNXUvzpOQ6E+fkk7U7bbGERd1Dx92zy2RTZu1gDuc/GdzU8MmtP0C109PHqAl2j2Vw6ztA5wcqPTgM6tHRdLNKC1m2gw5mAOtU+obn4HaGklWZM68896OKxIPAJBj250XCW498kPQw5g2Ue4dNsxxTMt48c9cCUU5UzmsBTFE/gvoXulgvm3rLsP4F9pe1O9z8edqV1ubpiOBUwiu+CRULTUNtwJSbEHTNB8ZxijOVLKcpHDCUE1RFAeRc2ReGXBfdVsYStwUvNo/TxKaqJKbDcWvpmpxvk/1cwMnMjU1tcgsBVs79kND/Fsl2eA== 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=TILCgs4zyQ2JdRqUkiWKCl3/4VeuQYyx/c/OloekSK4=; b=Ra3TdlTNVYWXey6Cen9FR2o6drJqdhC63hmSquyr50tvfJ8iF90rlP0dFISflN0huDAsbCwNK3PEairb4llvido0Vubxvb7oisxh2Cbo/K+Kz/GbsVl78sysXOdN8KraERdp341mxf1Ns9OddMilu8Val1DAJYfgVzobvpPY05hOc8le3N0FtnU1oE/aNZ7caJaUVtXUXBuaZm/3cnoZn6HfbTBnhQVzX0el1iOI7h3UFGprKYzRm6lztagzwtEIXoYAs2G+/oQLCaVybcZdrK7S3UxrrDWDzA9RfapNqylIsq1PV+f4CmgD33TAnz6tsc1pg6JV7HNHMWylzgGGdg== 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=TILCgs4zyQ2JdRqUkiWKCl3/4VeuQYyx/c/OloekSK4=; b=SDwP3erK0OGDnrTlonbBYhw3NZDWsikpr0aFVfDx8+H+MJxoqQgXzCmw7LkVn+lyzErlUrmr/zv/8NYiyMTHmaRYt1RkX6MDV4HMGZNDHd95WmISEv+O2ZYRHxj5V7zrX/k/NV6yWHNsPw3rS77V99ZEmVAEkMpYuQ2TpT9qhVaR/Pcns29TfbG1ibPCCHdm1fdfGe6sRLxBaU0v0zE+QGk2v45pfGXIRGKNAgmFfQ62XPcVcHcChUB6//6dYq0mawmPpBvAC1kjrKA2HNuXEVDXVdkhImsZp8EMLppp3J7xg9mQGUH5XYqNN8xWXRF6e+9ZTkT+djxsQIDbPWyXbA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [fEJcOMhrjGkRm0XW3FZWnnG3rpTSoMTCuLmDvRhuSNA=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: 7aa4f744-8cc2-46d1-1253-08daaa2189b4 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVkvZuUswJFUDBfME+S0CrFf1TxclPno3CsB+o9bdBzj1Ow23Z0LtRuDhdGWx6CcBcw2K6SmyDrReLdNoXn0T2nPHFIksQPBqXm2XIh8S5C8w60UsWymdt6hyfG7J3J4HB/vu6+TOo1WU6y42J4o1hn1FxpzVHT/U/wEcByibcIAJ4VLcgkjNTgzezlKyg45A1L3hjhSNjYt/+fFJYsP+Abn7iXMjr6hjGpqTRICWUogXkVi0hWLGNWqQgYmejAGWiKTs3yw+Q0s1BqvAa/SGpN7E8biXq5X6g5CEyb2s4pz/a3kCuIqMv55X/BgKbQSh+sfk9hmdI59FiXlJEeg0/Zg5hMtm51ZZ5BdyQ2qxAKiqkUF6YwenBkzZbQO5jHtfRnpsMF7AcIHpiMo3CPM4DYsmNUXFyaB/ygMqCZgYzipt8DEleTcIQHCvk9+FaRHv/xs6UVatC5vzb2UdUfiJKoAeiO1/oYPNXNI35bdzbypgL0xvNyWANrT/arYxXrXnotHdQIJgwr4onQaHLLxw1XLlxgOTFUbkyS52QFRC9OxHYid3JJ9Nai8WYXUdT9zbDqvnV0GJZUoq3Z1yrAjOI+e9EcaqeX2leBniY858f2/2rmrsxKWVDO94jru1kjp7b3zQXnjOlU7kGKgYyTPj8QznYATBfTCi/aZ6ZOaeOPSUrJET8TXkwiepf3X5qvt3a5wjsMywzMI/MIzCIkKK/nDeohH8sFGWdw8mfJUBJjU8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ddhx3THl+esEESdqT9hZEUUAsF8pZkB0aSe/5hUG4OZ4bIjcoh7YDOazMCg2Y/Fb7u2q6XpnTYvq5KcWTMmAcwxe4ySQ2a7UIVkmb/Qg1f8FJ8bhuvi1x8cqK4KE9nlKTUeojw5yOcDNlTmmd3Qriu65vbvGceX8T+u8h3kEwKzvhh5ibBajzYVqA5bUN7MzCnnd/wmtjd4HP3f2WTlPDdFA3XbAWfMCgq+sH6Tc4DjEPRc915DNyu+tke6BWWs4s63jS+Ayp6W3+OR/QZaBV1tAxJgChxgdfIUmr55Unz6HJm6abevyCrRErXM9ycuglGSzQEtHRfPm/UOw9XGu3lqabpS2kCPWtLXtAVNBa9UCkr/XoxKlUuBVUeSpXNUmcOyO+N7FJbHxDuH5JkZsR40SZeer38yxL7C00Xc0yntjSl28XgQq1VyfSRdUl1RYCE8C6C1WZrtXkkfd9AeiAyD4Me5WKbhRLpMHGJOshUmTo3CVaPVmAFvxY3ZyzdnxbybBAywJ2ueY4ls499YyVotiEs6ajKNVKXg30Q0pKiQOZJjxuh32gAwMnttmnzG8l44cjmRyVvVPs8b2YYq8vwHke2uGV8RdQ2AOsVH9kavZ06sXknejAzbcjAiY53PtGL4vhj3UadDNukO4YJft8nLhXenncTdfTu5gI0VVesfzRFTukDuX2hm6tYP+byx2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cbg9mKuWC8kHZCsQbbt61z1E4Nmf5UWBKDPniTuRRdp9S0hJDmHv49m4LzGfqHUfXG7/JBzms8nbgaVxYwNeiDGqAnYiVQ24vDQlj2U9aFYsD5mfIdSTjrjRhNGG7HBxCbQrrk9CIBjVTchaHFdYEh+N2gT4/8jw+fHuhoBoT+fINSJAJog3aNCOtHE86khg5elJLeoCU7GDJCwoyzKATrNLdIMU8GLS/olHp1azScIXPMHN5dTwIlZaxrM2jhRdrmEr6ultJ7WmGHCJ3ERGWLVB10H6XUpCVhHNhm6W/k8DxLrD238HyPwD82qUGKQVXLHjhpN2Y61yicLFUSAFU/6Xme11ckDz3Rcyel+a9XnFdkeqwdFXsFJpf2coM2VlgjUCdE7KFwOlq1nHpZnzKJZHHPaJredtz8S44Y6I1HiNYH85gGmynSDkWfxlOVEAlI2ck3EcJjIa6R6r/X3oWcKm/fKrWufzyI8ZdZ39H2xdFk8ulKgaMPBm4tWCPVzmZlYductLQA5RVD61NxhwDGiM3HxZji60Hl5rVF9l6DesHxES3t/jtjAVGtGgUOXChDox9ySFWwev1/Me71sZRDEuP+TKGytVlYouryNxyIqWkci1XWaQGzwe66ZjPtljMJ0P/tSHVH6JyuARQ4CzUpzWKf3Hwk021bIaXZMXKBNYwYGxiLgVwGU+PtTxKctkcMuipuFbKp7xnlEp8dWzQZjeB2E6+4LqE22DqFX9eQ3ysW1jkSGe5RBTumcYyJz4/+oQp/K42jm47x6ivt9h+iKqV5mvaQ8xfWMheNS9eZuz4JCJqqBxmGckL+h0+joo8UHoXvpq9kn2eWwuezNMpQDA3NqVuiNfPmO/mZASVnOX5P39XeCzikP62uqsu+9chggthQ+Mrc4xoxC53AViMcwA8Fs0/LZ5ryhKtMFEmG2GTtIpHdQs0ID+dOfRII0qOI8PPpR1KcbrdSoDtAgrYdzDW5P3xEa38w+xI1OJ1GPyPU9NWjQx3QYLgJIyf/DTfuJ/JO5yzFq0COjHCg5notTwfu3pjYia4uPnx8EuDlZuvoDqS0ce+wP2n82lw06JGV3+Zfhm2qxXXb8fsnbwKKUuzxFWf6ib8rR9FnH1y+RotSZvSorD1jSQ7jfe3rpxOP420RMZvo6DB06zPwVuYEnDeW6+p6BXc/r6Wx3RygPRza4qLEOuyxdQDs8rlsBqgdhDO3RS4LT73nNz+Pp22/TneuypbzrsOLNXlr0JdJVTVxia4RPxNhGG5gXBZIx/kYxkIkH5U+3z659TsGgMlRKHSHwcaT4Yq5N0oZpJmKI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7aa4f744-8cc2-46d1-1253-08daaa2189b4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:24.9312 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 4/8] configure: Remove unnecessary me_cmp 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: 2dzkSPGwy98J Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 406ac996b7..689a6111c5 100755 --- a/configure +++ b/configure @@ -2749,7 +2749,7 @@ intrax8_select="blockdsp wmv2dsp" iso_media_select="mpeg4audio" mdct_select="fft" mdct15_select="fft" -me_cmp_select="fdctdsp idctdsp pixblockdsp" +me_cmp_select="idctdsp" mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" From patchwork Sun Oct 9 18:10:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38631 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29904pzb; Sun, 9 Oct 2022 11:10:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zE2bgzmr5MeuCP/SS90TzQCKmtu6dlAYW7WQerblJ+RADJ+bWznFhPXvcRIfA8t0Mo4Ty X-Received: by 2002:a17:907:75c8:b0:78d:b646:e768 with SMTP id jl8-20020a17090775c800b0078db646e768mr1672451ejc.432.1665339045167; Sun, 09 Oct 2022 11:10: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 ib11-20020a1709072c6b00b0077951929340si6713378ejc.271.2022.10.09.11.10.44; Sun, 09 Oct 2022 11:10: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=YwHaWoFp; 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 91D0B68BC65; Sun, 9 Oct 2022 21:10:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6247568BC64 for ; Sun, 9 Oct 2022 21:10:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y2+DnxCRkAn8hnzDystB+vlRTWWC5jiO2BBOd1yNUiBDrZ/N4wQ+fgz+3Ic6VyndGtNPFw8KMiWlaF0KQBG6txBsJ7ZxWycrH0NOrNVNPGPiORmc2gx4YaiHtWEJoYMNmvArSQe64PB/yZhw5ybunwO+PLhzYtGOGDTvEWiUzPFEPdcX22IYAQ77YRahzI2PimfaaTjlYa1QN6aYDoO9xYbqhBRa56EBF7g5f1hptCa8nCaSRrTcMY3SstzGnUXFt6b4gOqsSsJ/YzLeHViongU8W5qBECwGJJ6We+yMCCqmA0L32JuFCg6f9wAxWpUDexRVwNoTbNCAT6X05pjJ0A== 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=5Mo/WQqnCyHRGkWBMREmZVj1NYeEwe5LgqJNjHyUfyA=; b=Yo8ED/YrItO/2bmiVBtvfZc5a07o3P+R8b9ftWhY+QIvTjWK7/0p+blw+JXi78avIGdvSaB8+mPtFz/yYbLwzb4GhSr825MdqcXAUHaLrrLkr0VWoLuJ/qVfyDRotO0GqU3+Q7RN5QP22Y0A6OVcvkhg/tb5RbFLmWG8P6/qLZaIrQ7iLvU1Q2+EiNuQ7TKcjD5VX1yLlQBJwf8VsyY6YPBQBRT6e8IMAW0wLMwbkeQwLSKnWXeBsXn7PAdt+X7DyqW8du/1Uq7r1aBNXCiCdptlZoQ32W5sWQsvyqwlGCtb/1bGfiDhJrOjfhQaPOT9tJTkcrmnznXexcVA5IMU8g== 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=5Mo/WQqnCyHRGkWBMREmZVj1NYeEwe5LgqJNjHyUfyA=; b=YwHaWoFplb3tA0fe1zrByST/XExt4gS5+86PPAimgH+6T1kun6V8W/KFWbTzQb703A5U3xMJsRdmtuQUK0q2nj2TlPR8vXrOSE9BUsukQ3thB/oiP0jnQM7WG3M+oZWrM1Pnd/oQvVsTgRkSdXbk+5o/bl3R74Il6zygahL8NmHAevVFbBumgL45wS4c9JiV5jhXaKshI+OMoKLCq8ULhOhAgXZsX4utGIupYrRI4tmllrofC+F2q0jXv10M3Rb7XIUl0JvWMyis4Mm1dEoPuiAqHTg0EG+NAq97+W+Uq4OBpzECVleSTMoi39S745f/GEA66tl6GZbSczBHBPOnhA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XWIB2FeTPyI7WowefxzmaVRTA8apUZI/1+XyFnLPFyU=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: 98ef5066-93d5-402f-67b2-08daaa218aa7 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVeo2gsSkbSv/hgys+jMPmkaBxSlZETWSb10l195WdkQqgJ0VCYvpk9lh3UO5aIX9uh5f0BqHXaAowhd6LOhbo0MsWAk87+AR5bHK2zEjVaQmFoXfOx1iUv9aezbhSqpjdQDbW0BQwoef7UJzKXgJQ242Hdne7pXCBCy3iLilshqFs3oxa5zIfDsTKWp1SQ9MZbZq9X/O8iOUk2qmNFL01e35t5XF5XYdAJVC5P4f/9k+s303oYeefp8niVmGr/BEwmjW/kpHBAxyyEjPYtdNj9s2ad4bGhtX5TlCrwVTViMRgyrv0lauUzgI+wD9DokLtjXeHTYgllwaoUgpL+wPnxT3/zxCowpbvTNyKqTwrtA982ZcmgjM/MBwV9rU9rOj+KgSP5FO8tIOFTU8EmEAGVD/h4argt6z1BxLvRTF80uc+nMLiNhPIoYWEAa05b9UkwQH3As5LlD66ROLeLLcGJnBw3G1mvwm7a5pAkJDzB7eiLETDVEo2AdLzxIbM21dxJkPGvnqFvr10JSiL01o/r9SD/nPqNDs6/nGzc+nPBIFvX/PNUSJUt3DUb5q92CoT4wl9URWH//QxLD6AwBQyvB9unwS+QC3GLLLehR45SeqKH1iZ9i20RGF0r+xMB/e9Blmw93UyhnJgbserldZX+3pwfAffByZk0pzMT8E0CQTNNz18bFZ4NqgJ6er20nDkcMuCNCp0Rs5zx4uz2BMO+HyStNaMIA29w/AhWU8pEBc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4UQsOzjKk4WeUHCnaHLfV+VWrpUfH0k+FQv3+v3QhD4AZ0Eym6B8vPaDwD6FlUW0jwO3grx4DGEvlG8PhNp5dLxSuuavayJrvPG9QrNlG/KIqF1MjHkvnb2SZO9Tpg4Rb+DbtlKeJp/hkvguZfmGSMCw+fhhEXNhFBo+UyMp7tKVcRtMsOWp4H5QwZVnyyMc8evvLYpAEo1a4OSdYkZ+eU/iKfyf8GybN2shdn7Wh/pdQ6Sl6c82BM8uuX8KpBqk0j9q/pZ5yW98+KIg/FUH5uUyDuhrWY7DAeH79Q4K63mKfUE4Mek3P9MbA6SfIodaMVySNQ62zbLbasGgOXAoX01VYExLHRMjupw5QTzwNNKRrYz9jLk/Zv567kVLrr6NB4F/ARUdAUUXOxPLTzGT8pc/91vYKyF/NqqMtSOkj1lEYe0vK6YUzcpnD0IUW4YsnNGwaeI48bN17DEBEpZcstpUZnpXm0GHLWDrU+9ptpDyLypXaBcZRgSuPvAqGVHF/vT33ggYDveoBDdxPbPj9VNBKYkAzfojTU/KurAFQ06V7r1tMmZ1PJATayTJHdtU8aVyt7P8ypvg/vM5/w3hfcmKT4fzxEtfUPHEqkRVzFoZJRAtjH+nm/elfCphoPoniW+EDhW7Q8646hXWMCnfx8L8skGrIHUDZPGdTAOHDUT37x9lnOVY3FysnANpvaVT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LVEWXrXpqLqZrvJ/825bKL0oPHoxjGBOukVgAifuQZSnU2ADOEimg3o3TlNzFIIV7pVDAldWXb/XRo2eYzLmAq0QYdEBKRocujlZOXgoyr+o212Ijkw7Qo2GkwhQ6/Q977cjJlaRVIuzkWEqSjGQ9DXijWQ3QkUdQwdhWs42LprF2prWWDmjbwwi+KkgDkj9rjBDTw3HjvptG6Y5EntHIXMEMvnukcsvVqH87kkzwIsoqmk6Ldw509k1D2MyBOFUID/eVSeZu+y42goYgceJ1J9C/aZUiS8136tXokCLFf8GVR2Cz9UZkxQUnZ8DuGUw2X28zs4p/fS2A53ZX6QuuX2ffVwT2s1n2IsugWjQm0iDjFh2a3HYoBJPJNQKpLDSyfXG7oNInyLUjuhXfoatsoSCC5tOn54veQWdR5teWq+RJcDdXC+hcjSk171grCNKdLgNGxQigWD82Zlkg8hqIDnwAuktAPJTm6j3Gugw34ZJbi5OgN5rtKGs8UTIJgqLxEJ5yIIYjQuQUa9N5wDg4LudG0nPwPkj49dlUaBjQUU7GdmcMqOW3sL3Had1c+DRbGr2T+dDNvGbEFtRn2aE8Kf9LzmmNAg3jA1ClQkV2PSuLOMjTol6GzS6Rzs4am/d91bdFbZ90fKJNuOPP1M92yiIy62wJ/wirpo41VCrSV3ycer44bNWX3M0m9VI/95+HEgkLRYevp1CNCtZB3YMtt+AXF7eLtzMyZzwLizBmvd8IwrMS2QTMTZBYSHNprfUYGgNdLsEfKvDsu5KQqr4mCyAgFX0yVqFYHdJ8QWqecPSTy99pKXF25ru4xnB7XZzv7A9oNgSuN4vgP4ph+EqENCRYXpWBrwLXKISduwR3d5obtx4MmAENwjU5wF2UFOJ2g4tPSqbQbE6+l9zkeypOf/HQoPbflvsMYq1tjmNkifvP26/n/8H+kgHKRf4M180dVPscwIPnGR/4OGEG03Q58F3GCOyYZGz7evaj+qQOGLqRiqbSBp8ruCCh+rq2Oid+Y1n33iPd60qBY/pFyguTyrkMPmWhKiblDnyAAeWLoqqAUaPraquK01T89pGdMX4+OilKYGZPN9tWNuCzU2VipEZmpiHAKFTA2o+O6FR7ir0HbAziqpb2vbyd7+hPbS1xCr9bFB6azul9o+FYGAZHhdexEwfmxKl5ez6xtMZNWru38TlLlzcbxW6z1++fZK8KOBaHLzcEr2xiEus6QKX+FX/RuYURI1xq9k/efsTWAd611ydonDuHtX5LU9YfWnOqhbXWL14iMrdtMldWZiQKmyeBfxej4tJ3z/3k2MOLaE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98ef5066-93d5-402f-67b2-08daaa218aa7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:26.5558 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 5/8] configure: Remove unnecessary binkaudio 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: bI/IXwSIUZB3 The binkaudio decoders don't need mdct or sinewin at all; and binkaudio_dct doesn't need rdft directly (but nevertheless uses it indirectly via dct). Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 689a6111c5..0d166de7a2 100755 --- a/configure +++ b/configure @@ -2797,8 +2797,8 @@ atrac3pal_decoder_select="mdct sinewin" atrac9_decoder_select="mdct" av1_decoder_select="av1_frame_split_bsf cbs_av1" bink_decoder_select="blockdsp hpeldsp" -binkaudio_dct_decoder_select="mdct rdft dct sinewin wma_freqs" -binkaudio_rdft_decoder_select="mdct rdft sinewin wma_freqs" +binkaudio_dct_decoder_select="dct wma_freqs" +binkaudio_rdft_decoder_select="rdft wma_freqs" cavs_decoder_select="blockdsp golomb h264chroma idctdsp qpeldsp videodsp" clearvideo_decoder_select="idctdsp" cllc_decoder_select="bswapdsp" From patchwork Sun Oct 9 18:10:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp29998pzb; Sun, 9 Oct 2022 11:11:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79FrclXBzB85LCwTXBwp2yHYrE819lXximiREZQ8WFHM2YTSJqWmUAIlakpyJeh6lQ97Du X-Received: by 2002:a17:906:cc12:b0:78d:2b54:9e80 with SMTP id ml18-20020a170906cc1200b0078d2b549e80mr12269501ejb.144.1665339062096; Sun, 09 Oct 2022 11:11:02 -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 r19-20020a05640251d300b0045902845795si9229661edd.557.2022.10.09.11.11.01; Sun, 09 Oct 2022 11:11:02 -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="AJGy/bfD"; 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 AB21468B6AC; Sun, 9 Oct 2022 21:10:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B3C368BC68 for ; Sun, 9 Oct 2022 21:10:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=moLkxW0Fg9Yl2u4j6Rk+uK/a6DghI9RQXYk3hq/LMNtdmQRY0145M1r3oEDq1+apzJGBOuncrYJ5B6aDXshrzdbe2w7TO5f7yzv3xEbk7W3RhM8PFJhK0FvSzc5HGI2XhDAdJqXJaXcNM5hCkZ2oTKpykiaPd5Z12uoedYCEnCT95ZD0GTBmp5tAxsTYipNLzEDZ/pZy06+oLaa7C/1ZFzRCBqbAU5BBQYD5guk0HNx4VmkhmleFxOkEVn6a+OIggOSjLGV4RCBQEFE3p9w0FApBhh7dXiML42Jo1pseAhYFW8xo7ourr0Snm04r84rEuX2p/LOnA5/cM+yT/RlhqA== 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=tv0bX83AsDNZV58EJ5ts8/HirYRppucKonK/Oa1wzgI=; b=aOSSpO6bNWEjJQFCLk+2Ggg2WTEVxWMOlmeIDj/fK4TJuPfD4mzuI6AAgZEkSQrnYn1/wG4F94hTVkztCvbjt5kdisfqH2dP4+3msaTPCPf2oDnY3sc2BM/ikaEitZZ4CJBcQeIvBljTQwBFfXU9PviF19vBA0+2kb8ZDtIpqKxXV9qsxkas0ijRos/6jGiY0MObVGsFbJdszWXu/CZv6OCFVOpQZq6Y9kkFGSjQJB1SO3SxhvtJQQNdkrEAyfI5JDJk+9OKTGQG65MCWyfeu3ewGviKRDG6GONfGFXuFS+Jnx1bRN5CRVf/0zRfeNooltPzjhMgeeLcwG4SwMwICw== 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=tv0bX83AsDNZV58EJ5ts8/HirYRppucKonK/Oa1wzgI=; b=AJGy/bfDOkc7yu3MvKacgNWQwhr0HoohINphtCUAVMPjMtjGRGe6AD2L0tRNKJv9mJ06esihD5mOdWtgOsq4gzABxKQXzoWW1GWum8sSXaD1y990cdRx+AZ8AcO6vsr2uVCG02NjF0A81XzeIVHiAkvI22M9mC2hFsds8aqFcbCFWyHGrtEupLTl9VMUPLNQtXd1VHJAU+VmlqS8nDDGf9KWrSSa0YNFdBwtv52N5abKAWeFNN44PAA9UnKjX3ac0dZihOQ1FYL/RDhcb9X2t4Fn1kQDeG4cUXwh8QETG/0OoxPz6m/SnWZgJyeF9gPQW94+lPgTaSdKVzoXS3KsXQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [2dSMnlJxFeCCoEXvBgYLuLKK2RxZDIrZXDlo6ggG8eQ=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: d097be90-abeb-45d3-2137-08daaa218b26 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueV5TIK/PgckS73fm3oes88NmbHPYj8TfeV5mO8xiunnnaTkTALn08rz+GQBUPLUpTkzGmDwRxTGi51UY9KWM9tupyVtuo6pWJyP7mt77W1ny9I4tw9Whr1pr4mIYjcYXWCmLeMRrANZ9QiuWJwg2F1UrQMYTiF/K8ESb5o5NcbEvtXLgG5poOcqbNco6aEfdLeCFLAkYA3QP22tGEarw34KkmwJODYCTG5Kr0lfp4sCfZKm0vdNiHT6ZeQyEchTmljy+yW6Dore5uyocky7lYkbFAql7ylyzkL/WLXJIExdxrpdBGqDWRS8QaUcwqev2gGf3T0zaeCftkU1/PX/PcMqfZ43hqtnbJGjy28ah/KwmRRHBQ1YGRRCzDIdsHuNaJrD10Snr+t0E9dX19oRCFy6XFCt7qGu77K6B/ifcCvJbeoFwYCsc5E7kyXC4UpoqwhBhGzrpbP7FBtOz1ZU+ah8gD/HnkQShfRNKGmYLKWDeUNU6WNqTEYgFIUcM2kkWP/ZAuuGQAGe9NsmSUPdEIbVWTda1n7Rq/nYBRpPts0HqHA1NQao3lzBvcQd1Xn201wTqsWg16b1XUCcx4vkstsvZg1RaytAwSv93gBSiZcaASWB9RF3s7H+oManQZb2m+OfE1Te94fRS7zmYHR00rdacWJkEfRodIMo11vBp/yEE6lK0BlCvFMDGl5NrWcO1Qqx6HY/okPz8oT4S4m5PnDGcpAJexddv3IWichvWn04q4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QHe5sQ9hFdFmFA4iNHQzxMH9mskJ5oW1YnxbFVBDNGC5Bz0S/E6IKZstNEAn3d/cltELh1E3o4Ba627phwkyM12BUzjWOIxO5lK5aXUya20ZwaDTii6z0KRTSeTwUQzbIUYxY/mDaRZETIdmonly9C8SAXGuGTtMA6RoR8JpCpWJSE/h+j4sh8zihXnpR6XtgRtEEzqSmUxfGZmV/JZTuuu4KBS1RNAZvT4EgDfa7wT+41/tkxfzw+2fplEUUkyIfYmTM0OjytDkFdFtpbbZXALMhEOWLF4QhSIzC+Ai7zWA6QAq+MCze8u7r6mt2vnVQ7EKzJInt51p3kWgSoaSoKDqsByw89u+JUkF/8PQ6ECafFvD0m9Z50ozoD9VHbxYvX7/tG8PQnwhQG+lor3SB0q7jysFdmLZ3a1WbW3yvmV+HJ9q5CFAqhnJ9RE1vs7l4kNaWCr92rg9PcRnVozDUI3l686K7mAK0Yew2FghijiDVD/iqHWvFgWX2Plkz3TOmNN8qOhMVj3HCGSvgLnXEK1IO+ECK3UviWCykB6+CB5vm9+3iOrdW01nNWAd8SXRzUg2qNARxsW0zWo4yHGjjE/DoI5I0cMP544XgwW6JKGzhP4Pa3DZf7JN1e30dmvMsCZAiHGtZRrQ20AGJEaG+ehFraU4g4ed7mKIv8C1SW/8vaBvvYLhXqyWQmuincQS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DnMYTNUB5LwJZN+CmIIs7FrcFBwBeadHMnwSK7FbtdhuQnD2vSP0fzif+czNQEs5uFI7/XnW+KAExSxuZnP8aSN8lrV4gQJhWw6FSwIcah5wUWfTg/3BDrIpV+4FpiVa2ZxWNzwr/hQpW7Tlb8tloa01rI+r/VCVm2snnO/uQMymjrO9OaJJMoBKwftnSS1dPq8QSxrNXSqYuWnXTWSGx2GGaWOG/HaeYGPXjAyPd+f663gMmGutZE2CRhUjRcLQMnRxdtGy9qfjfrKn8xGK8iRmQCpA3+EnqSuSCBnG7mgpzdrs+h9U3mmlyQidrdgFEGpCiWk0GJTbiCol7RpZBjBa32k7m9qlx9E1tbeytVL6+2BwRMfk1T6cZT/sqBPBRLLmeEZie1ZiKliRcI5AC9spUD22H9vKQOd5Rz1dNGnOaTeDBC40/ZXlTZV6MPdOcOVPSW/6NbiEMAdv8m0re7TcUTCF66b5HYdQ74JZma5m5yWN+60KQ5dBb95KTMVT+eRfzuMzm9v02mCKEeOcja2a4078D0y+3TLn/CTZ9nTIZzOSiIS68c3TMuIID05BX4aTnMr3dDA+yYZZgiiLdMjKxELeEkWnPEqpI4e3lg+gZiD5DjLSr/zVaWD8KCLBV6r2ADRFgQlMENApNbtA9iiTbgNMWGAw74ZJyIzXEntx32v8QnHw3PNNeCOZ9ji9PfB31JOZRGMi1Z8BcwVtF9sV6kiJ7vnjC0hskNRmanngZCRsoeCs6J55WRm8KAKRKTbFDdfcv/u8rqv/6QhzMBDEynuQKPPJD/bBr6ns4GVzD+U+SAkrL4NU2H72htAIupuM4KrnxbE07FsQp4+u2bGVHj977GEowYGH9YJ3FS32P2bNJXNzUSsNpkFxokGl2CiWdcfX8D4vEqYVcApsYiCwLe1tclxWYL5bxOg8VkpaLuzwpAsSZLWOBBz9xzh7fCl8dBkV6u4I4cKV0FblNCGDOOxdbGyEUAPNEc1lJF5Zj2QZUtefM0n4x2HgOq1z/MGtMM32mBtqcPK1+Mg01PMZ+QlcIHjimsI8ZFS+k0dukyT//+ck/u8RNtFkCoBhLpWzG2VDAEFUUqIOUf/cxvpd90nKY0CtlsKGcRZj32pDcDIOiDK21tjCl6ZPPFaRPSnNC6QZhb04+/AvnKlyikseI8Id2JCNBu7ooXP/YJSfVW+W8dJ0kDj0VVc2KyBZU1V6Jv8tWaaoqlF0qvbkc3KA2uEOcmwaapsHUseVC/rJz+GmOIfRzm00oFD+ATHDSywm6SbPzTqe9Nz2pQndAuEADScJJGoWjxUi3hNNI9Y= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d097be90-abeb-45d3-2137-08daaa218b26 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:27.3938 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 6/8] configure: Remove unnecessary qdm2_decoder->mdct 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: fAzC4J0JVakJ Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 0d166de7a2..636141ae1e 100755 --- a/configure +++ b/configure @@ -2929,7 +2929,7 @@ prores_encoder_select="fdctdsp" prores_aw_encoder_select="fdctdsp" prores_ks_encoder_select="fdctdsp" qcelp_decoder_select="lsp" -qdm2_decoder_select="mdct rdft mpegaudiodsp" +qdm2_decoder_select="rdft mpegaudiodsp" ra_144_decoder_select="audiodsp" ra_144_encoder_select="audio_frame_queue lpc audiodsp" ralf_decoder_select="golomb" From patchwork Sun Oct 9 18:10:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp30089pzb; Sun, 9 Oct 2022 11:11:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6rNaULap8FbxXKRFBctJWb4nThgly1kzHvGmXqXCa9ZZ2XxAteot8MRmLK0xPNYADJTWpe X-Received: by 2002:a05:6402:4517:b0:443:7fe1:2d60 with SMTP id ez23-20020a056402451700b004437fe12d60mr14456638edb.133.1665339081206; Sun, 09 Oct 2022 11:11:21 -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 21-20020a170906319500b00781ef26422bsi7780148ejy.363.2022.10.09.11.11.20; Sun, 09 Oct 2022 11:11:21 -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=oJskItVD; 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 D2F4B68BCA0; Sun, 9 Oct 2022 21:10:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075048.outbound.protection.outlook.com [40.92.75.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEA1168BC8F for ; Sun, 9 Oct 2022 21:10:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dg6Jen7jfctNoP6O1rIk9QCeZbW9VzuyiY+GXwKK3G6jkQB3lfgu/yWCZz06mSVGtd++cmLgMWxpmqI4QM0FOEYIHlTFnUMooUkhNAchZ//fEhQbWPvaNXV0hUng6M6isKqx6w5Nv2gyor4Siu+jZOHGV+Y5Qv9SeBDazw2Eo7itb/aSbPHFgyDAYEj+resAE16zUiGZqevLPC87WYjM/Oh6qGySRyCG/wtw/j73mHT+RFatZJMH8Zf5nCLaff1DQyW84nt1m4dLpg7+fo/DPIC1bYqwGX1OmRnKcMhxa/0tUA88tqGlNXx54liwtr3X34P7sJ5aWGGzkpKIaZ95kg== 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=7ivTSmKE2Yd8xqwtFqcC7E/xuJqbFKLiMH7Vd5ui9tc=; b=EPsrww1ekyPiTIAqQNWbS4oQdC8pn7D51HOcyhBzgTW1Hrh4Bkqk7dBLPYlZBCfXdMLEoBBsoxw3zPkbmqkDX+WxEzcNEuDVgqoacb0IxA9UO7w+XZ8IvYbzzi8HNBGGLIHNpF4IE/XIbkHHvNf/qG1gCM4SvCxpZku4SEZht9c8Jqklw+6fFTPPU75a89GB9N1ZdsFbLACDPhDBakHPnG0M4tUe9koBPHS0nWG6jNubNxade8WWDeWAg8/W5T9vXP4S28IC8QndmnEDL1RHJPXggEJO2sJABMu0KFW62Y5JAZ1FaeVfxLUyMhwE26N8+/5zMJKKFsEmggJzbo/ANw== 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=7ivTSmKE2Yd8xqwtFqcC7E/xuJqbFKLiMH7Vd5ui9tc=; b=oJskItVDm+DTjmfjGhp3+aqiFJqPTDtBfBplQF1mxcFma0+t4Y1G5+XytUshSzm12WI/NANqaz6peo+3n0l/iL3r+ImYAM37aO2wOZs+DHabFNonFeUFhrO7IvBUrJN1dBJXlzOddivRp3ggAzP1Y7cOKKoaVqWvLyndWmR1n/HbH+tSRG2azih79YedVkFe5MFdFZLd1+FiyQQzo5NqSHZRM5rBJWbZi/Pcyb3JB55zbbkow9LBCSvyQEuk6okMs6PjuO9HunAzxvG+sTrI04ApFOVTg/xa3cfPVwL1FLeJIMhfpWTdJSblCK1qg1R0Cf30Z8tFxxmmrkAScudDyQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rPWdL0tmH3Wf7yYjV854S+9+YWNh4XJKW3lXKhHgvg8=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: b418245a-7f14-4f2b-82e5-08daaa218baa X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVHybBaagv8ntAFAPYY7HXSHFwpuLUSp+8AP4/SnJ1Jn8DIoopzOqNWU59WVjXAuDC1DnOYQJ1A1PidpY5bcTmo+VGHXD6UqvRmzp3F3A7wNfoM8Kvyr0f6YOTZPtI5VVEgbFfr+5LiVE3j11lyq3mdT6/ZOb9XJv5bG0Kv8d7Jyivyg0EwL0F9h14YGf6fUAgHiof8/Tvz0+AzpDVevzhJFOmmZHFNw8UiBTGJD8Ltc6jV5jwoByNkjp7YoTXVGqGkBQSbj+xoTRElCLUiTpwGJ1jMG5zeNPZRf0ky6HLJlQUeFl1ZxsxdzHwBAKehVUsYtP/HZcHgLA6Ic3F9dXeTsw/w+vt16WC1wTB3+4ehOQywlR7npETp4AFLvXzl1sWuqT9JWupCIhjQm6m6P9Bf+FyqJPLCFEXbQHJyuQNpRIRodyIVCJufTp1derYEPjTlWGybvQpaCXzkepg+sKGyQXG3euCSxfJ2YjhI07mKxWy7bJTf5rpvRpnF9i/1286AwKONcaO5LnKK7cgJgZxJNpAUgu6P2x8c8+9C8CeMAmvhxk07/E3yAdL/gZp+frDnAimZw0ZJXhZjqoSYEJjJkughp+Af1XotGAsDCzZnK7T77NTAIqnVZhRLFTo+QZ0PwQduLC5+Me/8tDrQ+GfXkOhdku8dv/YxbTJZKRnJ0elEmicc0d3sXImqkxZr8nITLFDbqWieYlNvsxIBX0RYKD51InVPxxFNLRyxeCkjl0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vGni0uYj2EfRJ0s2kcIIdeh7X4GBk9tW3W9OGbLaw3ocxDmWYPyX8MktPytQiLzW0xYv84eraTqEu8r0x5h0Pg29hMpXLu6QO8ZCN7KfzKFVu+xg+rDn5Xz5WvyhDl0N2T1nij1rXQHxSwZWqDzCCRXNxZSlXm19l5RNLoO2xV+hzGg3kiqPSfrwn3gQRqQ8e6vt2d2vwaFe8AlbAtETDw0+xj6ltWqDPAXQY98TY5xjRX1IEXh5/NBUqbUIqIdv3oAH5iVE7Gs9+rdeRxSrEll40dUP0ehDxF+Ym/z9YCCRCGyunX3fJGpbMYhkFGASMFa2llmwVvxhlNIHa7WNEIXtXOJFAWtyS05r63JBNVOMhrynPeOa4aHvoESiH7kUE6uyKNjfrTlQNPzQvqgAoKe8m+O+8T/elXjJsnYHbjPL+Ab0XvOnn+Jkk0oAXlglBIsKrrCvWVXEe2LHDApnqFjxkrp/C8IaKdro6F9JYz09aeQw0kPUct7RHs8Nyx9G/YsyU8u6UThmw/GKK3kz+EJPzZmPnb3TmBd7QzUzWpoSkiM3TgQfM1g4eBtg/UzzgUvDZmBA5gI/XvG+h9TXObimq4ywQr682svQNRbaXmEvj64BmqMVRk8FA3+3kpYJkRMxvPP9/JHzSJkIXbRtD7MAG4SwvYmtm7QysU8yJ8OFQndcYSZH2a4lcQUcahvR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: smpjpUU0NrKdG1zrtsSxAYyyETvHnzR4Y8H0vFYl6HZJG3dnAPVvNzbSsF1FU9ZTVoP4vi8kPpt+4ZuEtYUWmdl42AYIcv0eYael2Xr1kPayor1ICCID42xDjeEoacpyQiggnBkQbdOalXU1qy2yrk6+zWDFsTYKkeK1JuYkaLSFyF96jziYth/gqpIz/jqR+EOAiewYs+rUgtei1jls5IAwSGEavpyvA3YCC4GhI8nVy4zLl/jVaxzwEZVTzghUXOsghLu2XgHllwDD6JIz/ryT0/2WeYpNPa08FAs6aX/Lb1rUbtm/RO3zxNdtFiXv5f864WeSoFUMB55jstsRpVh082TwiNEukMMV8YNZJjB6OPQeVn7/MMyQAgyJS5Bdu7gjggeao2S+oingybL7nN/XwftnBHmmPh9r4Hdho7fC9D5urZ62+MfOPKxMAtlZaEiSY+brtNZN238q8Qyun0x5DFrY9S4DJZN5j5Y+E0KjN/7sKIEuc5uycg/PucSh2CsCQ3kUIqSrqhn4lrwCiCPbHwfszY08t5XtoMV390wIUGbP5QacFcFW57whkxFODWoCXlcbMMTMJPlwibZyg7KJg7c2v2Fy4mSYk4i0w8VgBXGEcdq17ulZkzKeT0UJNbRbZCh3UFa1FSqdLecLv38P1eHlK3m+/+EAruwVEztFqDk9B9O+ClP8akYNnodtSg2dhgraI9SFtkHSmwehIFn+StvyTZRQIOcBj46aytBEXd4JnSVViDgDw8tJ82LOBJYOoDOiqX3rmdCus2nkYLHX98daM9oAMmRn6Xybf7SS4aERShKmxofPHUf/KaWgXIJvim1yBpQ73fFLn58Ni3K8WEm79YK9OKONjwJDpne0dkM9FRfQLfMVwS7N+WwYZsaypdOC9vgZIDuljW/UuDZXfIiOMLGP0MlPyNSwn0bpeoyndl9e6cSvz6c3bRpaXq+eKj6e/NqUBVjTfJ7uNRnUvnghWLWI0rsKdz0CNKNk2x+ftquuz0GZT1Dy2BsZinACZBHJZcip0FWfVPotYfmJveDz9G9S1AKWKGmek8tX/NVl5gKXMGTpvbfjT+Y5jzwMYFCl1gwQOmpgWvxh3QogTe35wfQiQRcZThp1uEs8i2v57z2ZupX9ug18x4h2izz6anmgYIp5C8iRRBaEbxAElVsGGD1gVy7fnk37xlTe6zFh+rYJ4Bb2ChRMn9NBwYMGcme+pqy7GR4GOy2EBcKecLVxjaPZI+BBtMz1PSHedkuXDjx6jErUdFQ67CEGFuFqhEBCJmNHETV7wWOz672kXYj+uwhKTTgrFAHJe+s= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b418245a-7f14-4f2b-82e5-08daaa218baa X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:28.2696 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 7/8] configure: Remove unnecessary wmavoice->mdct 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: rsazsXkB3VSp Signed-off-by: Andreas Rheinhardt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 636141ae1e..ad960452d0 100755 --- a/configure +++ b/configure @@ -3000,7 +3000,7 @@ wmav1_decoder_select="mdct sinewin wma_freqs" wmav1_encoder_select="mdct sinewin wma_freqs" wmav2_decoder_select="mdct sinewin wma_freqs" wmav2_encoder_select="mdct sinewin wma_freqs" -wmavoice_decoder_select="lsp rdft dct mdct sinewin" +wmavoice_decoder_select="lsp rdft dct sinewin" wmv1_decoder_select="msmpeg4dec" wmv1_encoder_select="msmpeg4enc" wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp" From patchwork Sun Oct 9 18:10:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp30040pzb; Sun, 9 Oct 2022 11:11:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5pzGy4D8pwkHVyyNPHCkkAtVk0Bcpkk0CF30vAQAIJa4FszSkJZGXjbJEWRHB68rSssG4Z X-Received: by 2002:a05:6402:4307:b0:459:4c7b:e843 with SMTP id m7-20020a056402430700b004594c7be843mr14027143edc.153.1665339071521; Sun, 09 Oct 2022 11:11:11 -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 j11-20020aa7c40b000000b00459ebaac2dbsi7142558edq.23.2022.10.09.11.11.11; Sun, 09 Oct 2022 11:11:11 -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=qV5E9Lty; 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 BF65F68BC70; Sun, 9 Oct 2022 21:10:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A604268BC68 for ; Sun, 9 Oct 2022 21:10:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ByLoVDBr6B7AIUdyZ1ApdrCSXzy0FhX36Et+q8spmADT1txKsPQp3o8VkHaPEVZRBQ6A08lt+9dYJV5XG4uWsKnmUJ7fKXISeoF2UStL5r7QCOIC/8+4HhP8gJdH0JmnunPN4ssSl3OCu6PdJxv/VUAWX97FWxHoHsGg2M32yzvL00RW/g09qR+P1EP9pcYkvF+pPadQFE6BxYhpOxpSlpMMvG/ismMSWTzpCMJd0Er8vLZQAg0zOqKlnGKkm5YAO8rboaPoqS522UImJjqEJChpK8sYmxsAPpzWhP7PjeOe5sfNGpIyGS/JM3PNaBZu6MpFHQ2kU8WhITFf/tU+Yw== 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=GSC0X32ulN1J7p0De4OO3fyDqXhsAP5Tt5m33jiJFhA=; b=QMFJk1B0Bb8yXxonc8dTrJg6TvrbOpjHVWJvKfBkQ3reYnR8i268cSwyFtLjIa9K1hP0LBjpW79Dx9DUUfZbSzK92i0mY0Z5PUpq8z3VSp7DPa00JqqKkcV1740U5TNsQ3VEqprdVypVGMS90YI7bXT/oFzV/xDjR7IE+X/mmLN3oJ99Y7eWsLiP0nknxj6jP7FjjMxHvomYz5ovAfNfM3FTiAJTJG22KnnzgNmJVGhi1PIEO/tVfP6CJOkOfkX9KRaE9vQ7uQdVI+i3JHtNXh6vgsOsIRuMK1x2HnDx/aDsLW8h6M/fHS84jX93WlJr0XnGqCc+W/pkHf3drwU6oQ== 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=GSC0X32ulN1J7p0De4OO3fyDqXhsAP5Tt5m33jiJFhA=; b=qV5E9LtyLJtrtE2HMTO7tOjcecBxRyD9wqrB8JdDbkqX3UWAsRbT375i1RMAPt5DTYVk56g7/+WdiCINlGnVQtENNqXbL2L+aIXVZFOFQS1sEr4hiPJNNygj/xk8dlTwEHqx3GVvHnZV6ufTrQecfYoVqwFPcLNGMzs8UOBbJflpb1D3HD6u6+eC/Y2744tqGW+KhmIydZeyD4gdS4o97lQAn7+CPFQ6Q5ji3vtC57sYer0vypfjiwllnSD+jdamRPky0rUqT60cGmxaLu0Xj7brePyz2k8emeEpSxTJJLElgH9FWLz73nRllUQGBnlnqj9pF/D00HPfyc9w5GcVzw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sun, 9 Oct 2022 18:10:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 9 Oct 2022 18:10:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Oct 2022 20:10:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7lQS74UepsWmK4c//oyUKEnnoU1EP2OZpUD1BgS4ufI=] X-ClientProxiedBy: FR3P281CA0096.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221009181021.910809-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ca1ea0e-9650-42c5-7b95-08daaa218c3e X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFUyQcTYMNueVxpYLK7BZk7PLjROHZQF13T1AKIls+cRVZEjCRff9tn6BASoklu1d6JitSRcgRRQ4ibcPtM+agHu0HPLJqpxcy/vItm7zOaxKty3Xs3yBeJgsHb4ahNs2RvdqqdpNC6QdRnSoH6FuSxTSSCrjVrj/JjTapavrZoO8ngcaMyosHojSHbkl5a35eQmMN53u8UjK3vL0gEus1e4szJybaIo0hD7a/xVLTJ/2LSh/YEmIGidFZnU++b1oe2I5u3X8lwU0VpPqVVrhQUKlA6vjPVXNyyIC9QQbMtVE1Gd2owAshgD+XvtHi8paTooGEUSuwuB1CthBeqC2Y4dkqbECHPVe7RZu8GnCCs0NF+schy2+cyWzMrQdRJewCOVCLS4x9T1GDp/DlDES4vKNoReHh9IHfu4+6FYe7j4E6ipsKURm1fjAeuSkZQA9U2dggqDLhfvnT1EUam0W3qxRMPDRkfGII2RedL/E/f9NuNjM89P+nAimfXF616ob0GQ4amOI/J1CEk388ADqQu4X+eH4qXFjF/xe6wCd2X4tPsrVt9dYNzA1aCDNGKBPIBQYBlHpYNMLcf9aUyo/NFnvHeQcK8fqHcRbeTRkzDhDxAZ/bSPBNkChM1yIxicSASi6Xb1+7Yzp5pRt0U3/+mkoOl9DIccsY8onCuqvyFeqkmG0DN/txWFIUKyPd/jQ8g4ruxBVml9sn5LXOIQhruZ0b5Qp88exIp9tQQEYf5UgpDqTSwDWXVk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aP4V6OW+IC2RZ97jd8mU0ZRbvQb+jvoiIAlA+M9guuPIAoqX1OYIpOfbRHw/sPtA4kmlCU03L4aOk8w6zLqB4O5vJZxAZfucvDkyG7clJc2Wk/2dez0nS6/7+nnL8pWGC6scnYupV2Q7HzK8yyZ7yjFHf/RP314CR52tz1ip3qce4HBm6uUlYV/o/zQRFS/fD8F6FjYM6yWuKMntx+kj70soT+/aqI5mUd1soK76BD3K3bYfmkYxTy6DGyWIb8u0R+QR2A+RJj3U/WWakc5+FvmSBqUNzONOTfkSxvgBe3dsuKqCyVaFo7DcObM92FHrouQFYasPmuidxbpFNW+QaMMu4eRHtr4N3fH5dfaGiTi9g8kk+ahdLlCDZ8QwDLMHmVVvic4J53jV2KGq9pD74lexgxRwrSJ+K5sRnkbhLanWKx7uO9NTiUdCHewkqXHF4dRsV4ZUwdpiGeqoN7g09d2DB5oiDh85rU/VCpwDYaPdOv4zHbnWtroydgyYr9VdrKkMSPvvo6mr+MDC6UMc5oZnrjXaYdPaLHgGamNgSok6KaS+8sdKlV/niCXXSaV+2h9RMIRtatNe5u46oHyiico7vr4sTqedpJRknQpDVYweOX7AT3DaNS0dwOEWuX6nVZo3VkMDMlAxoSrrhk38rzQCEpsiin0OElz6Gb+DB7DMO7jT7/0HcsyhiQEd/oNs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uzeHjUUYXWzyrryu8LHS6o0/E8y2JLtgHveQSmTYXh+lo5bgzKWusXlhCgfbQBs4oeXwfvb/uktX556thq2XUv6dxcG/ZTtYBnDGO+P1Zk21JbTjgbhXYjARLNuMT2zR9oSkdl8VZLPQvWR0t5XKL8tOz1UEduOJRnFLdi4aZrWXachdWnRxJ3aosyOYA+qDtss24wu9m30szP6Z4bd8A78tPA+t3QnsLcdsvTkZb9nKOerkV85SCtuwgaow77kTFeOabzL20k/DMDWpsD6qpuy+/VqJtOgaBst7G7EyTx3jXGEtGel5hwTX5r5jgSskWQ/v33JRl+USWVQBbCWuBiEKcQRad14dc4fA2qf5VmFUY7A9Sn0J8ybsCZPuQBug+Zdtv+zc94VMdrqdKmLEqqOsO3n3eKBKhz7pzQZhKgiU7dmrb1ml/wb73A8xEGeGkKADQziinM9kricQzu3xwnfeQG505iws0Tx4YLXYsgzFzLh5UemdLGEd/PVawTx9VXrpmCC9ALXukZ6if9hSpyIOyBO0WYqDyRkf6wjWkdwq6ppjjYu37lBv9vH2Wr/G+kDGZE7GO72GHCWwhLFVRRSof0PY2WvF3+xltsFOBMc4FbMLNGY/P5JONaZ7m/6cbyjtc8JQKi8bNKAPoL/zOhgHeq2JQHdUuzVA2wOCXI7wq5iHfveKke4ZPotNJGZjVawtXmX1Cdb1/C7VQICLqsuvK10DWbGESkIqOghcKXAjL4C72CCBIqm3a2V2npMRtgboyqW0R2NDHonZQjhKPlrhPMXLSkRR3XGchRPPcAZ3M7/tJ0CYi+4IEI23Vz7gJC7VmZ58bRZoLlZ2AY3hKvj6XLga+/vsimGbVarTxBPv+I5oSZblkF9S6eGywXv2/dJFsWqL09A6tHkp7dXks8C6sAaD/B6jL0Wyt4VmLhhXi1mFTVanrb/QnujW9umBXFjyne2hFav9YqqNNRajfgGKZOm/NscfIcy7UW492fWpPC7e5bRCnKnACDoqDWI5wZew3INZ1A69ksI8KLSkau3R5wm3AliLknj4mFaZ5ETuB/MYOX7xW1QRQj4p1TO1NyDuIdAvcvpYNrLrFn44o4yhIFCxj+u7og+c6LiRA/430/cezJiUy3P6r/3bOsiGBXRjyHHJuxgn1MlWVucrTuWry0jS1gGzXg8MX+IlndOPP4Vi0eWd1vRE5Gi4URKSrShi9P1bVJTTpzNZjHCms/bhZdKDlDVXpI5AeWACFKnQIRJxHO940CIcDVbNmKrT5t9sKunTLTZCI4R8zlB2mteItewjieoKA+nvuQyQYOE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca1ea0e-9650-42c5-7b95-08daaa218c3e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2022 18:10:29.1768 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH 8/8] configure: Add (dnxhd|snow)_encoder->videodsp 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: APf4PgBnOLKw These encoders currently rely on an implicit dependency via mpegvideo. Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ad960452d0..b16a46cab8 100755 --- a/configure +++ b/configure @@ -2811,7 +2811,7 @@ dca_encoder_select="mdct" dds_decoder_select="texturedsp" dirac_decoder_select="dirac_parse dwt golomb videodsp mpegvideoenc" dnxhd_decoder_select="blockdsp idctdsp" -dnxhd_encoder_select="blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" +dnxhd_encoder_select="blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp videodsp" dolby_e_decoder_select="mdct" dvvideo_decoder_select="dvprofile idctdsp" dvvideo_encoder_select="dvprofile fdctdsp me_cmp pixblockdsp" @@ -2947,7 +2947,7 @@ shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" -snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder" +snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb rangecoder" From patchwork Mon Oct 10 03:12:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165570pzb; Sun, 9 Oct 2022 20:13:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5D0WBMI56SoTiio5LTuSM2c6YAeUGRgrC7Bi/7mr8YYxMmxtASAdoz1/KgbOmuilo3ASX0 X-Received: by 2002:a05:6402:1a42:b0:458:b430:7e70 with SMTP id bf2-20020a0564021a4200b00458b4307e70mr16109218edb.293.1665371602175; Sun, 09 Oct 2022 20:13:22 -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 hb20-20020a170907161400b00782befcd0e4si10309460ejc.29.2022.10.09.20.13.21; Sun, 09 Oct 2022 20:13:22 -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="WguL/llX"; 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 C0CD368BB3E; Mon, 10 Oct 2022 06:13:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2082.outbound.protection.outlook.com [40.92.91.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C790F68BBB5 for ; Mon, 10 Oct 2022 06:13:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EbP+Wqri3UmsntusR1MuHxhOlUAbZqKFiMzMLtPg0Q0XGqLfPqxFnnultpBn9QILAmAxwx8nCeOqCEC2NwVRC8hxHFvWXh93LT9NwsXXXoHBIQ0Gmp7D1qMxmsgbN7OKBnMqr5DGYeAhgQbd+nkM8XU4RNHESP+malgdspL+GbgRrlHGRovb+orqHgBQeY4CjjhJ4+VwBNi0tEkHX4d0LmBflyhefJ7OuOIl6xgvR1UFai6+mKkv2GqsMNGdxnYY+85ppfFwB79ehS0E30EQds7wjGv62pQ15hcU6qt6+Oowb5pQNMLDk5P15jmc45+50HaIL95oumBv8mCCaL+u6Q== 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=Ymke1Oq3zE6LJNMldt41x+fuf+iBjmJx1ADhA2mpJWQ=; b=RB4LkuxFH7E4WK5BOwNMMh2FH/+oWCzXKt6LT0ZTj8CZMrc/FUxvYRfyMcCTPw0HM9MaMsLBK97iX/0eb34vzyILY3KhiH3h0TI8EKFBZZb8GCrTOj2l3nNBiccwTnMVPVMR3PDMmsdGH+ZP7LyUptkPqVRik2XsTVCZeG/IdO+fVVHO73MIlb5pHgCAAgGoxa9lEYySv+XRjhyfXhbJEsvZCZ4vJxlPQUH/dllrVyAmhZGG9KlVHqkb0SRMqR5e6PDmB+reqrn0KJX9lqQ6lRfAcCguLwS6Hn4Nm0PfY9l7BPRl8BH5+y2UqUDWoZLWDkCchc+ajTTl5NDEQBYIrQ== 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=Ymke1Oq3zE6LJNMldt41x+fuf+iBjmJx1ADhA2mpJWQ=; b=WguL/llX7hSjKbEkyqEWPXHFlAW6a3zYkNVlidwpkC/6NBePIh0j9YZR3nM8ITvlhmejvbdWH2+m66Ai0VqI4YwVbhdDx/d4bgCuAOaxXenjCsC61rFKow90KN715ziqKdmbP0H1UEbF5qq6Is0c8ck98FyK7VfHT8GnlisLOr83B0zDS1bTxa+bp+GWPTpwPJ05jHuekCiT8J2102W2gNy4XYzvdDEYUfwhW8K15anHrlh4TLlG9pYV1BItGGkH3nMyQAxaWNz02OaFVEqNyQV/rQhfN4eSIeL7iBgQV5zV7u71WJV8DqDGFNxtHyE5sI3j1JAlGrRoy30PWVrjdw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:12:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Y4Yg6yx99Jf4X89SyE+HZZX1j3qWLQu7+TWw07sxKoo=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: d10e6180-7575-4e60-a8d7-08daaa6d5bdb X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+69AHyIJ13UIh/zNe/C6JTCoGPms3OGRv0c9BHYQi3WhjjSlvdsHxesDdwIp6rDm3nsWB4cUL0ucyCPXJ2GurIlxNRTlriso71xI9KeSNcqnfVylOmhpP/OIvTEtXtNpDVjR+MdfoAH7W7LFh0g4IqYqi74GpIunqpFppRYlaNwPW+CsehItxhrlTV8r3PU4GF5Ya+rJPDjNRcQnwfuzxRNo75w2EUsRqKzhkQ+Ge/TUDYWiDn/E36GjWc7gTr+NlPDmmRAlsIzuCGOfMlO97a5FrTcLqXCFKo88eXmfnHSnGUuXLprIruVC6HT7ShrAS7X7r/7fliIVR5D7zqksdZiRt1yRm32BCpXrZlBcE9/uvoh//Psz9uThiHLZvObUfye9cApFUIt4JN3zgmPpmQ7vjzQ0Sfs1aOM1NLvZrn4Wfez+2k2vpZu2fV40P36ogT6hTJt+0BgXp/1qFE9J5IYm07qzT1yd+OmUa2Fda2ljtYa6JLi0drRCHMaXjYKXEU4ewXB84XJvxObeH6nB/exMrkaeme2gGvmNkMMNaWj8+yHpGczChAxKTp8elCMvLvQDIWnz5qQLontmUMo9lX5IRpcKaBHpUIT9ut5rOeYBGHipWIwRbH5YBSNePXNQM8sqaULLnu/4Zbtr1pCNNCCZZ5RssA0rljN4qX1c1u7H5SXqTtu9Yh52EazVJo7Wulzuak1dJBq3bNijoPxQ7jQMyNQmYcG7v7MqlXC0JZFMlfnXNXWX7Fif7G3mraKJw X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j0cKPoPpb9xAFjB8S7AJEbRTYUTDZ7K6SMPU5BgsxMhpiV6C8ClTrtHeZ16ovDd6M7essfy0xzWt7urBo27nlLOePqmiBTjd6URVj0GrQA1QQs93JbEk8ZvPQ84Ml8EzvUTt/2v1869JC+Cs6uaLqo+DmRTghVS3HmtXrng/J7NBAWZg0i0iP9snlJvq8fEBk/UohIxJWNbAR2nl0GpRjmEtRSQJEQ89TyoQoLob257qYgHnmBujRNI7eERZNWEdx/AVKvdGi9Wy7gxoUaCv2Mnityu3vYW4uvPv4xbPaU3+9lVXn7/C/NvteuFq+iWuD5KFXvM18SqxVwqOvZ77Y6GTouMOsNLOGZJioMk+vG9YlEBjDLpB6tYTNXcH3MwAOnVuMkV1B84Ro6mvS6RGeGJxMsGyk9nsR+Eg492LnP8W/tiHFvUeGLN/S40giF4ZrusKIbi0VFm9nkHrzbW07k+BGUXpiZ8Dp4s2e8Z1OQgsEvbEN4c/BbeNmWRjFFGKrU5Km3E3kJ3oNJKrAPsu5X9I3UIUZmaoHZb2rNSDLMRqvfMSqfdqebU90YuGOHqKdFfj1wgRfuwTX4LWDFOFxhW6X4jJchLbvIKZ8lCz8WWYtm7V67WvkFIjw1MdawfL3UFD7dQmyyZ7na76MwTV2mp3Pt+I0mmIQ7ZbsHJPjxhQEkZSOI2MWL3hf5eUzJCx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Trk40H3V+ENiD8GPMJCiRtXwzuxl9jnHFFeLc8j5Q0j2krHZZYrEv4T+XfrFHrCnv3DTYzqbywj2DnUasKW3hjxHjLfKJUkyu1Ux6snEgclBiZHLx4ZfkQwZxC85WaceLY0hvu8ysm41VOdO5jRruSNgGbZRl23RomE9yr9u9fQN9pqS8+avDYbLTHW79gamD2n3wMEG6AhSeFkkGZSDKQythBYMnITLKyYUNoKUyOQbz4iHm2tdtS249rsK6egaJeM1HR6B/69VNiKfCOlOb2IWLPWfKFkvd25bPn9lRHzq28UqXLjDOyyTwavwFPESIL06dcIBEhH1/8S41HPpx/n2hcVaIW+XVTCLcjmYj///WyZpwDzPs4zYSwSuOLYR900p7vUmIrNfUsfcc9qq9PLMitaHuOqt4Mluqfrltw8sOi44lh1COtQHVo51VScQBzo/iUJVg+1OGrKr8AxY73riQaQaJqAp0jb1UU/tQJ8euROv/VqtayO+v80uSdHKzqpFEbzpB6ZVrUi1XJUjTDsQBJf/bh/9Zrl/VGHdvzWCctzhfk1qNVbkm3/afGXW/g+oZ0ZdmUw7yNj3a2Xe408v6uVasjqo0e7CDlUQt3tp9z5kx3NKJiS+cApmwhxpKAdDsNaMpJmBHlirde+RivgduNznEuYrw8u3WLhwDQ0hXt8PIHzQk5mWn/0WJZwWdnoYD4PGJDCzICsAfAIT4em0VhMHNmUFt5G1+78dWjzzkLgwnOEg8ighUX0Hw/wE/crRomnj1KGD3cw13Qxrcc3cm+HpfJwT4KGIaoPzMqe0Jnxj1XOkPKFEwCWB8cI7GlN3JW5HSj6CvsmivWIQ5aWNn8//XBbPUXsMYZWdkDrIVQum6WLJHerXrhqg60D/+fZ5VJRHk0ImRETNRCvFxCNy+ojxAeXo3LmA2f2XLkTPg15AhL1wBBmvto4r+durwKLxkyWleXLy+/nkxIsOS2Tdp0+7w+rp5CKhGbpPVm/yMJUSjASG+AWq29Z6gWcDy2512fjbEE1N7fxMLdsSl3mPGi3Z52Ooea4H0nc5rzIs87AY4TZwtDyEGC6XpixofwlmYbqIPVWBADJOaVKpWZen7Tlzpa2jbK++IdE1fDQz8apgI/Rzfoem5+58ekbjVjZ8wRKCU27OjkTMYKUq44jZBLTiPAhqrh5qek3PaA4EvF7dzekqu+wDIy1HagiovPzHB66GINqsd/ZNFKaT+rlQgefJjUYhR0s6hSOrPLCaI0Cxf74pAQytJZLac+k9To9OdCKR95V7OZeus4T4JNRX0OaYFQXCUUq7FMhWGV2p+zi3rb4MP1bQP0RGO1FL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d10e6180-7575-4e60-a8d7-08daaa6d5bdb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:09.7656 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 09/20] avcodec/snow: Move initializing MotionEstContext to snowenc.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YTxAOFJGoFVK Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/snow.c | 2 -- libavcodec/snowenc.c | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b16a46cab8..f3fd91f592 100755 --- a/configure +++ b/configure @@ -2946,7 +2946,7 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" -snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" +snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index aa15fccc42..cde09902c3 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -23,7 +23,6 @@ #include "avcodec.h" #include "decode.h" #include "encode.h" -#include "me_cmp.h" #include "snow_dwt.h" #include "snow.h" #include "snowdata.h" @@ -434,7 +433,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe s->spatial_decomposition_count = 1; - ff_me_cmp_init(&s->mecc, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index c5ff50639e..ea0d4fc27f 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "me_cmp.h" #include "packet_internal.h" #include "snow_dwt.h" #include "snow.h" @@ -66,6 +67,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx); ff_snow_alloc_blocks(s); From patchwork Mon Oct 10 03:13:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165620pzb; Sun, 9 Oct 2022 20:13:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cLCR2+iXISogbbPHG0KATY8AE/0SS/KhzLC63q1CnF+46sTZ0xdbwY3DcRm+IxIRx4ww6 X-Received: by 2002:a05:6402:5406:b0:452:1560:f9d4 with SMTP id ev6-20020a056402540600b004521560f9d4mr16027522edb.333.1665371617151; Sun, 09 Oct 2022 20:13: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 b19-20020a056402279300b0045c24cb5bfdsi1557905ede.321.2022.10.09.20.13.36; Sun, 09 Oct 2022 20:13: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=acSl2+5I; 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 E8CB668BC6F; Mon, 10 Oct 2022 06:13:34 +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-oln040092073059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AE8A68BC60 for ; Mon, 10 Oct 2022 06:13:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q8x2dZ/njRSyZS3R6PpEABmpTkXdVsAAqr002Y+ObaFprfIDaYFOLvDNVZN2TkAn4TfRcRQ2slbrLdVFxWz+Bqd91+uQlujLHFAukqkp3QqmUVVlSw14Swt6PQhtka5eHd/OtXtsMdzS9v10xsNb8yughFgksZ+HMTzCAijgVrNnj1NzYMvX8M5Ip113gWja88e+eEMof/NhXeLZXKZ+SpZ2j4xzZXQ0H/f7QyEER65R623MZMygnGFm2zQ8esKcFv0avI3vtBBmytuCy1sERhh/2aFtZlydg0n4172Rp597GNxQ1zcbNJhABEkWKzbSE3iPABJW1BdfzYUAS6q0jg== 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=OGGRhGhrIWznDqHmt4gPwSc6GvPs25x8VVqOtOocwWk=; b=cZHgeVjdm65A8P+WRoN2gR5XJYK6qAeKId63h6xf+zhEwcCo08/HP+zspQTv2cuwiMRBop83e4cfZilhcTuhp6McpiacasYcudCr56iFknJkA+WrvWVehARMcx+G/ObThYv2BSVaXll//zVP6vzK2N8dQM86COpNRgJFKuJtlod0dr/dQaUbrmVHy1Ieq6SCROQLbO9zb0exY3P7HTxjX2MEucgnsZrcbHR5lTUzyzpUwF5hOVl1WOvDl6Fxq+ErippXltTGc5XvRqqxJ5HI0OIsK8QzKIi6dEJ59xbUrFD+NbZELChoOPJ4+03+7chizQKDI8GivJRjoyFwzU2swQ== 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=OGGRhGhrIWznDqHmt4gPwSc6GvPs25x8VVqOtOocwWk=; b=acSl2+5ImiTetgoNgRTwTKg0gl5+ql1O60pyc5h2hkovTPc7VGnq+B6l2t9UccYliAxcCDDWKppU2ATgipqovlNseoRPJ3GPBidZL36sOaSKKdk3NN13vEUp7VVdKnIIcBkiKCpIlVtMHPJJCLXDb64/kaC2Vk+oVlin/KojTU4BjWbiC5gb+0Jzfl/Cp52yx+13g5XlyS/a63KKPrFNmxjGON0ee1oyE2njRIOkyly0UanbscIBgQ8vrYpCXTJwCxLSbL2+lunBMSwFZzjkuD/eNaQUROlHU5o0htwWk23Jbr94QzL9+o/O7kTmuc2Ju165KmNm2oCk+YLdX7pg8g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WKJs+2A1mGGhXhSWICALf2v+kZ85VOyGBDQjslrq4EE=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: e91447cc-4da8-47b5-c454-08daaa6d6607 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+m8duj3Q1+4nZUGN/uADSV5cigqAsRHgXQaNeEw9auqybLXubfq7Xgpn7/dDsNlPys0TcCwojdn6F+9FcI5qbSy9AdFw+KvQ9SbEmKX/aa4BfVZSMVf7/wrpQPqDRru6erDKd4cta9rkCjgTE9iXSolkgGlqziaxiw/tCLcHhxa3+oU/N6PRW91v87/ScPttNg1tFw1uMlibNJRQURMazCpfSZe2taq8dCRj6VEyY3WNGS1Zx/UaZ18V//YT98M/Rz3au8QI3FjxdQiDL/G8PyMDmcbctZZRoBkqm3N+M9NtX0IHRfLip5HuLAK43Rbz06AbkeEpBCHDhwFN504cgquONqUZ0v5IoFeRBgC443S4PgaID1o7hDEerPulCLzTCkLCBzaKGXTy9MtyuTPmw0aEnxDr4suDowMRfYnLLkqMZrIZafcQsdWwUcfVzQ8VsZCJgTy+LhpOlCDEDz6EET40u8V9XzYdGi6t6nLlHeNPc9XfWLOBytTAZuwQm/XGl6jqSxqLzw/7/qO/T62cQHA+45mRkoyh6NRa2ogWK5iL95Kvpn3qnsNieLmr6XTQgPcspsT32OBWgzEGqbkgWfV67W6y0c00iwdn/4kCIfPn8w6pyStr2MN4+MDYf1WJ5RGb39cjvwhiDmWQVOZ8MXSnAsnupXtZ5V9eOvD3SIbedqEfn+gwlvYHJ00DHMMTlQBIRll9DplIwqg1V9JOU9hZjB80Ts8LLrLvevNtzchiXaw5825gfhTXJBY+txvyp X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kw3M6z04KWZNvo+7BFuF/Bc0Nm5Fk6Y4SI5c+U1eXZ9ehVGYxNJgjiKxXG1ra/UjQ4Wbz8riklXxH237DYlePk5arN7E4wZxhIR4i04TNG5MggT6Krpz/QtMGn4rYj6ULGWBJlIRIYp9NxGK8NJraxsqyS5Q/9645OJthTJhfTN/nO+Sv0MhYzYDxKDO+MUo2Us9h3aro3DQqBJnsQfG3u9hj0Se3vgIUcl7AwKoCsBqGLtyRf2WucqHT05bVvcVYe5ikYqEtrj07OSHPLshVAyxXL/fS91dnrf6KZXz3/tOL/wQlNb4JJIR9cgfjaYWbPSXQoMHHIym34TyhggV9OWzzGGn3AxjrUg1Pi8AjTFnLUlVrNiK6R1W90SoM+5+szRwsN7karDpQhYCFVuxlk7E/sFEJ0WV+CV7Tcb7JV/r4nBJ/2MgL0K0CS6YpRI5UJ/T1NL2LFZUzomxDPRaO79m/r56Gl0o9UfaruChotQx+q1LxkaJiikRCbGrp5xjC5LIcTIFRuDrsPgq6Qx7ioBW4Cdc2jDMjaquUzGxU/Chjwa3l/gJeaHrOomL5fJGifGM1/3An5L4V63lcdyIvAJ5sv0e4UJsWIWvZsbHTYkbL8qvYbbQxLdiGjrTi1UMliuUwbvBlRJZJt6gnOPK6yZoU6WY5DzgIXKqRmSGq1GjJibe4eab46ToGO6MQHFJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ep1/h8ngj7as0GUTD3/00ELz8TEV89lm+6Glp7+yD61GQ4dAsLYWuoLp1ckll/BOnQbjcdAFAKY4u3xeuOBSYGn7yvdwjrGyQr2VbIZWf3ZzPe0LidjnyYqK9aEuHNoYC/sSIfBgd/YPoMDjgNr0shZqt/qx9ly6JhfY10maFKWqHxob5Rfl8diAflZBcpeQSQHp1G3WNhU79rVultGtLAGa7PQ4JEPs/c90NIxr0SZi9F89IabHRinmCPa1py+E08ZN4/bNQpSgnFM9SeW105yj0ZVMB+oH04ZqKt8wBeBOCTPEkpyz3BomSphcoqLMlxi5W3IIPSex2le8QUFZOAVRHjTIlWfhtRYsKcYvCKLgDtzExKc/wtJLGIQQ8Mrl0u73ORC0yqUIMgmN6jePkd4Pn8VWNLtLM7qEQGw8cGEPvrOBlPbG9DSeVf8fwyx+V49vkvVHnDjRVzjdqBCRO/DhsjGNZ5nj3KGNnAZLdfeD452ZujwqnIH/SXGee6HstOXYkAHeI9cVLiso6JiTkXnrxloX8Kjub9dw0StnIlSfjqEcbAi2ajN8BhJ6Lv7yoI+NKVzw5x3GeSpfsP54/xu5RHqa/tPG6GIg+pd55e0ibRaWoWFRWRvJ7nN/EOo4t6tSEpGc/xrD7kca8i+J3cgL2ElqV3hVUbbH+Yos5tcichNa0jVL2NkT9WMH5/ULVahwqoQy3ssPZW7SI8oi3AthXg6T005B/OT9P8w9J8V2YnY+57kDUz4evTFNiuGOCm+aNRMq/OwIYoR6Y2PSTnv7Hrjx5AQx0uVkUO0wQc17TxjB1LA1CgCvT/VarLjpSoCQ4gg9JoHrrU4ocZCZCsPfLxbfTqe4IEExOn2in5U8ayGdlnFeWP+/C1rYTD0JMzQQW2/3jRM0/cWlfkI9C4r/Gyk/0eLdPaAs/M9zIAAlkLgoSYmIKkIfpSuagXZwZaDBrOQx3DdbpkVPFvMjF9unO7QzKztqfX3y0oHQxLpXQHWJYKv3yIQH1U/UuhozR7+PX8U0yAzkDDi/UkgGikKRBRqWpUUxff5aOrLYiz6Rfa7aXfjqCFdOvxlVuzy70wKLMS5Yb9YGVu86Ouxpp3TY00ReFTuRnZiZ56WTcvimrN21F+fA+Ao4ziunKs4tK54Ln2joEdU9/RWeSqjZShNLEiTMvs+bGCWry1gkPOFcLppXgn+oUmTLKtgMAKb8vPYb32n8uwQEgdBqAs5GIHYPYqgUxjCmqNZRhQgCCZntxtN9wE8a5k20EwII30tQhsj+2vHcq/n8G66UFGj6AK2my+Rzid4/O623y9kyHQLIpZzH0EaJnqVr0Drwr37 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e91447cc-4da8-47b5-c454-08daaa6d6607 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:26.8006 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 10/20] avcodec/snow: Move initializing QpelDSPContext to snowenc.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AmR6ATRMnmP4 Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 25 ------------------------- libavcodec/snowenc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index cde09902c3..c9bc4dbab9 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -438,31 +438,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); -#define mcf(dx,dy)\ - s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ - s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; - - mcf( 0, 0) - mcf( 4, 0) - mcf( 8, 0) - mcf(12, 0) - mcf( 0, 4) - mcf( 4, 4) - mcf( 8, 4) - mcf(12, 4) - mcf( 0, 8) - mcf( 4, 8) - mcf( 8, 8) - mcf(12, 8) - mcf( 0,12) - mcf( 4,12) - mcf( 8,12) - mcf(12,12) - #define mcfh(dx,dy)\ s->hdsp.put_pixels_tab [0][dy/4+dx/8]=\ s->hdsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ea0d4fc27f..929edc1340 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -67,6 +67,32 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + +#define mcf(dx,dy)\ + s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ + s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; + + mcf( 0, 0) + mcf( 4, 0) + mcf( 8, 0) + mcf(12, 0) + mcf( 0, 4) + mcf( 4, 4) + mcf( 8, 4) + mcf(12, 4) + mcf( 0, 8) + mcf( 4, 8) + mcf( 8, 8) + mcf(12, 8) + mcf( 0,12) + mcf( 4,12) + mcf( 8,12) + mcf(12,12) + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx); From patchwork Mon Oct 10 03:13:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38641 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165659pzb; Sun, 9 Oct 2022 20:13:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5apXxtUgeGFpY0EajOWjA2Crip17mbGc6MU0jMlVvnMMRCTrxcvyNVSzC2KnAN/RKLvZIo X-Received: by 2002:a17:906:8251:b0:781:8016:2dc9 with SMTP id f17-20020a170906825100b0078180162dc9mr13270908ejx.488.1665371625671; Sun, 09 Oct 2022 20:13: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 i13-20020a05640242cd00b00458d43beac7si11442287edc.41.2022.10.09.20.13.45; Sun, 09 Oct 2022 20:13: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=nl3EsRZR; 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 ED60D68BC95; Mon, 10 Oct 2022 06:13:39 +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-oln040092073059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF3C768BC85 for ; Mon, 10 Oct 2022 06:13:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QtENwrzJqGPgWyT21YuF2zhtUQ4Ykj1pQUV698Sg5G89gtdXYt0nxoAjWfSbz0UMGCCGz6vo/YowcZgEi4BjeFmAjH3vG/oHByu1svNG4Vqg4ZijNU5w6123KunfYhfCAEg2yj2HMfjAk4GkCCtC3LCERncU69f/qQMwH3+MicnEId0WtApX+sp5y0Yrhk7UCMtT+glwpTnyf4BxRnKMNG6WLI/iRwP1PAQ5yPDHZazSm96YgrybhLeStDIiXLRsYnGuVLN7MYq/rk+vxhlfspQ4HGm+Q37wonwOZLa6qVcJx9+ZVOFmrfdvQEL3MvMyd3U8lion4DUFNZGLmxDWLQ== 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=wSjjlaaU2+r9fbJ4kppe57c0k0xdiWPluDDpTqY/dOM=; b=YYsVrUmyxQc8h0J3tTyVVwCUxZQS2QtEz4vy2O3T626SM87chmfvBBi2KN7gY54PanVZcUAdy3yY+f2yupFTk3W7EJUsxehkJ1UcHD84O+4EoVRfkMJ+49UaxlUWHVuIMpkQRpInCcSoHT/bJ3oYuaSIrLJ5ZPW6JxZgq12IyuchbrfLRD/FmnbsM5Gb2ODqpiaPnReZNi4LRY2Z0BoUW8lkZXeW/c590+trgqZlmv2mmKao4kq3Bb9fGcSptWjy01LvFnyqyM8sBCqIX5Z08H7+XfZv0rUnlzfJjNh/6rymIbigOw7Iqi/aWZsVHZpPFiX9ppbZEPMvFnHW1d1qnA== 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=wSjjlaaU2+r9fbJ4kppe57c0k0xdiWPluDDpTqY/dOM=; b=nl3EsRZRoKm9tlC0kQtyItI5zqGKJQ3CK0e0xyZoWIzwWBlPlLyShi9QpjhdWZpHevi7SQmp5e/42OqKZFzV79yVpT5AuKdcW0xJ3jlR6dZ2O0uI6uYVSMxXJRFu6jdFLCc5pQRA1XHYTIU1fSvGIoO8GGAqXbAQbPcuEnKc/nikNFUEmeKWkYrn6rm/GMK++kTrMWq74hFRYx/K3t0j40DcX5MEKVzCh7HU/c8tjr2f5UnDcuHmEELn+EzaD5K8Zo3QdWiFA11md181NrO/1PYBG3LOdmO8bPZNzjTyhf7ivIBxfBKBJPdKpdvrUPcXD0FXLNMy2w7rRH41JRL61w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [MxHEvKPV++BNSxkys34Z9BQbmuvq+7BGjCnZxQq9Yjo=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: b2abfa0d-56ff-4af1-9af8-08daaa6d66ea X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHRq/PX6X+eaa2c5j2FUnsSI/Ss/p1w/iOpaWK3F1bjii4TuQYrxeIn/HOcZ9GmSRcVfiRAyC9Ny4UtysaFW0jZqS2C6cgvNyfzxD7WnTWM32pBaa3yXmvdWdOvM/lnXzFuk3MQMirlcxmUN/2rUZJvtiF6LjLyCoJpGLO0JnU4rLYygMyuwMKuBMbHsQSgeXoenNaSzbR7FbhPJzmlHlmd+9tg3Wus9mUluVw4uEAXvPLgmSyzb9Neirl26aScevOoGOayPNtJXoWl7U8dezW9GyqynQFZq8LP1CgoFl0xZp0oHGGKZZ9czGw9cgundTvmCwgOcgm2YtZS8yWORtCtSjfx5gkY5wr3XCkEEUjJBKasIE7eSVPBY9Q/7qjRJHlzWoa6jiFqQ/UJKi3+gdoa2d8LyQmXdp1ORP3Y7FAqUFG8wuVVexzFTeXFlmsti0v+uMSSTD0OR/M42piRCcvFDqlGjcF7bjCf7pgpDNupuzQY1jDdDG/hVGjgM4qsn/k6HuRQX0RnayNUtfaLnIs2Lx6h9EKH0PATPyw0CUs049/WOZZwPsKF+KFwrlTSA5w2w4pI1RwLpTr8b/gagqKV1E3OOUW6VpQo2VStNC3YJ+1wWrTREz1hZ6Nx1TH601jovx7DUjj+gMQeJP5USKyxrmI2xSRWIVm+eELkfCP/7aomBbqSvr2I7rLzIYf3OuTdKPCZbV4J1UJBncBrrrYPYCFP4O4rhejTVWpptHm3Zk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dTdEtxr2K6bEB6euiNp+VyO17YQvtdLND7lUWZpIa14y+KVyFDpvd6bFXHgNMKwM/7DXyiL4/GYnm4vun5cXtDghfTxFbsSWsx3jESDxOHkNGUP7IzL3WQ3HryiqSvNkvoqG2tfK6TTbBntsrMTrkLA/C5C+54yRbVtXmVUQEm5prSgjMBTHqntCZ9cnVWNf8C3MPMeFYAcRRui57Cy6WxjIBVi0pX1qkajKVP3ST0nbCUj5kSkZw8Vdf87bgoNNTAA1tz/EPEEI0Rg6KvDJdpvTmeJV0SA1jyYlZQ7+zhB0l7TtxfxDcYw5T0L6oZazOL2bAveh4D0bZH+GgyJBV+AbExxBgvQIoO+Gfh7x2X9aClsrJckLUWJNLe1HCOG6rF1WLY+CAkw6Hh6AR1R59UTPDsRDwiIkWmLrLTQHja5GASy3PtCKPe5nk62VAMBnflxnuWhWnJh74JxJCuwhcmwz339lvmT+m2tjndg4rJ0XWwgN3n7xqlMjOjnB0R34o5EkMa5NdFTOFWPCAWwrQj3auyiOCxy6BBCwrtgBZ7kNLtIK1siuOqzgHhlQP+y2mzft9EOLyktmjYALHW/baI5rQpoPhFFUq0AdBb1R9HQypQnCObt1gzDNCcdeIplAGEmnipqIsxXmChUheojrK9nc39d2mE7bDHVm3KvymXfZ+oP2t30i6/1ejw9ykZGQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F/TVr65BKDeBz3j9XtGoB41BZgnNjhiL50vZvxmJMb9nx8AZU4Q7V+PsxA8jg6GI7Wva+gFgDnIfTtbR+PRQ2QcwqOx7BNu7a4b3Sr65mkf1YiAERnkSxauCEEyUfxOAjhLlzxStBpUi4v73sNNRJRiZP4zC5XGETYH59wAZkTYJ7Mm2ZhCevjH0RfAI2rwoGEnh5/hR0yzmernyCmHC/VUY/mgKX5W6R2M2ZvgBIVWyNNyXn+eYTcctnYb63Yr17SL1YI9god7PEc/khCvJCfUGv7V74h+odJJI2CkqmfbuwhX++1jUPZwfnUxm5P2F3fPJ3S5o9E+X+PPSrfZtQ6g6OVHtV9nchkD5QPjSE3MgOReLy96dr3ezCrEizZ89XqtuCHZBfIL6BO67tQeMSELjgBDJPO2Nbf8HRyz4tgrtGTUQRwHPM0QCv2Qte0XmnVURf1zIf1ylGQMp9dyGhrMtQlTKrMvit2Az9S2o+rD/LbqJwhTHmzDGHfqYAUiNzsqvotNK4aKHC8RIfRikYIbtul/ktC9cV8zLPO+zXSQJe2mctWAuRAqlW/c6XuQhdOh2+q0YA/A7ycZdHJPynT31qYNcOv3fpZ92U+jVo9l4SN4pOAsA1T6ial9OE84sGD0aGNohG0v5uT26FJiEJwMrw4KljmY63hRwDfOCgZs7bq5PCvcZiwYE458WSZztkMlr7cmxhEyRJVG16rH881hv8HSKJ3RlLkSzxsNck5ekXKpUeqCS4Go1JM2xszqiXhM8qkQY5Wrk0YlESDgnyItipk9jPFrSkCjCLna/NXHuWCNZ+MFkURxQJLSILUfFA5o9OUgaaWHUUdxdOZT1gIrryq3wB3XSAOhJ9KWTCeSpT6QRs8npKbxRq5MmRe7lWNkwSRl9S48WUTapyp7xsNrYCFJbOkxD9a7oLgTz74+gHZQYKE24eFTbM/3knD7/zhvVJqBA3LYUpERX/e94TwPhDaa+7pg2M1E5j2u2lynkPTDqNlIBsPwZcyyH3j5oF0dyYVFUT1Q6HB7dCmpV12bRv0LMIXr+JmMjJmDl7GVw6vUD0rQXrpi/cqr/SUSqaDZGeihK6jltc2XuFcqW9e9zbqKCoLd3D6w+1WrfUalNu6ABkY86JfvqjanbVvTbzQprokJt0nYcTLF3Ov2uAiKOLQfCjI0aVSh8Tu+nQeYdHYj0Hbhsu3wBk9llAORbl7iFq9a0sGKYwKs3HdCS8zTCtQdjTJbXGOxXn2Ba9eYxr9vym+c9okmPmu7uRl75UI+5LJ7hCICPLu4Mvsq03ovP3yMMBx6LMUmrIq6xcXF90plILfqMMAvUigUDA0KN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2abfa0d-56ff-4af1-9af8-08daaa6d66ea X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:28.3498 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 11/20] avcodec/snow: Move decoder/encoder-only inline funcs to snow(dec|enc).c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bDYz/YRFM5CK Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.h | 219 ------------------------------------------- libavcodec/snowdec.c | 147 +++++++++++++++++++++++++++++ libavcodec/snowenc.c | 64 +++++++++++++ 3 files changed, 211 insertions(+), 219 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index ed0f9abb42..8da3d99885 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -486,227 +486,8 @@ static inline void set_blocks(SnowContext *s, int level, int x, int y, int l, in } } -static inline void init_ref(MotionEstContext *c, const uint8_t *const src[3], uint8_t *const ref[3], uint8_t *const ref2[3], int x, int y, int ref_index){ - SnowContext *s = c->avctx->priv_data; - const int offset[3]= { - y*c-> stride + x, - ((y*c->uvstride + x)>>s->chroma_h_shift), - ((y*c->uvstride + x)>>s->chroma_h_shift), - }; - int i; - for(i=0; i<3; i++){ - c->src[0][i]= src [i]; - c->ref[0][i]= ref [i] + offset[i]; - } - av_assert2(!ref_index); -} - - -/* bitstream functions */ - extern const int8_t ff_quant3bA[256]; #define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0 -static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ - int i; - - if(v){ - const int a= FFABS(v); - const int e= av_log2(a); - const int el= FFMIN(e, 10); - put_rac(c, state+0, 0); - - for(i=0; i=el; i--){ - put_rac(c, state+22+9, (a>>i)&1); //22..31 - } - for(; i>=0; i--){ - put_rac(c, state+22+i, (a>>i)&1); //22..31 - } - - if(is_signed) - put_rac(c, state+11 + el, v < 0); //11..21 - }else{ - put_rac(c, state+0, 1); - } -} - -static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ - if(get_rac(c, state+0)) - return 0; - else{ - int i, e; - unsigned a; - e= 0; - while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10 - e++; - if (e > 31) - return AVERROR_INVALIDDATA; - } - - a= 1; - for(i=e-1; i>=0; i--){ - a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31 - } - - e= -(is_signed && get_rac(c, state+11 + FFMIN(e,10))); //11..21 - return (a^e)-e; - } -} - -static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2){ - int i; - int r= log2>=0 ? 1<=0); - av_assert2(log2>=-4); - - while(v >= r){ - put_rac(c, state+4+log2, 1); - v -= r; - log2++; - if(log2>0) r+=r; - } - put_rac(c, state+4+log2, 0); - - for(i=log2-1; i>=0; i--){ - put_rac(c, state+31-i, (v>>i)&1); - } -} - -static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2){ - int i; - int r= log2>=0 ? 1<=-4); - - while(log2<28 && get_rac(c, state+4+log2)){ - v+= r; - log2++; - if(log2>0) r+=r; - } - - for(i=log2-1; i>=0; i--){ - v+= get_rac(c, state+31-i)<width; - const int h= b->height; - int x,y; - - int run, runs; - x_and_coeff *xc= b->x_coeff; - x_and_coeff *prev_xc= NULL; - x_and_coeff *prev2_xc= xc; - x_and_coeff *parent_xc= parent ? parent->x_coeff : NULL; - x_and_coeff *prev_parent_xc= parent_xc; - - runs= get_symbol2(&s->c, b->state[30], 0); - if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3); - else run= INT_MAX; - - for(y=0; yx == 0){ - rt= prev_xc->coeff; - } - for(x=0; xx <= x) - prev_xc++; - if(prev_xc->x == x + 1) - rt= prev_xc->coeff; - else - rt=0; - } - if(parent_xc){ - if(x>>1 > parent_xc->x){ - parent_xc++; - } - if(x>>1 == parent_xc->x){ - p= parent_xc->coeff; - } - } - if(/*ll|*/l|lt|t|rt|p){ - int context= av_log2(/*FFABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1)); - - v=get_rac(&s->c, &b->state[0][context]); - if(v){ - v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); - v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]); - if ((uint16_t)v != v) { - av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); - v = 1; - } - xc->x=x; - (xc++)->coeff= v; - } - }else{ - if(!run){ - if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3); - else run= INT_MAX; - v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); - v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]); - if ((uint16_t)v != v) { - av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); - v = 1; - } - - xc->x=x; - (xc++)->coeff= v; - }else{ - int max_run; - run--; - v=0; - av_assert2(run >= 0); - if(y) max_run= FFMIN(run, prev_xc->x - x - 2); - else max_run= FFMIN(run, w-x-1); - if(parent_xc) - max_run= FFMIN(max_run, 2*parent_xc->x - x - 1); - av_assert2(max_run >= 0 && max_run <= run); - - x+= max_run; - run-= max_run; - } - } - } - (xc++)->x= w+1; //end marker - prev_xc= prev2_xc; - prev2_xc= xc; - - if(parent_xc){ - if(y&1){ - while(parent_xc->x != parent->width+1) - parent_xc++; - parent_xc++; - prev_parent_xc= parent_xc; - }else{ - parent_xc= prev_parent_xc; - } - } - } - - (xc++)->x= w+1; //end marker -} - #endif /* AVCODEC_SNOW_H */ diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 5c95ffde11..3a835650a5 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -29,6 +29,153 @@ #include "rangecoder.h" #include "mathops.h" +static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed) +{ + if (get_rac(c, state + 0)) + return 0; + else { + int e; + unsigned a; + e = 0; + while (get_rac(c, state + 1 + FFMIN(e, 9))) { //1..10 + e++; + if (e > 31) + return AVERROR_INVALIDDATA; + } + + a = 1; + for (int i = e - 1; i >= 0; i--) + a += a + get_rac(c, state + 22 + FFMIN(i, 9)); //22..31 + + e = -(is_signed && get_rac(c, state + 11 + FFMIN(e, 10))); //11..21 + return (a ^ e) - e; + } +} + +static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2) +{ + int r = log2 >= 0 ? 1 << log2 : 1; + int v = 0; + + av_assert2(log2 >= -4); + + while (log2 < 28 && get_rac(c, state + 4 + log2)) { + v += r; + log2++; + if (log2 > 0) r += r; + } + + for (int i = log2 - 1; i >= 0; i--) + v += get_rac(c, state + 31 - i) << i; + + return v; +} + +static void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation) +{ + const int w = b->width; + const int h = b->height; + + int run, runs; + x_and_coeff *xc = b->x_coeff; + x_and_coeff *prev_xc = NULL; + x_and_coeff *prev2_xc = xc; + x_and_coeff *parent_xc = parent ? parent->x_coeff : NULL; + x_and_coeff *prev_parent_xc = parent_xc; + + runs = get_symbol2(&s->c, b->state[30], 0); + if (runs-- > 0) run = get_symbol2(&s->c, b->state[1], 3); + else run = INT_MAX; + + for (int y = 0; y < h; y++) { + int v = 0; + int lt = 0, t = 0, rt = 0; + + if (y && prev_xc->x == 0) + rt = prev_xc->coeff; + + for (int x = 0; x < w; x++) { + int p = 0; + const int l = v; + + lt= t; t= rt; + + if (y) { + if (prev_xc->x <= x) + prev_xc++; + if (prev_xc->x == x + 1) + rt = prev_xc->coeff; + else + rt = 0; + } + if (parent_xc) { + if (x>>1 > parent_xc->x) + parent_xc++; + if (x>>1 == parent_xc->x) + p = parent_xc->coeff; + } + if (/*ll|*/l|lt|t|rt|p) { + int context = av_log2(/*FFABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1)); + + v = get_rac(&s->c, &b->state[0][context]); + if (v) { + v = 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); + v += get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3 * ff_quant3bA[t&0xFF]]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } + xc->x = x; + (xc++)->coeff = v; + } + } else { + if (!run) { + if (runs-- > 0) run = get_symbol2(&s->c, b->state[1], 3); + else run = INT_MAX; + v = 2 * (get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); + v += get_rac(&s->c, &b->state[0][16 + 1 + 3]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } + + xc->x = x; + (xc++)->coeff = v; + } else { + int max_run; + run--; + v = 0; + av_assert2(run >= 0); + if (y) max_run = FFMIN(run, prev_xc->x - x - 2); + else max_run = FFMIN(run, w-x-1); + if (parent_xc) + max_run = FFMIN(max_run, 2*parent_xc->x - x - 1); + av_assert2(max_run >= 0 && max_run <= run); + + x += max_run; + run -= max_run; + } + } + } + (xc++)->x = w+1; //end marker + prev_xc = prev2_xc; + prev2_xc = xc; + + if (parent_xc) { + if (y & 1) { + while (parent_xc->x != parent->width+1) + parent_xc++; + parent_xc++; + prev_parent_xc= parent_xc; + } else { + parent_xc= prev_parent_xc; + } + } + } + + (xc++)->x = w + 1; //end marker +} + static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){ Plane *p= &s->plane[plane_index]; const int mb_w= s->b_width << s->block_max_depth; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 929edc1340..addca0ced9 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -37,6 +37,70 @@ #include "mpegvideo.h" #include "h263enc.h" +static void init_ref(MotionEstContext *c, const uint8_t *const src[3], + uint8_t *const ref[3], uint8_t *const ref2[3], + int x, int y, int ref_index) +{ + SnowContext *s = c->avctx->priv_data; + const int offset[3] = { + y*c-> stride + x, + ((y*c->uvstride + x) >> s->chroma_h_shift), + ((y*c->uvstride + x) >> s->chroma_h_shift), + }; + for (int i = 0; i < 3; i++) { + c->src[0][i] = src [i]; + c->ref[0][i] = ref [i] + offset[i]; + } + av_assert2(!ref_index); +} + +static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed) +{ + if (v) { + const int a = FFABS(v); + const int e = av_log2(a); + const int el = FFMIN(e, 10); + int i; + + put_rac(c, state + 0, 0); + + for (i = 0; i < el; i++) + put_rac(c, state + 1 + i, 1); //1..10 + for(; i < e; i++) + put_rac(c, state + 1 + 9, 1); //1..10 + put_rac(c, state + 1 + FFMIN(i, 9), 0); + + for (i = e - 1; i >= el; i--) + put_rac(c, state + 22 + 9, (a >> i) & 1); //22..31 + for(; i >= 0; i--) + put_rac(c, state + 22 + i, (a >> i) & 1); //22..31 + + if (is_signed) + put_rac(c, state + 11 + el, v < 0); //11..21 + } else { + put_rac(c, state + 0, 1); + } +} + +static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2) +{ + int r = log2 >= 0 ? 1<= 0); + av_assert2(log2 >= -4); + + while (v >= r) { + put_rac(c, state + 4 + log2, 1); + v -= r; + log2++; + if (log2 > 0) r += r; + } + put_rac(c, state + 4 + log2, 0); + + for (int i = log2 - 1; i >= 0; i--) + put_rac(c, state + 31 - i, (v >> i) & 1); +} + static av_cold int encode_init(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; From patchwork Mon Oct 10 03:13:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38642 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165701pzb; Sun, 9 Oct 2022 20:13:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FNbf0SVzins1Sqqi6S+E8VdQhLY+XrAWafbO6tC+xNdTV7PSumnT/A+JUBuI2NAdOczM+ X-Received: by 2002:a17:907:970b:b0:78d:8d70:e4e8 with SMTP id jg11-20020a170907970b00b0078d8d70e4e8mr9086497ejc.614.1665371634721; Sun, 09 Oct 2022 20:13:54 -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 e5-20020a170906844500b007882926c091si8212627ejy.768.2022.10.09.20.13.54; Sun, 09 Oct 2022 20:13:54 -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=oErr0AiV; 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 1780968BC9A; Mon, 10 Oct 2022 06:13:45 +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-oln040092073059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB8DF68BC90 for ; Mon, 10 Oct 2022 06:13:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=it/f7RhMgp4ARdkGubZI3jEaGRB3ioVpYkb+YL3GHozgxZfsEWHyuVPtQinqMwM7H/Qnluvm7ESWYinvwFopmBLil6TLo1kkemTJp85Ouc6mwoMzfAJl5Rc8B2IAJx0xrJfnl/cnxHmgwSKIbJ/2GSWa7n0dmWzDaT7cHhZ+arsdMYGFFDjAsd4ayXAXq6pKPBQzwFNsrqJTJxgL6WW0uUwNE9cJfuwHkNwx6G2ikQ8FoVFT2ISg0mZ84fc939fx/IjrzvIKIQZqV6WPkpKKev98tBWk4OPOBFoCmpMQos9Lf2X8OGpYyR7cmH1AOrsGIDZzlIui/I3cFjCiHTNXAw== 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=RIpYC452AIYAmYamz61HeMmswKunE3wjcxaGbUhaqt0=; b=D0uKuqEobgFtoMWBV9dDXFCwCmxu+QklVmGomv0+D1+lIGRNP9e8yRdMjFHbprCTqbm9OiymbPY2+sfO5+mjBonPrdA3+oMSi6PX8MRJOLnK8ZT2B8BFW545MAfSvL6IFPfAooOp8zhTWUlHXAgtPL1YDr0EiHhart6qnZVwcpLaIr+VArVbsowHR3DeyxzN/qdoP5+4+t5NzgymI2LG15MhpIffRnxo8FgmEY0DwDrbb3L1KnQbCEYixWXEPuh9kXoZ5z3kOqmq2nRxwYiy3TKmQyN47PQlA7Tp7B2Oi+8K3lv7PMK7rXMxkmUqVPLeBYr3vxwSG4xUEWfbh2Yn1g== 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=RIpYC452AIYAmYamz61HeMmswKunE3wjcxaGbUhaqt0=; b=oErr0AiVytnoLgtet9ai5MdJLtwJ8BGux8kYWaWeWw6y0qwKwBYknlPl5tWdE7wbGUx8eaW0ScHwzCDfTN4uNeB5XI+nd3ghM0/v6vLC5AKAYkQHdtyYjvvmrfwH7ye+TNJvV0yI1QYr8mrELWV0fAYA/Rx13grgZq/2jx1xpWtPProS6cZhah/OaW1/LNpqF6J7M/jyB34UQ1b6MEXe/WcLfC+5fPHMI5L3g2wnUg6EXb+xkRB5hlfmHTN1gcf92v2r0E6KPVHLZ8t7uOhB59laGewgMwE5P/tH6ppmfaRFFcuSIWNHVkz+anZUo85x+KTDiGrOsqyexLUWJVUQiA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ylsHN2EEYuHh6mLwT8OFH+J+x97M0EOf8QlxvJhS290=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b4193b3-a543-40b1-5c32-08daaa6d6819 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+m8duj3Q1+4k/3SOOrg8sG5OY5EQR8jl+yn49zyDR0PKYbdsCbyi9MDGWtrn+GYsOVZAzHtwzM+yS1yb+sWe8d6kVOtRms1XokLpnA3dmcScL6Ua+k3INp7lV7mQR2W4nGAxATX+m0i3rH82LsJD3MBnz1o7FwSr0AljBNMfvGKE6cU8xn3k7LGoR8D11aSbeSUXSPNJGYFAJng50SQXl/QbxoX3dYRWnrT78GxuZ/BgoUH9VFFx3kJWrHoyaBpZnJuup3jlgIaQrU787Z3rys6iDB6uJ9Yxax+RkEcmA2VLF9xKl7WZ/YW4UcV55xbUDMM3CSBa4jWnpPODrEhY2kIt7iQNrXo3EO4awU3VOZB5qOw55LfxDN9+HZXwtTrlrdowvDhr1oc8YZqZF8cD/jbKZPsRLWgfAk1/kuLCOriqgB9XCQzs+ypnYYKCL61ZA6Jtc2dXpOjLKNo4qgurdUmd9yToGL+Dc00AAUbu8btUpJFnd+gmQQaP0JrBXv5AFeU524R7EzmPBVPHAwlQiVHzqsXUDW1YYd0ItjBCzX0BYKHKKLSCGMWzLqWbpS1/DRT9NdSr+A62sVMZgVOzlzNITa95BW8ZFurSPKOxwVtv2ZoMs2QTCjc5xAGPiv+65bOdRAsicCg93heIoOlFED8py5HbfcJb0YpzLu0R+VtGLIB206RNHqr527VYzJVeEvJwOnZgmnMbNBbVGTWjd1H1Alv9kCnVEMI0g6k/u7Ol63lmVPZ9dh3732FM0jMxB X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KflG6rG+rDk/RzHR+1MSIKf7L3Fu8Fe9y440htaG4cX8Nt9FBGJNSTzmc/Xn3HohzRFwZCY0EnEwQOsQE6c+xAwA4s3mlDtZTHPZx2V3aFt1TIQRVx1WhJjjznKM9lVTsNKBcQMf5yCRJYK3C4VpSm8e/jH5hZUiL3CZS92H/7Aqb1alz9/P8M0yyZi6G5ahyEmL2WewZjERAPzo7q+El3xZj96o/sweX45pSFYveu52TuWzFnzSdEXgYJiJskF8gcFjrWWZUM4bb2Kl/et4N0L4vAhn9SpHJIIJbiMzHsyCMEV8aoz7h0IOQDQjBZGQctFlZCmTMUQszPT775m4LaCdtCJ6Z4Hc69itGO7+Tainh5m/3/m1BAoX7vyODgYuH/3RdmAdeU/hlPqWNJFLHULjy+8J/JXVPsdNUVvyK7tKWjKIf0klRGSJQBOuzcCYDgxHExq0xs1sFYCFuEDBSSl1epJ+bOS0BWskkBYnu1wStJtdFOaNiTYGDGIdQMbDYMYBoL/alS+NvN31+9nSgSaWwg3rTdGy1a2OFxcUmgU16SdQ7uHP39j1GyX1257SqhgZWaiLTlfcYqtUblo3XGmV8Ec2F7dequZO/2BBepSqkhSPiJSVp37bmRuOHki4Rz21DFS4eL/mqRBZUMySKerjI5R2W4Tz0quRMvxv9+CuAwyEhYKKt0mLSG0hf8Wt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vUNqmjgOrh+cyPsK1Kv/hu7YbiAtVVOu7oFK6jOdmSfhYUxMubnAgy5jDCLMaQ560c2Za9Cdi4ElbDSX4nmLZMv489umn089VPI8gIyoypcqYX2ahrFT2MAFt55T0n75PWMBccWjm/OF1ggoSnlB1arkAxeHi3ol0j3nx0Y6ldhJDzqI7j3gr1pfk942oq1FCOXIUKAYc3yx+iW2emtLfnhnmFSb3OwjZFSPVwazOYYZGjOIui0nQrECyDaKfBmIUqJvQVk7dUNEvJh/WPNDJoJKbT8fQJjvkQ6HmpE9jX3zn7PV1pxdjNNWK++d3wsqdmSDzdFjCxrTG8GpxBl7dMD9i4RSIVda2YyFuWn/TR7aTWvUEwUYaSprixk7CGLB5J8arDT5ValTishn7Zw9XjAK28/Y4C262IAv+5QTRVHuGZdd0zW1Y3sXDQAsBqKmApv8QT8u4IaRISCV9WYVBZyhQVBn7As2PjwIWm7U4ETKQk/EtAQ70CEiABYvkaLH2uy9mhH+Y7qmwHjHG2iZDzjG1ZGPRqC3uo8WhNS7/bZMfJJ1NAHThl+scioToE4yrl6//dBNtr9lUP7J0+PO31Qd3QspF9HUKINXn1lINSHkbwYTUmFYJ6g5d/pcUzOFdaEDHhHYsvE3Y5oG9c9O6qUQ1mduE8IPwh7ctxuu+YvyfDR3eMVAFBIDWc2lPFvyD8rCxoAsXP2ZDfLbsNgyXFATurNDkXUerBZnyGIb2RsdQnlX0oCpLkpHPpo3PEN4dpimnZ69bStlORfDLQLKz6SX0qbFaWIwYFJA9ACAvrEDCY4Dq95iUqOXu5lYLQxVoNaYWxRXHuEPa+bKC+RydKkJn7noZLgp5BJ+oOnmWkDN6lASfS70FBa6MuN03xQelS27/JsnKJ7/ET7V7xu2YMQAbKmXu2q2oF2DcIXZuNbuklWLiQTk8pbfbp2o5WtmY9eCL3hnILPTh3r069HWesiX8XIZjej94XaOEY3BD0jKlF1nbz/rtEDSntSf2GV0oXZYkT1zcBEcSLVntrvvYZnyud1/LIrc8ACo+BEO26pbDQU//Goy2uUKNuigQWu9s1+RED6YcNVsWXsHhB8g+ToymOre/fW+ryEMMomuS4BDCvzvqwpw3kWly/WuGJL0N9NWK7n/W+kQkWJkngz1vMqf0JZRyvnVgcbkF2W2LdVNezxtI76GRmPsX/KcAi7Etgp1X4e+MmQPu5xh1DYrqmIvwIP3zEIQuU80siCVbIAl4WPBTiKw64A2Pn8SqtD2dv68/9zzvIPfQ0biIfMppzn+QZZVic5/9rOXZ9CkdwP/8VOsB2Ekq9IRtV1PRsl7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4193b3-a543-40b1-5c32-08daaa6d6819 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:30.2714 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 12/20] avcodec/snow: Move initializing HpelDSPContext to snowenc.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +vdYA3Fy5dTS Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/snow.c | 1 - libavcodec/snowenc.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f3fd91f592..bccbf1bdbf 100755 --- a/configure +++ b/configure @@ -2946,7 +2946,7 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" -snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" +snow_decoder_select="dwt h264qpel rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index c9bc4dbab9..4a6c781a95 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -433,7 +433,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe s->spatial_decomposition_count = 1; - ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index addca0ced9..0854f78da7 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -128,6 +128,8 @@ static av_cold int encode_init(AVCodecContext *avctx) s->plane[plane_index].fast_mc= 1; } + // Must be before ff_snow_common_init() + ff_hpeldsp_init(&s->hdsp, avctx->flags); if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } From patchwork Mon Oct 10 03:13:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165733pzb; Sun, 9 Oct 2022 20:14:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7tiGuMycyXKTRzK+/CHV5CvrV7JHV5jrphryPkSXW1jU3Iav/AS3cdVBbcFguwf3VErhUm X-Received: by 2002:a50:eb8f:0:b0:458:482d:43de with SMTP id y15-20020a50eb8f000000b00458482d43demr15647759edr.205.1665371643201; Sun, 09 Oct 2022 20:14:03 -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 n14-20020a05640204ce00b00456d5c4de7fsi7910413edw.240.2022.10.09.20.14.02; Sun, 09 Oct 2022 20:14:03 -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=D2yxXAyP; 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 0FFE468BC9B; Mon, 10 Oct 2022 06:13:46 +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-oln040092073059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3625F68BC9A for ; Mon, 10 Oct 2022 06:13:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CCOEf2jW1n9KmjIgUP6mVf73sJo5ZfufQL4j27Gxl0JyI8h8pGfRCoE9b8x4O3lo0YozlUhmmYDxrx2KAF1cfXf/Te5jV6+zhZzT2woKk/9NRtv6Q99rWW3xOlyIRdxHHHErM0qNNZQPN952jZ4tK+xK09wX+lH9i/D+z4OwuNHPXIpMPciQhSp3b2SL5GVbGpbA5XwRmcCY7rOFe0Ngtu+q7VHT3mhaKacuEMsqywRB2dJpBXnHtVFFmupiJG65ViXbryYLLQEhrgKHOqNq+ttW07aIlW9sz8yHGXAbbMzL778tmas/1wWhaI+joQ97Gr3yKNXqaMlTmNLNfOwQAg== 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=ZW7FWct6QL0S7+ZRMKdUyUV2gb12rng00PUa13aanOA=; b=mlnvqLolTNjSPLcloiZA/KSTB+8eef6MhorCxa7rwXV+Vpj+2n7wz5YWUtuiTT52GiKyfAeMLlShHb80RHDHdE9XnOULjibfhKi61+UB2H4Qs5yBjJ5WTMrHp9M760L6pj/7ZW68L437IEct99BW1QkcJuTfGGcANQyYzkB+WBh1on1wiZwBzSnE3vvEyzkEDq+w6PuubN5dy6Zlyij5YUXclayNIRLphhcCvYlFI48P0th6TylOQx7+Y3y7a1g/UngbiagR693M1Hq3Zy9Mttx04l56gII75ButpHzWcu9rPrYsk77PFhPHF7RvOiocNIL8zTzreWLfBwpdcBH6uA== 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=ZW7FWct6QL0S7+ZRMKdUyUV2gb12rng00PUa13aanOA=; b=D2yxXAyP0+52VxG5qt581T+d8ZIWs6Z1g0TB+LfMnTl825xaE5Tmn8I4H1s8wJuJ3k5QKPGXoJo8wR8zrs9hRJkRsIX8lLZIhTa6ZHw4Fa+Gx0rF67Tk4JDrR+7odbYq8xlxJNQYOBofPUYoe6cg5waEres0xnfXZPWXYS2J7KTVFkj/qnIBBkvEw6NB7/JDbFBVDqjUB4MwQ+cWrHOhXlXJw2kyIs6SpBBBSaL5OQ6eu6xxzq5oM6VbUt0Q+R1EpFU4zXvPJTYVt1hSpOLdmLYgfwWeQO/K+iwyo1TcwKSIcESfpStygV9APZqArUJUaL8nxz6amkyQictkW2kUkg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [E2VIvjHUrCkbngdZwloADAT8uuso9Rp1D+yEyhbV8fE=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: b8cf8917-7694-4384-ea0c-08daaa6d68d0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkH34M/rcYTrLkT82+notTN9JURPByfbM0NWOon0ofebyfXxitRrhPDiRuj28YnXS5TEYgdoDlXnorOogVFE0py/m+1DVrhBXv3LqKg6MqydG8KOf+oXPD9BsJhwebig+HV9Ka7v8VGA3eJ8YVFHFCH0yG+TtFIJcRshJv7UzybH/lqYkQFeucobbK0FTbCE/qWIcGr679EzNRr3aQwNbywx7Y/J4NmnP3E7uB0bewHmF/LD1fjDkQJqIgKRye4BZ+Zg1OIOtJYbAe87Fo+nfkHqaEXIfcOOT4kL508KoChtk7uFIoZ+LpKNeo4wWOxR9Bb5dSq8JZ8AKaN9XTOfYtOyqSdRvrRNk58OeTryJyYtbnyuMcKJ0Axq1U0pJtEzJImHOkVXhQ1QeCIOlaVcCrhrFaJkT2uHGlmUtND9eKdHP2gDO0gT42hIXcbF4R+JPEAfksoLEY3hjrz04hNVPd654mQ+HMFq8NpyIkt9CwmUdDRe1d9RLe+yhghwZ3O3KHNOtxX7wyt4BBap3qzrHNKJP70+JAjZVXJsIMurW374VQ1Pa/wKXD1DBUMpSPQL88k7Lk1CoAlfIBTOjbaZinBv/9hFh4E8wSY9CDpqApm2I5ECYENuzYFjTFotcMD6uI4GyR5SPfO9uUNcuGKaOHITHXR6qZBkzZ69WCahLAls2nU0StZHIqJYwsimkul1+d2BKfOSswWjJXLXjya8L1f6qCkckaMramIo3Ie5H+zCoY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NT4mJySLqDoXQN8mkeuDTUb3rUi3dyDDXIyAEEHPPQDnkXK8U15l+7TCy+Y/CzoSZXvMmqYxe69weW3s81vw6gY7xbhtJp50uOh20uI1wmjy2jnMSMZrQYIengfmX1/wjlpnj7t7QXlNN3YmfdOqrjsXEsoqOk4GAYPLUgOu72K9WixM9vB4Hk3ADF975V55QynGB0VhHC7bhQA/CiYYi4nOes8pdwI92zqOl/T5Uo/I1642GAHNr9PoXwUbd12cOsfk5iCgzJGSQ9237bFZp1kI4+fzw9zU6PzBqEWse/aSgoaAkgHRwX4ur+CZXEZkl6SjVcxDsmDe6aqGTA+0WlTS0VTDFY7nmoko+t+y44Y2N6BUDeDGkrKuY7JqP+9IKQMzBUJaQ8fOo85+Pl9+4htv2+r2VkjQ7FNYX1NOE6qOPbx61SCutUGb4miMdavNLqIdeXu1a2VdxjnDEJ46NlGIxW/PyAV2Eaab5UJdhltx07MvOrgbs2lk0yPIBTJaCr9L53P6UGYTFmE0rEDF9Rs1q/P4uIQ+e6PfveD4CppHy6VaPBFqhWS+W/7ViXeMtt3WASQp4Jz8KWREbIpOeLThLsGkQlamYzob7X6jZsOOHtSYeirsmVBfv4EU/Q68W6gT5WNF+hpZcl9HM6U3GMJsaRRv2KTmira7wrfgQMVBgmEdbTSZAI5dSEi8byCQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TtZjYzwLQ7vLwa3Iwe7n2ONU5Z88n8t3uHk3S1fMcHzUWFidTmIHhrOVbRw9OvNO2I7yr0sPB1t426JW3zw2+QXK4RL1oWpicHSH4R2iiDfCbbEk/2pXJf1zKpXb+lCSWTZGMeFbLAtqU2PxX/zodj5lEydK4aARVR0gVyRBwUjUL77UKB0uCWB3PuKw+wChojycgMoS5wSu7LyLartipdlSATd4Dl1wQ/yWWNjib9DqDae0naB+YdSVgA3q/4ZCmjQk/q+0y94iMO5mdH0KTsLwgYNEfVR7z/GCOEX6HLo0oaRtgm6rhoGON1FGjz6MgtlojyxDgwBIONHEwboFmaH/Ln9eSfDLkJ1tt15uNzNH3BBAZBdABZBE8yaMe0Wo/AeS488u65rM91fvQ7O5veZA6zvl4f7wI8KczLJgu1yZvXvAwhsUzXfz8dBSxZ1Z1XX3B0y6SYFgg/nseCqDg7W+pqaqQBzURbHAXrsO4bIxCFYeKfXnIPP0FQaLv/SUlKCgPPocWJWgWPbpRXA0MjMSCaB0ypMmi1TVsPjJC+Vii92kCOMvi1D0siBq6INIRmS2vGeXdaiYzSVWCkq87iJQXXWeZ4nsx1EAQCShdgexvKWG06ygSNM3iEUYJtGTj/7ZCTf3gxzOOi75lvEaqKLuWWhMcoTbQMo04OLQJQDeJkspN8NdWufEG0+6zjN03uA6bxBz5Lm7QSNVn9WP5cgtSUfO4CN7bKLWJ6jL4vplXPqMZGVREDHP+j3IDF2XKRBrW19v08kPSSc3AVYvjddacVsgDe8F2Yu8gzNp5TdjcjgpTxgIWgurS2rkAQn3p1fjfwP5VVrHmb5aVoihgiWUpxeQjzZmiAFYGnzNydsV3AnsmyHkcUW0ukFpRqO/AV/MBVaH60mb/pnJvy7GY0TejdI38gvemxG+8JRKOriuxUmwZN8vZM3ZXSAhPsE8kEayd8slRDNdFFAC20zUmnl/ew8GNyQW8WIXq9T/WQYeifIdSBUL4rhgS89k9OSdn0E6FYwMoxTd+1YazAJwilyeTdLOOf9RSJhqpLxyeZNLeyiEqqECfEfSVFa5T6uLZN8ogF2ceI62i2B2tp5kkrPL2HmQj6xHpCc0KIp5P0V6iMW/TK0JPfmusXJQMrwsoVhi4je2G9JLfslswZpmXyTQM7+UhaWmmOep/FKauUbfbZaYwyLJDdS9aChhk7YpHZpkA7uzlz5NYwDhZXs9QN/CdIAtiudRjlTAbtKIHRsKbck3pinVaCStqQhA1iH0TSBefi78vPWmymbpDQqtZQt1foXV1SgnQWBHvKS3Bkyh4paXKsQimrS0oQ/OG5ZN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8cf8917-7694-4384-ea0c-08daaa6d68d0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:31.4900 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 13/20] avcodec/snow: Move freeing encoder-only buffers to snowenc.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: shIjRCbjlSAD Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 8 -------- libavcodec/snowenc.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 4a6c781a95..f55b3310ac 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -606,19 +606,11 @@ av_cold void ff_snow_common_end(SnowContext *s) av_freep(&s->temp_idwt_buffer); av_freep(&s->run_buffer); - s->m.me.temp= NULL; - av_freep(&s->m.me.scratchpad); - av_freep(&s->m.me.map); - av_freep(&s->m.me.score_map); - av_freep(&s->m.sc.obmc_scratchpad); - av_freep(&s->block); av_freep(&s->scratchbuf); av_freep(&s->emu_edge_buffer); for(i=0; iref_mvs[i]); - av_freep(&s->ref_scores[i]); if(s->last_picture[i] && s->last_picture[i]->data[0]) { av_assert0(s->last_picture[i]->data[0] != s->current_picture->data[0]); } diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 0854f78da7..fec061a8c5 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1986,6 +1986,18 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_snow_common_end(s); ff_rate_control_uninit(&s->m); av_frame_free(&s->input_picture); + + for (int i = 0; i < MAX_REF_FRAMES; i++) { + av_freep(&s->ref_mvs[i]); + av_freep(&s->ref_scores[i]); + } + + s->m.me.temp = NULL; + av_freep(&s->m.me.scratchpad); + av_freep(&s->m.me.map); + av_freep(&s->m.me.score_map); + av_freep(&s->m.sc.obmc_scratchpad); + av_freep(&avctx->stats_out); return 0; From patchwork Mon Oct 10 03:13:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38681 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a10:9905:b0:2f4:3559:b653 with SMTP id j5csp2312118pxh; Sun, 9 Oct 2022 20:14:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM48LXttI9kGnczwWAsg27kRGwnaRJdmsf567zmEoOY+ulLO5hBG58FZzK4Blpbol0el3ev9 X-Received: by 2002:a17:906:9b94:b0:78d:b8a5:7493 with SMTP id dd20-20020a1709069b9400b0078db8a57493mr1437225ejc.530.1665371652157; Sun, 09 Oct 2022 20:14:12 -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 h13-20020a056402280d00b00450bda7e40bsi11692412ede.29.2022.10.09.20.14.11; Sun, 09 Oct 2022 20:14:12 -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=mb0otY3g; 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 CF69D68BCA8; Mon, 10 Oct 2022 06:14:10 +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-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED14268BC92 for ; Mon, 10 Oct 2022 06:14:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QwnBWTiCz5EgApS1N61UUeFcVxZoe9DWTIKtN/bzjo/Kci7JAgOW7RvvoTBTKOVJzlOU+lCLwgHOx4XZHpgqPVEoQ2F1qFPOjTq97Rh+m0yz78ZuLpdPdTIoS+DaAYo3RgiqIoJn3M1V2zP9R47gqd2EefbAOLU8jsSHQiN6YSNbZjTwsYcJyMimZ3Wng6VLC2fD1fa240AVe+UKZINtQtKkrvBtAd9GhH/zqtX/x8on0jzqk2XqU7VVUAyEscDwhbm7Q7M56ekr9Npy4eYo418KVPbaqgz8XJKyDLLsZ0AMbvYWAcH6r8YawOeetOpk2DmAiil2zrk9wNCpxs7Zig== 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=rSCkZEsJSnLMQXAwC9pxDJrsjksNSkh3vJG1za0lewc=; b=a26cozjxbpKypQXvXJSTTkEmkWvQGT4IU5PTsvrbS6awWfGRVqcvQi+5UAXIDh9ihWBXEG43VHomHct2CQhHxgiEpBU3b01yf3iAD2RbiOwhvI0kxouIfcJfZ/d6spvDv3x3IAygDLMfR/64cV2xEsIzJLBqGSB3KpEMcE7qTxcsnT4R/WlDmJAw90tZkILFMAS/ZQUCuJxwLnDH5YIrTTecJ+LY00Wqh/q4E2ReAZIuv1h8lfUvsPtQcOG+XD14O/ENdS572ytcPG8N1x9O1VCDKrpYmWj9GzkdHlK5qPwiPbAjUfmYXI+jlieoW+EaQVmpTeeJznf3iP/w40CHaQ== 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=rSCkZEsJSnLMQXAwC9pxDJrsjksNSkh3vJG1za0lewc=; b=mb0otY3gE/kc7Qz6hdLGm8hWuEqE1vrAAi30oJVKorh2/I7ZjUxLATkEGKb6Kjaa6g/HYXPDSv07/1bz5vU3Iod/5hTxfzQ9/Z0lFj7jum0pQX4Lw34H9rdpac5ZXNoIMeETl6KHzVPe+w75dWfxLmn0nLz1W8STiI5iB0mRipkKGaDp308+8FU6zP+dJlP+FdJxHTkirDdASYAIzp4oDVJF82YB3jXZPq82L5/x0XmcWVNwgBpwRPlB/AG7o0NZYfkh0rgWc2LKVPt7JioeEdI30Kn7PzWCl6FAvI9/wYH+ZcTi1r7zXpQJUVXyrgvoprJVw14/85WCtV7ZeaSg6A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:04 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1OEFJX+IlaD3WnaWsxrmUV0fwX/m1irnM6tzHQMAuJs=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 27b18fa8-bbb0-4ed3-3994-08daaa6d7ecc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHeenGj2EVIHND9fY5MDn78lo6WIW0NwruCS0I0vgujhCla38s9nSgHEhdFYCvd0hrrYXAyQwo6Xm+pFlTzxph10AHUGWjiYcSsNW/7UjcNtyhUiGa8WajzfWMb1DcaWf93rsID1XicNWJg15vfK/KrQl/ZvB+SvVnUWhcps5/SYO5dDZiup3HA5ruwydvkoXaoEPP4RrvnR95vPBGBVcWw+Z0cMc26CN+L3HQ5k/RzPrxcuRP8WamgkH8/txp/LXdual1vLK20lJF/r5twG2Wv92kFgPSVlzBEGMioUG+2H6XVZzcIq0SxfXSxj+YICQVydgQq5VzxWFh6huu4HmHTc8piUP1n8UXMDSKrewbfpDBm8x8z65f2OwqnmouYqJFFDtU0gotG8jtKdGR989CaEhtyIdOAt83KSrree1qFon8kElAkBt1tBKyTT+MEtTTHGpUZoTPzKOLBlN0g7FRECok2VmOcx+poUDnYReUt2xCsuAdOu917dxyO6Yu7qaQP/OkqkvZ9oxY/pGieqe/NU+bNqLuxMlKUo6tpdkqINj7CEffsYOGvGqbv7bPN1ULdi001IObkUjwaheVQ9nXOMyRczYWMubhO9E2q7gTq0xMpR1UEqV1tZUZeSYKP4L9cCenLjjOQ/7LceBccJbkxKUboPZk7EHQgv8xXeciHESzypH14uO4cFOHNWlJIYkPSkOkUYnSH8Rda03/JU5svsQVYhbtk0zaS6rjCVVOq5Y= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bGVk1eyixqmofT4h7/QJNaNVtLqUZ+gHvkBeseB1Bmnws+HO50RttvjQIR+QWQaXZYgOvquowe3shhmqnizWGbCvqRzTe4Fp5GrHzmNv5SD30f8Lox3OeJAUXncRQq1/g/G3ni38UDE5EUw0odM/aH7igpS5pMhOY1tUo+FkUrj7Kqtuj3roJjS7uvU2WIGiwvuC414LWJgFKufS9XQNOjAaJQ5J4HNBpoepCHcv700uL64hxCk8JsCoHBEDvN/L0sDSW9OB5bMvTBYGFenJweihVIqWyCGl3sm3ycDIkuyVdbgujf9h2HEex0KzNxs3z7NrG+iHliy49a5/bp7O35fcWsS63LKZ6fAKKfaUMBnM24TIz5JSH+ewfm85NHwdaBpNjMWgc0mmXSowsCvoJ8+f4QMfMaNclA4KwcK2fiZMmIiEoELaTFGohRb2uGojMHlWHmFjQ1kpXcZIiclRS03xSNXWZnn3Bco0XXig3v1AkKtIs2/3wLu5bGercBf63XAxU39aPG8vQS9BjCjIHg3znWKCAhKo/pqtaqq5/Gk+RciNOSL2i5c1ObSYbowVm/9ZQ4pXT1hAccAwuDVfC0WDS6uwNpVsF9n97NgxGsxfQbwlwrrwKXWnwdhjvduw0guMfREUuGs3D9oz4o577Ai3gPdCnron8eiMx6B8QSi4rYTE0muramtewx+JqWA5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PANQ8E+ZhlBcfv5OzxeDe0ogg0NCWhop/S1mpDfgp1860Iscwx7eqMKfb4AwEwl+bHgl9sjuzlKHuZbuj0rooUc9mSdyD4w8Jj6D7t+KTGqhBO0nvtBTyNu1jzv7rTYccCHwWRbgzwfmufxOYenEJz+K8KH6ctHnNGkA90ZZ0H732F8SrXDeWG8VWTziNwEllj+c8LRJ4gvRNgyttwTKFbY5Lj79ZoUDGLRtQH+dithQGeQvDeweCNzxuuU4XolBQbzrsmNRudAGUQGSrbOV3ybVjKsy8wn/c0M7H88C3d87Bnes5P7K8pg/h0NmG2tDQPl5ah31e40J1h1jEIbRCeUWpsZb3ygQ+N+T0N1hSN9UHLRXkEVFUJCTZyfD6vBgwKFv+cfgradgBfEeK7c86sVZKyj1xTejpr9SnGMsHt0LmyjmVMdUl/9cjvtAhk5ntksoVY86oJGHefXvVTC2YCYoWivnximx0JMjAKIeMLI27H4rIediJlXwX06yKL45iczLDMEHDuGhVgkzcl/hNa7Xy8i+Ii0p5S8ggx3exOO7Il9V64T9i20/3dvsydwHUKEGvsfNuO8thfYWxH2977tha2M3oH9DmLLCVaFC0mNFiu1oX6pKjdHx6P6SOuNngAtYcTnjdu4kvaLsyupFG/WYXxy9HI6rdSnEXwSg+ClvzSItDNUocpI50SYZCDzF69NYy+QrNW5xT5Zh1bkBVqcdrTiXLAtQDuuB7kU4n1EmblHeIFE2uGqzJTYdGV2ZviD/AxoYInDEMnCCEnj5cU1VLZEzFvwhgbkSYAhgUw7HmH9EUYv1iaV4QDT9U/JFFmBZYWC91U24GB5mjPBwgDFV3/O7EqDUD6vGquAGRYV95aWkKueYAMPhjM7Rm2y37w7dvpHc+v8hJS6hXcgf6+BLTlnoa1gOOLmD2LRyWGHUOUvSocNjKf/FnpTwOgdFvYmLiuC1B0a+TsPFBBK7m8WADt8+/Df3ywYMhKI25ndX0xWHu1PARgwH7Qfk3ceDqTym5lzrZjqMe5XrcXnHOObpwRxplbozkrlgdjMCYJlwIonSD56SxgDRCXxx4gsyIpL/C4wghTAMOLzFNqKHX+Pn97Cuu1/tp60lS/M/87iyqFsoZkPsvQJOSz+XsPiQROPtKxNnIgfRSAVfoP6U6uRfIyGUgIuDCPbAe0o5s1UtNZErvByeVph7wqiRJOF0BZb8EKnbdVIv6FKMrLd63g1/Ou7AhlWC43jVyUeQjaH+C59MA+8Bti7Avnqpyo8LL6/3YVf6m4RY34o+4bQH0yxVSRiL6tmXB5WwlMJPeMU7NvMrNAmGq29EQw6S/JO4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27b18fa8-bbb0-4ed3-3994-08daaa6d7ecc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:08.3535 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 14/20] avcodec/snow: Only allocate mconly_picture for the decoder 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: hrXditUH8XlS Content-Length: 3801 And use its presence to check whether buffers should be allocated for it in ff_snow_common_init_after_header(). Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 18 +++++++++--------- libavcodec/snowdec.c | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index f55b3310ac..7fb1660dd6 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -468,9 +468,8 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ return AVERROR(ENOMEM); } - s->mconly_picture = av_frame_alloc(); s->current_picture = av_frame_alloc(); - if (!s->mconly_picture || !s->current_picture) + if (!s->current_picture) return AVERROR(ENOMEM); ff_thread_once(&init_static_once, snow_static_init); @@ -481,22 +480,24 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ int ff_snow_common_init_after_header(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; int plane_index, level, orientation; - int ret, emu_buf_size; + int ret; if(!s->scratchbuf) { - if (av_codec_is_decoder(avctx->codec)) { + size_t size = 2U * avctx->width + 256; + + if (s->mconly_picture) { if ((ret = ff_get_buffer(s->avctx, s->mconly_picture, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; + size = FFMAX(FFABS(s->mconly_picture->linesize[0]), size); } - emu_buf_size = FFMAX(s->mconly_picture->linesize[0], 2*avctx->width+256) * (2 * MB_SIZE + HTAPS_MAX - 1); - if (!FF_ALLOCZ_TYPED_ARRAY(s->scratchbuf, FFMAX(s->mconly_picture->linesize[0], 2*avctx->width+256) * 7 * MB_SIZE) || - !FF_ALLOCZ_TYPED_ARRAY(s->emu_edge_buffer, emu_buf_size)) + if (!(s->scratchbuf = av_calloc(size, 7 * MB_SIZE)) || + !(s->emu_edge_buffer = av_calloc(size, 2 * MB_SIZE + HTAPS_MAX - 1))) return AVERROR(ENOMEM); } - if (av_codec_is_decoder(avctx->codec) && + if (s->mconly_picture && s->mconly_picture->format != avctx->pix_fmt) { av_log(avctx, AV_LOG_ERROR, "pixel format changed\n"); return AVERROR_INVALIDDATA; @@ -626,6 +627,5 @@ av_cold void ff_snow_common_end(SnowContext *s) } } } - av_frame_free(&s->mconly_picture); av_frame_free(&s->current_picture); } diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 3a835650a5..96221b9802 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -794,19 +794,32 @@ static av_cold int decode_end(AVCodecContext *avctx) ff_snow_common_end(s); + av_frame_free(&s->mconly_picture); + s->avmv_size = 0; av_freep(&s->avmv); return 0; } +static av_cold int snow_decode_init(AVCodecContext *avctx) +{ + SnowContext *const s = avctx->priv_data; + + s->mconly_picture = av_frame_alloc(); + if (!s->mconly_picture) + return AVERROR(ENOMEM); + + return ff_snow_common_init(avctx); +} + const FFCodec ff_snow_decoder = { .p.name = "snow", CODEC_LONG_NAME("Snow"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SNOW, .priv_data_size = sizeof(SnowContext), - .init = ff_snow_common_init, + .init = snow_decode_init, .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, From patchwork Mon Oct 10 03:13:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165810pzb; Sun, 9 Oct 2022 20:14:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6V2bqlDojJtYmTxhEHydyCJAMk3UMl7ZebzB0ZvySyiCA4u46ALx8ewUN/pDfa2T0m8dEs X-Received: by 2002:a05:6402:22ef:b0:458:bfe5:31a3 with SMTP id dn15-20020a05640222ef00b00458bfe531a3mr15671487edb.6.1665371663201; Sun, 09 Oct 2022 20:14:23 -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 hr29-20020a1709073f9d00b0077bbac643c7si11465125ejc.879.2022.10.09.20.14.22; Sun, 09 Oct 2022 20:14:23 -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=iqFKX886; 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 26A9468BCAF; Mon, 10 Oct 2022 06:14:12 +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-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3861E68BC92 for ; Mon, 10 Oct 2022 06:14:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=knst5sDjPXFHrpVKLiNyVFy1Dhun21T/wQXRNg+iJfRYvMTXwL1qxZgkJBLMiM4IJenq8wjliZ3fAMGEuZiBRvsW5geTECgYVEApcVQzjDaZgJw9bo35XgW/YEBe554pMxpglcG9ECPot4YJG244zOkM5nr6phaXgQnXRSbhTUI35Oq9lkCuk6J+bTe33CpIhnKi2uaXbEzr1OktzKga0ooB4HXAD7AxuFCJMeJIaov2oooVyJMVZsE83Opdhz5Ty0tzt7rKmaTI2VwSKR/3o7ZXjO7D8dWqx9IIQTcSb/r7bbLFCCX46WkQ0C0AG1mwEZwqd6x2phsEdQqhT5+CqA== 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=8rIS26kH4O8r7WWAqXrAOrAb8SHT99e60R2fe/66SJY=; b=fBn/mIkEMMNfjP4aQOxDF2yvXc9lfUwzZbSMGAYHuVrx2VW47zUpqKqwWBSadM21td0wRLDys6DyOW93Co7dZky69AOuFAoREyTRMNL2NRn0u4Z1ljwf6sTwM40NazkR27BPlO6s6k/tkwbYRLxpgM2y/CI2bO1jjobifuRIuxuCWtFVkJ8utXUu4ovlkbJOiAaDXs4oWistKTWCTuPbV3tWl8/OBfzJZ1iVZPDVjMbag+iCEX/S8F2EJk+tJjQ5GBnuCCrpgQMpX6qGYnNrPPVslliG0HeMePqcQ2smQ9NO+JbN3dU3iEHQn0o+mako533dcfXkAbi8k2Yxv1ltjQ== 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=8rIS26kH4O8r7WWAqXrAOrAb8SHT99e60R2fe/66SJY=; b=iqFKX886GruJb0+eGEDDT3jD78BDNLnpombj+d9/bGjgvWlRDw87cIOSy/G82p4dw15ZjraPly7G9LNpSUBGVzYIUFb0e2eAomPa+QVXOV/6gV+l4+jcUYZTlkrUfqCFUmtCc1OtyUoJ7DXxf0MN6vlfVcPRtMBwkQaq+ShFUTwFsr/xdXFT8v+bc75CVajFz6dCo3yq1aAuYubGNOy4Y0UixyOveik7MzeMADT5XUI8/qVossXdjNQVubybqm63fBg3AR6+3iIxvOXaCjfKWKahkpc4AX+mww3ER/P6cqd1Fsx2cTza+pdhu7hwTrm8z6x3oH7j3W7dLrDRSKLcAA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rti29H/FFLZXsthtGXpyq/Bpz+ZssUsXzFKdceOjFIY=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 2728663a-342f-4c7a-1133-08daaa6d7f7a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHLXLRViUrRIvgbXwUpyNw8DGHFVMD0hXHdpDD9fuhkvYbpXC3d4BAIK/aBr/g6WWo7EGVFZC+d6Ft33wUeyQUseJt7M2KSLMuCIR+FLrngz4v2EC9S4nGi5KunnaftPY8oR2eqgnDywaMi5e7q+sUw2GnTN9taBr/Jo7sZbDIhKUzV2JYo1gS4e4p5amutHqjbvpD7nC1Nd9hbL73PVRMReSqnGcZOuRsOJT3fUQGVmofkFnfqTeim3Owr8Yg447tHXsqsPnPxd5uX1RsV/iimBJ/Bfqhi3xse/k23HKdhs5i1j1aJLO0IClCeqc8VmSwL2jMaJs9iYl+yi+dD64tUciP6JKX2+DwIGAIipEVmoQbrPFck3A6KW+rur2T2BqimbEFPhQVP0qmzEsE408CkZ9XKohufJ7P3WILsRcOs1x5sUdA1XSieflVs75nTQxmgIhYmRbx29737x2xzUxCB3OdhiWfpuH7FpVc73nyKSOztHDI4hCZCqR4Emhpy2JVOLKYc3Dc0h8DUx7Wej2SV+guviv3GNB60FJ92AJH3qH5DNth0GhQaT5+TviiDd6Ph+NRpn27MNDk6RlfeqfMxqDtTum1svqxx3ZfwiQ7UrmJGnvcjuDhF0yMr6QFZ4mgbjp4X0NUDyJBRfOu60wBeShEjWY2ugLr7f59Cbq2GyO8+lwm1HkWeV1b2z0S1YWBi6vV/dP3ZQXnyE2e0mpPziF9P8/FW3udSU/edYbgW/E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TUDJsDl41ttu8PAXETrVNw5IONZ1NHWWC18fHfk+IQl1FPiz4GCOuQjGzJJBGAPj25ZknVNNtx5rfomfAirwUZOQuDdDHLpTabOy5CPUu5UbwjmVdlM1Jt9mhuJVpoA1DFwJUdl1wWyxlM24oDpcu2Wd6mQbXP1QHa+eiTvMzyO5RD6LicT3B/mfUqdjLYjMNtOVH0Xp4DyXsweZNON3QUkcJPA92mr06sDnXx6djX/M3gMEQNKGrHTGaakH+PTfP8WSKV9glW/kYs5rXmejMs4Ngx8kNIRXO8gndiSCvJttqp8iGPobzGREzViVUScv6tnKahEgPCiwIbW7cL1D52iDkpKDoR3QAMjhYrzc2B1uJgr2lSCH1yDirdmOi4k0Eh6elyGAYSdD3GTKXBKDzhX19NpS3kXLzFKmosaaZSN+V0GWtUdtIwnUtj/WTxDQ6tby/K52nitBFjKJk+npQU9iVKAwzA5cJPjTa3p32FDRcfzRYsx089+gBSq0ZNyCEYa6uC/LoIkI9ymzuggr5wVwaW1vq11ATmvPXtr/lUsr5aXRqcqbm7WHYnSBg7DW816RhtAPtlF9B0kCOrcTG+//76SqIrix6ttCCZ2KXqJg47hSjJ2rVramv/iR/Ny2qqf/p5PIFpqJV1OAaNGHvvn+Xw+yLzPr9VNh4Gd1VxSTT7URhTDPzOrvRpLDqXr2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9ORmv2X/N9+hdNnZHVg2vJsRdsTgzNnwea7GaHQuMdxHQcxcLERf4OEaxKP7Mr/oG+78tQBBLql0ZMx+JPqHEbUzynLV6HoLDHOFnbusxVnPWi1cBsA1AwpZIeArdh2vh6yrtyXldq38mtDvkiChzydC5sR74qH+HWR40q67OyYMzw2aOqCbsf0Kl8JXP3uaFTH2BUlnC+gl7hbW9oNSihhvTX0WAAEuo/D1DjK/8ft8Umz8BtZhnaYspctxhJIFdwLL88jjujPdd50HWC+ZxCtRY+W0OjAqO5xwNR/Xxd/JTJS79mGHbDvPIulI9H8gp2i2efpNVFyU1gbWFHmHKs3d9Qu9RrppOcNhp0ee26tPu3wLmjihyXa6qo7PJ4El5uST5eS6OzwJ3ViFCOAkOUCegAKen4C9yZPJcgUjbEhwziNRicd/MJHnHmSrmLVsLzoLI87m/sl4UOD42t9nGbjH8VKbO2gJx1+tnZfCrL1wQcxJgYp5WleoJGBrCUwT4FfPlSrooQBDXkl6EH7TmCh6jKucgK+RJDHSyiAyysrVdkrtdcYQkqsvPVumqtXS858AGVJJvyBNRg0sfOTjOfqrw+TrW4y7dC6/lan1JB80EFRW0xL4J/IAo6cRRnEFLCnGSziRNEByUpjElqsMjNNOi1at2DPP7iK3YFx9zsVaipk8JDL3jJ3/P7UgR0k7ZNupt4xWmzrJNAB/syiNWbU+5Z4ZDkrQw9hw6Z52mh7UNacEylp4L6qAay24BJvZV047dXM5NGirE1yb8nTHjCmfEg+dUf7HP6F7LURXbpN5ns6jMug4SkNnXA8RoKx7kbZgUmoaxcZmiBMCCJxI8KRYCvkHy3pCndUw7C4AH6EJICvL5gwLY+NHV047Ceaacm06DInNAZ7T4VrajH2E+nZx/P6aTMC2T/VawQ5bN8FggCSRY+7Re9t/WPwT1HtgvagJH4nkGELxd14WZbEv+1kOsN59QfmGevD8mF+oDgkI9ckqXPXy9fe8ZDRFpG/MtVx59e7qcKmuHFj2R3L87zjQCyKTjkNC2YglUk+B4v4vuUDcOkJD2yQjL/kx0xMcUTXcl1cF+sL9NdLo/yGBEVCfGuG1ccJQsfaW3UgeBlJjQZTPs1cg9TIiDEp+pkxyjmjrHqaK5A7rXgnAnp9nDXNAo1ubIp0sdTUMxlVUWhEVqjt0ZdQKskCs/HiwfbJktlLcPm1y7VyE20RwHRImqhMiVGMUIw9WUfYimgZk6L3By44Z2Wlj/NUYr1QWCnix/DTJGjf4cVS4Euayqos1UyAY6NvHTa0rNQeBhlNm7RdtG09vPRFMijvgNaPtaMPh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2728663a-342f-4c7a-1133-08daaa6d7f7a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:09.5865 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 15/20] avcodec/snowdec: Don't zero encoder-only buffer 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: bHNrI9V6Ii7/ Maybe zeroing spatial_idwt_buffer was intended? Signed-off-by: Andreas Rheinhardt --- libavcodec/snowdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 96221b9802..17c7ccaf2c 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -661,7 +661,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */ if(s->avctx->debug&2048){ - memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h); predict_plane(s, s->spatial_idwt_buffer, plane_index, 1); for(y=0; y X-Patchwork-Id: 38645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165849pzb; Sun, 9 Oct 2022 20:14:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/vvZ8P3hVraKh1ADxSJIqwb2mUz7YGsyAgVKUq6OZQT13Q9fRd3mhnn3RNoGGYbyhhuUo X-Received: by 2002:a17:907:9816:b0:787:4350:3a19 with SMTP id ji22-20020a170907981600b0078743503a19mr12526405ejc.627.1665371672094; Sun, 09 Oct 2022 20:14:32 -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 o13-20020a509b0d000000b0044eb6f979d7si9035992edi.152.2022.10.09.20.14.31; Sun, 09 Oct 2022 20:14:32 -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=nFvPHBfN; 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 1783D68BCB9; Mon, 10 Oct 2022 06:14:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8A4D68BCA7 for ; Mon, 10 Oct 2022 06:14:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C55iwk395TpL2RjyjruweZQgcJ0JJpqs5Bs/F+ptjoexYyri6quZUp/AhecuNhdmOFaO83JC6065X5OLM659AnaFDM9okC+J/P6Lv2hxxYV+ULsy18z56T8dMg4cCvgESD2lddGShyBeMS8f27trLv3oNS0se8aZPTvqluVLRQHFvENWLyb9dJ6jPuvhRR7yp/0LytuR1pZm1n6Kdbb8a5pUelR+TPHfmK7C8iT6TIaLN1kODtRyzzk27ilN8dUzFWCayWimsvImFunhNquA72dr6KIOAwi8liAD/X6VyRdDvMSDBTVxUrTAJrOxkH0wMGttfyOep9lzIoxTzXARrw== 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=LA8diyrmrHNxVaqZ4SSfrOx63JOZ1GSk1iPiWqZm71s=; b=nTuIXhiU2bCRlNJ7hfseEn910OlDYw+9jusIyaGKzZoEqsAdZG1VS/x6FQ7/n/HkULjaQkwH+GDkZihlbZ5WGAIJoXr5TaOdKLABZUWtomQQb0++78g9CQAac9STN5bbcSmnQZIQCpDqhqrmghVH//bYAO6W3giSVDGGiYajbq2SkENkKMXequb4n+a6be9z5mqiSLG4YfF0jwCgOEXF17rpZAZbOetOhPvMDPIVUYv8Ynp6SrF+oHee387CgDSHsHbH73iGq39T0sBwe7pJiLSRyCEQZlT60phgpoKR275cL4uDGu1tcnf3xxgq/UqNmGAj142V6lb4met4W8cl1w== 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=LA8diyrmrHNxVaqZ4SSfrOx63JOZ1GSk1iPiWqZm71s=; b=nFvPHBfNUI+Gi8lEnnQvIPBk8D/ORYFSo35mQC34koGNCvm6cHOPLxtVSY+EUi+lHdgZ/lPeqMEAp3OOr/Cvq9rwRm50aqV49o0Bvza1ii2Yi5YnidPZapJbCP6tDov11EEMCyha54ZOpDKV2jAWAyuJPGiOTrplTmeOfT9z4LYYGG0YedWZISfylfaVv5JhveF1cyUO54glWO3lGHR8Eoyx5njmvfwqN8iLvEk+XQN1qh3SQ8MAA2njtn8z7QEsWLpRhRyQ9vdKPWwkqxwhJP6nN+uNksm3wFKE5E38NRRG9uk9BId1Zmtx0vKRUBhcrcmuopL70bEKwfhzm2rTcg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:06 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [x+9Mp+JVfIGuXTKNEZxqyPOTduBOhRl+d/Ynj3XSb0M=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 8286b09b-9ca6-4345-1249-08daaa6d8379 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHehkkl3zdmVCythktGIbziFaA0EiySv34FmZT42R36w+O4FXct35amFVWvaB/iGc6SFosK48ZPZYu6OLJPQcTnh494pSQvlvucUi300X3K+++GI6hellEjRS64YcNaCJWr67LmhJDgArWdVk3XCPYX0i7zzr3fj3zdsEa6miOZnQCP2JEpGUkE7IX/NpL4zSv+lbXQTyfwvsJ+XvT/alEYH84AYhoWKBKETnaETZMp7nnrl/oK+MX0mrYymLNzOJmgcRLuYmKLVPXpF+WODzPBRMb8kAw4PbumVc8xMoiMoTNu62u6eqfHfP98cLfInmSmmCOxEy4+3g9ymAUqU4eSk+sWlYm6Z1ij9Ms62lvLVLxaeD8hiR0sy3HJWMcruu62FKNCw5mPp02Uzs7KnDotlmrCyVtgnEg7p255+Pos2mefVLrSolZ0Hy2WL1IscQ8dYmaNWRnFkmQrBgWC8l0d/lnbz1P0N+QuaNUcfMLLgF9GMDNcw/erXGcLtFw4ib4Cgepbzz2mhSc4655H2B4HuS3KdxlnrhZRF/UqRHJRfVQi670suE1i/EzI/CcdH8XspeAZPX20O6hedio54+PfgpEMsEZl120fqi9cZHpr1nB+El9v0zE1M9zmxbfUQJ9ra7EI34adYpMihv5k7YQPVo52MN9yMxBS0sfKxv6fibrdUBEehO3QDJNAiJJhXdQ1N2+2eSzXK6NHOsobivJPYQXRl7L5K7bN8Lu1yVsI6Q= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iZZm4Xn5IM7spXzjGZ+vmtqInZ27cQpz9RPldZQpH1reICsVVTNTQdUeeaeJSDETpPRromJXMq4ocSU9hdedBmMEScJdwSdFeUfrmn4h9Wzhd3HwDMp2UO3ZOTGGkzvNqiZ50kIAnEbZYzHBuLlMb88LtuVyZScV4B6mI6sB7mWt1t9HNPI4qTIptoCbtmaV4ygY9el2BJVXQWgzbsrPbX6wDThmBSgmfQuJzAqtTJK5rc0Hq4cPYNLvMK5UE6l5zSLXaKAZCCRtq5272hDqIPwz4/NTIlKrZlyGx59VwxZB4SX7m8RCpumhKt8rz8bzmdJc3I9cQK7Xto4Q2N5kO1o45WvzJxqOn5axkdXB/niLOwP2UqOknwahWeLC7HUtRgv2iTFlfPDOz33JXzV/tDW+0F3FowWr1ro/qZ0xtIHEILoePf08yzVR9zkGgJeI1ff55cJaLo0UGLzY9xRjW3fJCQKzQ5ktG1nZ7jHAucSTHeSzk+/xlcIBHFrniIKZyxfP6DJ4wsk2plbSPXeI+ryO4LsZU9wz7GkAgSHc8WvV4a6/k5oj6vMFz3j0Lz8Wt16yewB4oGVApbbb+048PDtICrCLqarLIkVqcel9byVZhGDvfiZpRsH3pvSSXLK3E8SLROlguP4NuP0R2+YXZlY/3EwB/DJLVNS54Ss5l1qlKLj/BRFcvvKugAP7cN/2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qk7uRRZJExgOU8KtcdTh8GuweroV8aCTU7ieNhkl1oQkeHHEGfL/0lw5PFor/s5dI5GWqQp2I7vQp/tyC+wo136/dG/7pNQLr/O1Y+itaCGwlqpPNfgPutAiVq6KL9TLSB4mVAIZ+2dVnlLLIhnX3P5mk5jQZHzQbYoZ35N/7IWtrRJyclA1APSLSvPW/gBS4qZCYmkdOuwwuJHUUWHhErWl4chnkTL5KMd3v8BxnTvFKTvACLcAbVacHt9I4TePiTNSF+WL2fGMH+/SfddcgHr4DLTY/JeucQd/O081miVq1q2cyF7aQM/e/CqbHijBMTxECzNEV+qzbkxQm4WbySWTcjOtMxIsyP1xhi+TkjrYUmBAJUdFTYcbdk4jT8hWqtfBzjNXEUJSDapyr8864mQ03hT9NWXaQJYGaJy6xj3FVpdAW8jo9IIf2FzMtJ/AYUX+XHLFdKijmyYiYE751GW8xvSp7LKKee8R1Ve1QiQu3a/lpR0KzQNiRA0d4yXnl1nk4m+fFGnF6VwzsBo1E3D1v0rkDrOaxlfIHuf9vMhih8qtD+7ok2X2btXzGQu9R2UYdYXdNmff3NzjAz+17SdzNYi9KazV4Kq/bUPbkvvGAcN+VUBSqnqMOp5y3QD926Xyd2RQ0ujikZB1UHadNaZebb+BBf4basuvqpzJwp0XXrOPzGNsMfG2AkJResL6pPfnQWTpSeWsLhsf0tfsKgm13KiXUFuQiRBJAnJhjyw47kYhKhUXLvZ0mn2tV4/0gADCjKq187GyttNoZ/URywN3LUzyZbeYf4DpBbaZLBLBvkSPYLIjXWDiFLytr9a/wURs9028fRHuOq16JXbmXrVwTh/bkXIochREQlTTlbLqK7YzDRAHgOqFI9Hpn3gGAlD9nWLs2rV1Sm+/UC/3Ajpt4ZvZRMnvzX4bjDTQo/DQVem4J33+0HoXummkdqVGw9CHXQ7So1+JNGhpGv7oL6+VMVt0hRmeR9LsVZk/q8eXUVV5odILSaSM2bARHfkCDz8RxKFWsgoykucnvRFmdDK7GAiVs6bQGyOOwqKwappxWjkMiG3Bf5wwkOm2ZhHet4zZJe4iqFaShoifCdhDX5m0bCvpFV+ZAjC3SyR4PtSWsmetpQ/AEstMJTrtMdx33BXLQhuQQMpNRaznZFz3/UqwpFprn980MOAWixCNm+em33afsa40Z1nrSV8gJF6ahJEgbaPZELF7+Q0Tl0UOjxM3YTi24K5hn2Jz3dFtN5M+2T8w1+EMbfugnKq4GtHYZdEL22Q0VmrhoJ8JGewrSA+PwUN80SEr4sFEhC84aBktRf/K2ub87WyWItg/FhbE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8286b09b-9ca6-4345-1249-08daaa6d8379 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:16.1827 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 16/20] avcodec/snow: Move allocating encoder-only buffers to snowenc.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3kajxI8SP5bA Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 23 +++++++++-------------- libavcodec/snowenc.c | 16 +++++++++++++++- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 7fb1660dd6..7e93005492 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -456,10 +456,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ height= s->avctx->height; if (!FF_ALLOCZ_TYPED_ARRAY(s->spatial_idwt_buffer, width * height) || - !FF_ALLOCZ_TYPED_ARRAY(s->spatial_dwt_buffer, width * height) || //FIXME this does not belong here - !FF_ALLOCZ_TYPED_ARRAY(s->temp_dwt_buffer, width) || - !FF_ALLOCZ_TYPED_ARRAY(s->temp_idwt_buffer, width) || - !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1))) + !FF_ALLOCZ_TYPED_ARRAY(s->temp_idwt_buffer, width)) return AVERROR(ENOMEM); for(i=0; imconly_picture->linesize[0]), size); } - if (!(s->scratchbuf = av_calloc(size, 7 * MB_SIZE)) || - !(s->emu_edge_buffer = av_calloc(size, 2 * MB_SIZE + HTAPS_MAX - 1))) + if (!(s->scratchbuf = av_calloc(size, 7 * MB_SIZE))) return AVERROR(ENOMEM); } @@ -517,8 +513,8 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { for(level=s->spatial_decomposition_count-1; level>=0; level--){ for(orientation=level ? 1 : 0; orientation<4; orientation++){ SubBand *b= &s->plane[plane_index].band[level][orientation]; + ptrdiff_t offset = 0; - b->buf= s->spatial_dwt_buffer; b->level= level; b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level); b->width = (w + !(orientation&1))>>1; @@ -529,17 +525,20 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { b->buf_y_offset = 0; if(orientation&1){ - b->buf += (w+1)>>1; + offset += (w + 1) >> 1; b->buf_x_offset = (w+1)>>1; } if(orientation>1){ - b->buf += b->stride>>1; + offset += b->stride >> 1; b->buf_y_offset = b->stride_line >> 1; } - b->ibuf= s->spatial_idwt_buffer + (b->buf - s->spatial_dwt_buffer); + b->ibuf = s->spatial_idwt_buffer + offset; if(level) b->parent= &s->plane[plane_index].band[level-1][orientation]; + if (s->spatial_dwt_buffer) { /* Equivalently: if s is encoder */ + b->buf = s->spatial_dwt_buffer + offset; + } //FIXME avoid this realloc av_freep(&b->x_coeff); b->x_coeff = av_calloc((b->width + 1) * b->height + 1, @@ -601,15 +600,11 @@ av_cold void ff_snow_common_end(SnowContext *s) { int plane_index, level, orientation, i; - av_freep(&s->spatial_dwt_buffer); - av_freep(&s->temp_dwt_buffer); av_freep(&s->spatial_idwt_buffer); av_freep(&s->temp_idwt_buffer); - av_freep(&s->run_buffer); av_freep(&s->block); av_freep(&s->scratchbuf); - av_freep(&s->emu_edge_buffer); for(i=0; ilast_picture[i] && s->last_picture[i]->data[0]) { diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index fec061a8c5..b8148cbfce 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -104,7 +104,7 @@ static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2) static av_cold int encode_init(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; - int plane_index, ret; + int plane_index, ret, height, width; int i; if(s->pred == DWT_97 @@ -164,6 +164,16 @@ static av_cold int encode_init(AVCodecContext *avctx) ff_snow_alloc_blocks(s); + width = avctx->width; + height = avctx->height; + if(!FF_ALLOCZ_TYPED_ARRAY(s->spatial_dwt_buffer, width * height) || + !FF_ALLOCZ_TYPED_ARRAY(s->temp_dwt_buffer, width) || + !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1))) + return AVERROR(ENOMEM); + s->emu_edge_buffer = av_calloc(width + 128U, 2 * (2 * MB_SIZE + HTAPS_MAX - 1)); + if (!s->emu_edge_buffer) + return AVERROR(ENOMEM); + s->version=0; s->m.avctx = avctx; @@ -1986,6 +1996,10 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_snow_common_end(s); ff_rate_control_uninit(&s->m); av_frame_free(&s->input_picture); + av_freep(&s->emu_edge_buffer); + av_freep(&s->spatial_dwt_buffer); + av_freep(&s->temp_dwt_buffer); + av_freep(&s->run_buffer); for (int i = 0; i < MAX_REF_FRAMES; i++) { av_freep(&s->ref_mvs[i]); From patchwork Mon Oct 10 03:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165909pzb; Sun, 9 Oct 2022 20:14:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YV7D5OW4oVe/Y6WBPkyk/w6fKfGAUH+QYYG8CTrQizOIUSCUVABC8xTgt/++YZASdMWdD X-Received: by 2002:a17:907:2e19:b0:78c:29e0:536a with SMTP id ig25-20020a1709072e1900b0078c29e0536amr12986161ejc.506.1665371680856; Sun, 09 Oct 2022 20:14:40 -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 l17-20020a170906795100b0078d550c0272si8231544ejo.269.2022.10.09.20.14.40; Sun, 09 Oct 2022 20:14:40 -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=CMpODHle; 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 1EB5268BCC4; Mon, 10 Oct 2022 06:14:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F26168BCA7 for ; Mon, 10 Oct 2022 06:14:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MKjEz5CUHSvtx7qaDa3Kf3Mu7BLZjrUpUg19V8gofx+2gGUzNn68jXJ5XCboVLLRkTG0LLjplOLTuRmY2qXqReL7uNen2tEDYH2HJohd6wZ/JlwYv/7IqH2gqB5f+ElxTP7dAXVXJv5g3grn11vFVbz5yxcmx7Z3E2mQcZjfEksTr+ptpbshRtbAmB0AD1nWWr7zijPAmxyyPLq3MV9QS6BKOPXsMnp2FFdEAs9nvIRVQUgHSmgiEVYCRz5UnGtP6UEhzIjH2PWkwl91R6mAWq69r7D3mj7t6bSfUhHAA/5Gc06PuVtqmXu4C+srl+2u5Zz5SEowpJYw7KtyG0oQ3Q== 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=19SlYHYOOi9ZJ77QKVPZ9Q3NowlW6IEmuXSKlQ+9694=; b=OKX/MVIXbswmsxBcNfnZbzAs7duikM8sbh/holQx2wK9dljPE7q6Mprlnss1pAyuB6KGFSzNbXjcI2r5hmLq0VR8zSRBJi7vL3PHG2Hb13+HWrrjIv1NvevkR7CUt1RUXLrtI59S3ZHM3KaMHQjDqwOQO2B/E4xhvTLCptEqVsJKQ1bbQlYSzEtNmvZIWQk1TFx6IGmxl4YMjYDq06NGzY+xbfsmlx0hnU77AFyxDcEH1d22ilYn8aVhjdxn3X9SL8p7czSvDcMb9TaCanrI1h8GBrAHhMQQmDg4EBNvxGfhFUiFiquaGhmvRYIDyZ2a/MJMhdshrX+71ue0AeLEQw== 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=19SlYHYOOi9ZJ77QKVPZ9Q3NowlW6IEmuXSKlQ+9694=; b=CMpODHlegklSwEOz33ruFQTU4m4Gf3kld6lVm2CwdoX0JT5ZC+YZ7BwdrIK982maoqa8hyOfslr2aReSIZPO3bRo2dJl3pjq2O2sxd53Tk5gBOXbSmLw15x6824qgOxbiq2OFurDdazO8xF5ueoRpYVeHjAScgPH10qPn8cDdaBo+2iDw9qGVeQkCoOYtAUoI6fZQw39TIuqv318EY+j5xZtaq0aQwZgovgTxOUp+4H65Y9aFeysCRQN4gYAgz9hRnOCLd5FN4Gq+6OiP1OqbxXlFuYX7vIbex8xtA8TLDKiNFpcQ3RvfPIXgEC2pj3mQS2NFfLcE26jzc0fre8LqA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/JKbyakPY22oJJEgGdRnIJKstjhc9YKr8gV2gw5jv+g=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 8061cdf4-97be-49f0-bb94-08daaa6d8473 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzRAqk0BkaiLoSbtHjOJkGIzl3KHIlO/Yr//uwlPyKnz2AqOelDyb+NjSWg/H0qHtJ9dineIZcLOzZw9lxdktX0fusTRgzXNJ8mLZJMp6SrQsUxg3wQOF/FMBNdVu/mx7Aebh4PXkiKmAwJXc9WBGnbmkKRpYoimJJvuEfL8hJIMzcJNTj1jDAqn5fJhgRZPXXK4vHw9M9jm6AdheY2EUGWSzIDgt2afQ8Gd9GTYjqVVkn15Zl8DD4VfJWDuEEv8xXEaoFVEt0beNNrsIyzT40OV2stOIPqrZhqtUIuh2eNVhRUBl8GTHjL9ZDtabzpKcUE7LknNolFJ1PNX78hRXPwMCiZlleJbtxLr07ZgvkQRcecQQqzbFPY/Vx891B9eWCei5v5sOPbzzPxj7pOBCkathemaBRaJIDdWvW1zGV6ik/7kKREQTfbBHBUPiiPw7RG9EFxDYsiYpcQwD8gbjN0OALgx6VaqXXAwkkV6IRWdf4knBisffdLIexqv7n23c1hlIap/xqk8FjfM5wEw2CHnuL2oMM6xzSkn4OmQ4E3EOjPBm98XWQPS0gUoA/3Q9kAFjgw9RjlhHxKFvPG8m2KtTobSDss2fBTOEInunfF3Rr7OCy4ihdr4O8CGGZM/XSloFqFyy+MPx6DrWnZoohizHLTuL+/3jIzmFXUZLhe1RZt/Lf75kUSO/NPkzcSsz+/mAULjPgZnZNID0c2KhC+n8Y6wDLftHI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UYHuINnCR8PEEINu0w115JKFdeFnCgEIMIoiw7xzHtWY/Qa6jOXeboD56uyoEVSDqyrBllXaKjOHVefD8AKR7Ci1FuFracZAnBAOH8RWXIMFdZt0R1G/K3ExfWoB5szSC9r8s7CTDtb+50kmdF0s76zJ3wKEHoKV3h19NTD+G7bm/VRCGA8q/M6pc8xJCZk6uyVjJFUfsLyGZW3LP+1T3JTIaSVJ3gTFnivoHPv5HY5cMzcsVilElNtVcCnfn8UHONvzzQeEqsaHfDjKCaZD3B2ATM9DD1cMydwbnkAKZ83fySKtavug9w+rTC7x+i996lg1NxQkbPHRTZ/JYyyOIPCoFUy2aeNCG0RaCA+u+OEqfC4c78ywTHP8IxiC80NaDuORnQWUcAeh6FwMZGbAH09EQWjtbX/OVM8JV3gVLLOld0Yvbdu0LTQkBtg/TaCWu0/mlN9drjbYxh9CqV3589WnBFbuv+9MKjEznPcWBcca80Rq38pawyyT+ULROViXt/reWU8y13cUn8bKMJxmfIApZIAjbstHU9QozPh1cPpUYuBEXncAvwdwZ+ZkF1+s+979C42gtJtNAe+ivcMIAlPfhi4kZ3KRdKA+y9ChcLDpLu9KOBV0MoJzUCvtoSP0CAPoNJUcX+S08tc7KiQG9vNZZZ00gY+n3ice/IjqKswu7A0Z2pRi5xs60XKLKivf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L501JvJU6oDPQwKH/agJ74tGGFIBo40jSBPZdhJz8zx+iWMQ5HLc3KpYXycXu5vxcMSiRXxFhPcSNPOW3DhzRcWkQVLHU1CRLVpkr9TQvnYURow4aXa52vjgXSRDW4tuuFMnzPXS5gks7f2KDeaGY5VX0XQB0+JGxSe37aUa6Vs+g91/g7GMFDdtNzLVnZyd6K75L+nFpbgQ9xyJ5+rhlBcjt8S3t2RLKv1eT82RLI98LBfVtx0SfR0K9K+StMYMfQZ6ddJ68eQ+4fzUEm06NHm2dguDtbSj5jDjlnhE1iLE+h0pMmh4bevCNFmzFPAqf+d9xKA8vHskrNIkhNoFue8prPX3BKL/ed8O3Ko0PXIr85N4EfGpORfzZ+gz2ekJxlOQw9Lv21NMCzeS06G9LaLLHpITHDmriGFe7ePtiHC4kc8tBzq1HBCiFV6dUtFxLew9iVlg4KlbgtVWNNtto9xXes7PolgOCPYC6PD2LMPCPqdqPrG15LJBtJ/Foh9iNs0pz3uqHtCAYTrOearKchjhLqpFouSaDUD3MgKtvJ5s0kYcHSeMtcyoSz4BLwwHoa/UG9OXZATbrBKB0xcuLTkUyF0V6xeoFfPxREkV2cy1G8DLAbbnIZ+gbIEkPMTbdDP75SJ05Rl+Kj4M8IciPRZSUtYQzw654agYirW2qgT3mCIav0Rw3Vy/Ll0tyv0hJEnofXr/u0NZCbYWweba8LB9wITue2vAVy4po4rs00K8DMoemK/Bnjj1G/tRwVyiyofXWISD63PStmybl2OGTreBzFDOhNmQcjQq0qegC+/DLZS7oAdSYvHS2GjX3vabZVKzI3fnitpUeDgnu9ma2vX3+1fHJCyF0QupQpG2fAxHEKSpExT7U5IJZ2YVLcHAPt8fVtjcZ2fhfS7aRvoxHt1S/0jCw5Rfg4C0vyDIQjviFE0Bk8gmmICbLCr2lCtgGErNznAYWtRP/rdIiZX73S8RjsYuph4zGcsrY0cIGVgHKF19ZfgMtFEqScROqJLU/qeP8wzGW/qZ2jrfUum4vFquvcLMEURVCg+WRdSlcYbUSd7yegWlw+YS+VE1E2x5wuesrdMTkRmjGTBMCYvnn5MFFoGn5dxRtBHMmDoRJkVb1pN4FOvvv4hS+UmSr//LgLUlEVedtb0pqqYv48yMXTXm/na1Pggirx+71x51qEjTcLKtv5j6Tym5x9eu6HSjyeOodhve26Chl6Wnd1mzq8DzF935qXgSw9OghTpZvo4IhGZhV1RiXI9kVIW2F6WLMVjsugn+xtTNKhghTIL0UszczkBWaT79jdHyyb6+tTmEvE5hDDydkY+8mJ5wNAlE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8061cdf4-97be-49f0-bb94-08daaa6d8473 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:17.8243 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 17/20] avcodec/snow: Remove outdated assert 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: Qm6Q+YeaiVaW It comes from a time before frames were refcounted; it has indeed been added in a follow-up commit to c13e490dce1a66d79e1f053d8a38fb9b2eb53267: "codec_release_buffer: fix handling of non user buffers". This type of check is obsolete now. Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 7e93005492..dcd6d67ad5 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -607,9 +607,6 @@ av_cold void ff_snow_common_end(SnowContext *s) av_freep(&s->scratchbuf); for(i=0; ilast_picture[i] && s->last_picture[i]->data[0]) { - av_assert0(s->last_picture[i]->data[0] != s->current_picture->data[0]); - } av_frame_free(&s->last_picture[i]); } From patchwork Mon Oct 10 03:13:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165950pzb; Sun, 9 Oct 2022 20:14:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6kqQ/L2qOvTww4WmXA0l3Neni6k9fxqTWTvLMn0s6HQ4gQcZ6aeTr9olKevmBDSV/4NzzQ X-Received: by 2002:a05:6402:2707:b0:45b:8470:9147 with SMTP id y7-20020a056402270700b0045b84709147mr9549064edd.215.1665371689033; Sun, 09 Oct 2022 20:14:49 -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 ti5-20020a170907c20500b0078d949dfbfesi6314554ejc.71.2022.10.09.20.14.48; Sun, 09 Oct 2022 20:14:49 -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=dMaZ0tyE; 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 27DD068BCC9; Mon, 10 Oct 2022 06:14:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2108.outbound.protection.outlook.com [40.92.91.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E82CE68BCC8 for ; Mon, 10 Oct 2022 06:14:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b78g+yFKc80WaSklPPQToUt7uFzadMxHIEggeOpt2wA4XYoPLIYOpi5tF0CZkzTRer2DTjeg84nZp/8zoLTbVQTSKtYJRFUp/3Ut/g6XyRjYYFln4qPUOjXIiONG5OiUlOLwUhJZUBwJZ1K17HoWvrgPezI5J9a0Ir7IaZpz6ThO6DvYgxVuCHCOJiAldpY3FJu7Qf7+oZhv475ydW4nnDxsGygokZk0cjG8tvRhhXkzC9RQvVGMRubepkKFl8kjjVH3XXM8gGJR4MaQ/ZhBGw5vsj90Le+BoM+vXYmv2R0/ZMBBIWESffg+NVSLCl/7hpxo6+OaRcQg8PabwYQvSA== 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=GStYSfnqpN+edbbFentw/otZKmhFzxRtQcEEqRQD7Gw=; b=Kv6MFoj+Y9CRP0fk4RJ9BOJ5B1Kpb1Pxz3OIxa/NHeCH3xHd2skaiBxyttteYD55SScl3RdvQ5CFkVepH+iY7YY6K1k7yh9s89cpR4DOr7erhDTsIPglFXjFLAgmebWInSWg9zR95oHgQ3wN2DO2jTUpEQ7h+hV0tDF/UDFKkXqvYNhVAQqMbz9aVv3I+FvqFBSyDixVvbpdp4lpNPZHGLJt8tYxGEcHo4pNFlEkAe9Sj9G2sk5RyE4t7deBhsvNrPmslHwCF7VK4KACHiSad6oM3hzSppBYO2YVGlbc4ed7LH79InDKIn+WUkN7GtUyNecHjYtmDI76ce5KOUYOYw== 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=GStYSfnqpN+edbbFentw/otZKmhFzxRtQcEEqRQD7Gw=; b=dMaZ0tyEHeIfPy5nN0nofGHRZEwSHgR3kIxlPGcb+MXOkwr8w5upUyXjjBPm61tvBiTI2QnX2EcOt40AED7IzOTKylREyVMgge5hMdNDqOu30Skbe9JITcd8BMYaYDinyL83FrQ76huuG+JklGcfe84sm+qFHnTRZl1S9Ma9I8eUxpfWQAPKCgbVP0iiboBbMvdv9eENusV+u2f65n+Y5NLz7zCn8hTmXJGbvIr5df5gHLbHnnYIm9dpViACNmq4MYFtdEiRC9x2MsFdBnIWw6mrsk365oUAAfStOBHgcrvKdmficPxvq81hzfkSeAdWwXulxLITidIqXXmAbEuTyg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:24 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [emW0OlAvFkDJT5otoaaTPS3tUhMSzowTJtiHKNMa2C4=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 6520e06d-71b2-4e15-4f8b-08daaa6d887c X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzRAqk0BkaiLoSbtHjOJkGIquMSaF9FRWgRNi8mvNqOVlkYANaWWR405+iC6aA/MQ4kecklDjafzaT5ZrBHgSJgd7D27SO7rGQ8hrCL7CDl7G4vd1t1hfcY5uBw8BpW2QHy5Zh/X4HGL5HKOB1kqIAWyE2jiRCPi/yD2/dtel/2dqxetnxRkZHDtB8qGEecMc57xXJgonjB6DEIMBfFTY2zC4NNfGUtzwHOxLnM4ckunRtRSdE4i827bg4tUSwI+/fWus6H1qQ8+o/D+wFyl5j7ZJTxfAoOyPOSOodcZRjHDNklywROJy7CrvCDQlvjQUD2XEffbOkNXowN5r+bimkuSLgLs9cCIMb0jiw8hIWsP+MVpuofhvkk4FLc33yFq/GsafMqihcgzViDLSNkcz1EzKfCYsVPL2VB7he1GtoGt7q9SOE8GE5Ejhhu5OToJvOyVDpXRmcYjQh3cyt1D/IB344KIpzsWe3RNpCE7+0Kr2bXuSdEyqt0bry5SRXEBXIkNUM39SJpvV00GyGj0keMOMJAourcbb+ULEYUrX7mrHogEl2QwLRKYXfUaw7+GPp11yBUy0KjyRVblr74TqOFipQJYmb7q6Ht31dP5ReX/5MfOOekKcOM/bVJotiMFGSLQUEMVMLm9f4tTi1rlN6hrShctkS2t6MezCnJMGssnF1EJRjw8bOpYs4Uu3lJjS6OVT4R/3jhm4YZn0ohAWxOdeu9eDoJnmo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z3p+UH6nR7ytRkNYgK7DWd73GJFN6xrKtvv8WS5wRgpkBxIkcDKxhKpoLYQwSnT8sG+y+YBa7aqDZXEQfdSjJ2xGz1irrg0m+Ay3xDY0VFti6W83wfaRxu8mmUIRTFfR+QaBPBitk6H5yUeff1VQnLxz+G20Lkk/qTJsnIsTFC8OzqdxV/kR7dIE1wlfZsTWmin/fE8cV447XKqe+S6DdDhhkcTw+gXuoo9f8vJ1LzQRkQxQPQ8f4QbgWrTU1FIPU/AG5GC7ZacRXgePZnjmfeOEztzVZuaTZyQ1hq48TgDRPTYd2yLwFbAMQsdrQiMlRZJ6vTzJQfEawK8hEcyF/d6XPvtM3waqPehg8e9OVoHWvB4wSyONfCLUMcyRqQsYqbYX8Vt2s3junJlALnCj7e4JHr4v4A/ReBVcelDULNHEHzAEE6/rDEOQmpIb7ZaFDhA3hustIMXz7BVi8ZkRzoro1sG061s7jikCF+e2yl/CDZfmyFR8LjxqnrII3LtU9S3HcaJRQyi3RBqXWUUx0dLVorA6nJWbZgGPuL7rL+6rVacl/KQZBFLSp/pW25YCiqvgg8qq4kjdONfLcC/jQRUfdXe2SMTO9ZF1RzEs61sMP91TvwcvPuGUaKEmdPfVnQCvHKc4/PjizVslUS8kVy65pqkkoNh9ttHwelHQZIkjCigc334jkqTFL4gt9uUx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6AJddqFMVPrrR7vLqzS9EIJHfpcndNvuQqtROTRubTvmBqPNsiWskUe7RYZupqlgm3JSTt3JnYpRF6vfJfU5OW5a02QqOGS/riRMhR5hknI1iOucNkbZeMT4HNstzdSKwYDSdnfpmE+7X8z2u1K+nC+qAUl1SQZY+gcHDLXSl4e1UM/W7dMcoodWFYtVtV4ZWZFhXtCsdi7HDR0ZFCyyojswfNt0ZSSlE9mLOKNm4c3Ec/QCi5b7SKeoblx/7BEHvveaRFzHD1SzX66kWzEmibSg7t9louwgyLF97ahGl9LHGp8ls3ICyDO5oxYRtLQgoYb0RekZZ8C9YB1aBHULIVlup11/bjnyWjTM7voKghevSrMfTcr1IjhJ6PT/VAdrkeKYejgFPOJZgUyc5iPUCbKzrR0Xwg0ZuToGD2lkN2fzUQVauK4YLuQ+5vodHdbUXw/Cfpx096RGxwqhjdAUJk+OswPTbhKO09IvlI8ggXkomGwA8i2UlD2veTD+GBzTIZLIs9Cd1eP1lGHm6+X039B63ZsXqcLIpLf8geI7lFcLGL00jkQTCIQQNEgGxHAgkeJ+xS4YPOzP3EzeyC5jh6eK5YXnUL3g0t8LgTxDGgtTxTTlP+AuiSPqFUbTzt/tnMR32+8MugsBi8TH25rNv0RbzqS0UBFpuwKd9RoE1rV+UVb3VmBgOO6l1sE4i5cpe9lsFi3M2KYB/cToD+zandGBQFiI2ZgMm5tkqyjGxcMGxypzRlhVBx+5554MY3TRwkeNf+DnbkzizpvLJcw8rxTLf8YM64oxTqc2fNT1+UYZleGd1P3ZNv6mOayxuwTYg5ZkNT0LumL025VqZorqBKVYHeeS7dmCqJJWdv/ek6YJrIaw7oyGy7pUl4PuXgWrtz/tBQN+3mAEDMrx762dvVKKvUPOSgqWXpDLLy5lJCDMv5w6I3VeK0u7ZpqP2RP7oZGesE23kAV4/YhDgQv2r1IQy6Y/NG2ppJByjzQwXI8qBG9qj5n9MIwb9aOHgCTb1ATrMLL6m9WYMmA/vy28CpEWutgjDuBCxVs0jYzvzc7CGsLMaGdTg0olRS510FO8HFrQ3rs3mrxdMAWxD19wVfvy7+mqk1RGHu1dOF+2HDLXvdZkmrntfWz78+tKtrwJUmgMwGxhSRlkKTGtKR/WqjrovP4H01OF4fu5ihvRHKe8s/rW11NVGjd1saJSA0mm1FSlZKV0nCmVmDBgFQZzvqpL68cBVHMZiPZMq8QGFG0nOVmBpohQDMZB4NTq2tb6FBbDG+JI29lmhUktwsrSugjFwkMc08HyueJLGU3G+P0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6520e06d-71b2-4e15-4f8b-08daaa6d887c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:24.6070 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 18/20] avcodec/snow: Only allocate x_coeffs for decoder 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: VRncjRZEGlLQ Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 17 +++-------------- libavcodec/snowdec.c | 9 +++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index dcd6d67ad5..52ab39bfd4 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -538,13 +538,14 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { b->parent= &s->plane[plane_index].band[level-1][orientation]; if (s->spatial_dwt_buffer) { /* Equivalently: if s is encoder */ b->buf = s->spatial_dwt_buffer + offset; - } + } else { //FIXME avoid this realloc av_freep(&b->x_coeff); b->x_coeff = av_calloc((b->width + 1) * b->height + 1, sizeof(*b->x_coeff)); if (!b->x_coeff) return AVERROR(ENOMEM); + } } w= (w+1)>>1; h= (h+1)>>1; @@ -598,26 +599,14 @@ int ff_snow_frame_start(SnowContext *s){ av_cold void ff_snow_common_end(SnowContext *s) { - int plane_index, level, orientation, i; - av_freep(&s->spatial_idwt_buffer); av_freep(&s->temp_idwt_buffer); av_freep(&s->block); av_freep(&s->scratchbuf); - for(i=0; ilast_picture[i]); - } - - for(plane_index=0; plane_index < MAX_PLANES; plane_index++){ - for(level=MAX_DECOMPOSITIONS-1; level>=0; level--){ - for(orientation=level ? 1 : 0; orientation<4; orientation++){ - SubBand *b= &s->plane[plane_index].band[level][orientation]; - av_freep(&b->x_coeff); - } - } - } av_frame_free(&s->current_picture); } diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 17c7ccaf2c..13948398b0 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -793,6 +793,15 @@ static av_cold int decode_end(AVCodecContext *avctx) ff_snow_common_end(s); + for (int plane_index = 0; plane_index < MAX_PLANES; plane_index++){ + for (int level = MAX_DECOMPOSITIONS - 1; level >= 0; level--) { + for (int orientation = level ? 1 : 0; orientation < 4; orientation++){ + SubBand *b = &s->plane[plane_index].band[level][orientation]; + + av_freep(&b->x_coeff); + } + } + } av_frame_free(&s->mconly_picture); s->avmv_size = 0; From patchwork Mon Oct 10 03:13:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165984pzb; Sun, 9 Oct 2022 20:14:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7QLNLYcPhVttTFn+B7fyRklr99nKCp1zSR4M5sArho0VNfdADlIucYzvbdRiozLmTtxyEe X-Received: by 2002:a17:907:7621:b0:741:6656:bd14 with SMTP id jy1-20020a170907762100b007416656bd14mr12975570ejc.298.1665371697378; Sun, 09 Oct 2022 20:14: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 q22-20020a50c356000000b00458bb34ee93si8457298edb.149.2022.10.09.20.14.57; Sun, 09 Oct 2022 20:14: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=n4Imv9ds; 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 3A6C768BCD1; Mon, 10 Oct 2022 06:14:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2035.outbound.protection.outlook.com [40.92.91.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4109068BCCB for ; Mon, 10 Oct 2022 06:14:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HYqbpmcafxmskCVMm0B6N2ciEEliOhNArqA61eJbJq80E4OBGfrqHYz23CrdVij9ERTwmY2180VmPst2hGCb06vosFZELO+m5uhNCu2VB2CDAuVi8vep7N4xewmIIfwlQdaB2piRVdrnwt9pEJsrVjojSVZFcDVvTsDcnI0I8TIkIFtdDaI4DpRqr/AXaMKBdUTJlIIOZQ2DFGTQDcZ0FGw3eNgFXtXOT/Cuw1gTXhQeXS7fP7U53xpWtKxndu4hIp2DIbG+mdSWJxURcBxksDQTcF6bQ9g69CNP1Ob5phM4ZkCDAJnijmBooMaqD0fRFH70Qy4rGALTH08sRTegXw== 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=5u7xBNkRdyUHjYQDWbr8/N1jyXvcaZ6EZEjN/G3hdqw=; b=Y4a3J9fpU9DO09raWaUT0ngVC2H0hw1dWXIZEDfbdxccnqOjmIgZbByq6CzDASrNr7BpI6okANPg4DPGD8sS7XbvwIhl3RFhP/k3YRi0JfDP7LOioMnROJsfFD8CZfNrY8X8tLMrTzq4VaSKM8pgZkJ243rmyvSJQu8W5eEJl1p5hUxgPRLV1PjHTqzs29rMkBRlS7pnvFecpmh9DrL3kV/87DuKyfqGIT+q+3i2lAda5y4Xh7eH4r2ntDBHd8dzciKkolAV5+BHlbc97Nws+VIoXBObbvyN018wwgjLENFr2Qbp71M0f8/FLrxqusb5BStwxq7lq8S7stQG8YsGJA== 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=5u7xBNkRdyUHjYQDWbr8/N1jyXvcaZ6EZEjN/G3hdqw=; b=n4Imv9dsZeRROybmP+JmyUnDetgUzIv9gz+e01yzVXaeRnamPhNa23j4NwseaXUSgAqkn9XSgmfq8signXKo0MyNurCZhbhFXKVXyFFv8WKk5eQu9Bs1R8AjHENAlOZrwtQcYuIKeNYNPvuA7E4Q7g5jxPhjADc46RFdpWRYWi/w+COgr/4/10MJe/3aT7ofMjAzSV2Y/V6+rRLWtwnodL0z4D2O+WfjdtN1Ze/LFyF0VKbovzB2nGdQGx5EcfizPpvQBe9rrhDIsYXMtgcCL/+V7JxFstzPM02Kg5oQYkdWGFgPW9vccHQdCTQ05CpEnun5ePOcDJ+BZtaQiOKuMA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [yTYVfa0kJHhH02EqMMGexZ7NO+xhzqtJznbs+kPhRFY=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 1249e811-8b73-4fb4-a9ff-08daaa6d89c0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHUqXHb3bKxQxtw1VCEJ981+jcN1R/qLq8MIDsD754SQs8AEe7BL3gSRNmVzgP07N/phF0mDoQZPPeet+rd+LcccmXV1eixppU692mESUjNx3kZa1gzEv/Yjq6X/PQQcbcrhFwtWYb2c9U2brDnTEGIM+GT4lBd/rUsEKSwbFDcmS1BhGlpU5DlxmsPzLuscABctn/b+lBT9s5TUGJK9wwyGa/GKxzGLfotyg7lR5kOtU/q80mI98tn4uq+4mokBcbVS9HM13zQazNDWsBagMAD8UowE3peFDSlhT+7i3hPZ3mFU8wic7LXg4aig95mW1rXqYCdQWOKbzY7SIkQn/3fccy+0/583p1ecpYPS7e0IknUZ6bXEpu/utobtaTGzseYVz9x7/60AVX8Gstaa3J9HzNfo0uDdZYliESfeFHyXy9wLEpuC/yyLjbm+9eF0rc0UQ66ycRTIFFG3qWiAq4w3JrGK47v2+MLbTUr7g2jQ9mz+HOt/DR7XqNYc7nktkWQ3kYN88UkNn9f6Sb5qxE6PAo02hQtqHLDb0jqp3/AHxV3tzmcpH47SIMIX/6vhJf219oASyh0dpgkCnJBId8nP/Ay5UA/K4orjuA4yIEjOd9m/XIf05M9u//8cfUKqFItzItHuc95m51x3v/urrdvJqzSxpJgkh+pSzez7qslpJ/Q4OUC47I1yRCzyoPGTkroSbkmCpoI1E5GGq4FZakNHxGWKSUWt/iaojlhS/lVq0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pFbV2fy8KmcOMeOt8dCJFoKprbCw26snaOKmRIum2PIE4XEDbyviJqhrltPvC3oR5hFRZFIsYHkZxHRPacT4knVQTuGW7aQ+k+fIMvEcX9ImA/eh3B9KJZ8v7prKUgbB/q7thfiG5OEmnVep0upoTNJdWVQ1P0BotJg/T1plIxuWPODbBYS4ECUnenB+0wnli0LDA1tiehtDgJ436c80YDU9EL9pjnrptaBZz2+xbWDSI8zldJQhJ22xBUQh5KurMooPqxJ5x4yHNhV0Fsph+fWe3TOJnsPHA7czmruFJsNIvpxuMS0K6GGY1JtTTLNitr97Yc1+JoeiIISCYZyPyrCwJW++/qjStQCdCG3SVsNl9+rVH/5OjddHwPK8ASEfhcFZoim/RvrdhbGsIr50C7b25e7Z9tTSzfgoxpwPvuu9m/vVI5CMtgcLOcgAqFjxOY553VPmzwfhe6lkjOrXx9dgnqKQSltCLV3/6Y5lUsTm6KVAlMjDyOkW6uE5Hu42h0n8W0iHHOAMyEkUJ/crMhUDFXcR449VpUlJH8bDCcD4eL/28o+52g4IMsrPUG5XEzlCIv6rPrwhqz/PnfzIirS1FHNKfG1G8at+L21ZZ26gcJ+p6aAC80x8gCaCIsd/sSvwPwvT2M5dyATBi6S1f3hM8nrWeQoOf9UaBAA0X5sVPO+o5ls1RHcIYHRL6iho X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tbS2OEuuivaD/hrdfYvTifN/k5Qtt6uEjuQ64HYUNTlAXntkBKSJbc8Y5MtgnLcNtco4dO4UafFdAK+fOORFDbx1dhvaan5qOiJ9xMYuFrEQZQO0aTEv8U42XDAutIOAxqOHgNzpGkWHPQFmsMCgRVkXEKukzssplo0bY2Mh09r7wxa2kVRfAIYDbesMetV7lSq0kTicatGZr0gb8wN7OhehY0NSLPsXXJzvUNkiKM3ctkO4VSgblYaRtb7cO7IKBPf2+qrpWI9hblHaLi0iDGHv/VBjt4CT0RHV6CkZnGF9HcoFka1kpAX5pwoRQEVEju0xxpdaM+QyReZAiq5llUN1eEmHw09hJGyIbMppwuTY0xVn+8B0UZfgSRWrcpTTjvEskN0Hc9F13BskwAGbNoIZrCWU1MhoO92+voecvYvaz32ERMfJswi8S783EXcgZFrVgbM1ljlqYg0a1L+bXJG9BG3UmVZ2pkGBMAuiC/jmj2aVK21LIeqLIzjhxAKnyLU9BcPV9el4QCSyE1wyNgqfo2I1WaLG9lx10Lb00Rq2bSqawzXDpomM2jcEKtgsCyIwSTGoqa8nCLC9j90ST3My9b3Qx2u7TAq03+eHsKyF3D72gIHH2HlEQJzIUpxp2fvY6BCf699u69bUVPMNOGNuII6zhIRkVJG95qQ7/TpQFzCqcwyoVbEt1LslKaI9sAKfwYIOe7ITOzrMaqpjv63LbyRhIARITKMWp3J89N9Tu/zmnd1c1y9qi0CjDzihn/e+mL1mGsKak2TrO9QbtNFRID7VLYlVN8Z3plJmkAalD4JGt5oULlLH5Fy+uaAbKOejj1a4Opdc+vLF1STLDwIsUd7lplLVoeONDM11CFVFgt2G8CoNrsdiZPw/ua2Wv2ZX0iDN34QSg0Gm3Lly4uq+9iI4yGoN2tTmDYGDXzFYl26ls+q0RH+axCdyuBPIWBV1k7HYNLD/U5fZGkkDA52peIY/xzlcGtJLR6XH985iH2XmAgy3p1OCI+bGK24fnlpr81gWmqyPDRZOP4+ZSCn1WhxWrAk1d9gQ9aMcuDqmxnZJiYlwmJm/WBbpxT9uqfIeHEV6iQfGz0mqMsj5R7/7l2hM56+xzMhBS+lX9Z5WqnKnjvLkw5gGSx/REeQpFEXqvHCEyKXiJgMffz5znOsbpc4YeXVWdX3V/DNMntBejh2r365CQq9zCQuM6ZyfNj5MZcxQliShxoo0skkcF1E/2zSnYeiPtoLljiH0o/yVZ/zZsYrXJvTG+iW9oDOqE9zzxPdYq0kvKVGMLoy/4hzsR21S+QYxVGKpZTRG4d8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1249e811-8b73-4fb4-a9ff-08daaa6d89c0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:26.7483 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 19/20] avcodec/snow: Reindent after previous commit 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: 97dm66fLW3ks Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 52ab39bfd4..ca43550f20 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -539,12 +539,12 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { if (s->spatial_dwt_buffer) { /* Equivalently: if s is encoder */ b->buf = s->spatial_dwt_buffer + offset; } else { - //FIXME avoid this realloc - av_freep(&b->x_coeff); - b->x_coeff = av_calloc((b->width + 1) * b->height + 1, - sizeof(*b->x_coeff)); - if (!b->x_coeff) - return AVERROR(ENOMEM); + //FIXME avoid this realloc + av_freep(&b->x_coeff); + b->x_coeff = av_calloc((b->width + 1) * b->height + 1, + sizeof(*b->x_coeff)); + if (!b->x_coeff) + return AVERROR(ENOMEM); } } w= (w+1)>>1; From patchwork Mon Oct 10 03:13:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38648 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp166300pzb; Sun, 9 Oct 2022 20:15:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7X0xPQFQYmDqiMXCzPBIZPyheCV92iJgqZpGXbDOFq/s6PC4lecGx5LTzbpS7VM4AKI4F0 X-Received: by 2002:a17:907:62a1:b0:781:b320:90c0 with SMTP id nd33-20020a17090762a100b00781b32090c0mr12716409ejc.255.1665371705997; Sun, 09 Oct 2022 20:15:05 -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 mj4-20020a170906af8400b0073cd848ae8asi9310319ejb.321.2022.10.09.20.15.05; Sun, 09 Oct 2022 20:15:05 -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=ahgSY3ge; 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 46A8668BCD6; Mon, 10 Oct 2022 06:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2036.outbound.protection.outlook.com [40.92.91.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECC1668BCCB for ; Mon, 10 Oct 2022 06:14:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgGdJMwkA0I4ecXlB1D+D67cxWN28VXEwiCzCuf4cNEfejVbwFmnd4I3NJsoJVPOmwpdqQYFSprM9zUB+EMm47GFtOBJf+utakcxSGiM/ZcQE/qA05lRXEDqnDEqykyMgYILohKP4ilJTavvCvtRVNRdiQ36F2Gnj/RSFvCYV8nEjHCfsRNdMpCppNcZQ9bEFa9KaEcTXn25mqlHxIpMqaxLlrA7fpsyf17yWK4sPVp1TqOGx590QqUwqkIcqJA0BlEHX2mtjsxEOyUWRKIrXhwJ56W7S9j5oLFrSDxro87G4dxLgfQC5woqDcyDl5WwUv6xB1x2muVcgZ/I7K5s5w== 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=pUcMjwXL7GaSO05SlJ1yWhC31FfxHNIGDoYinFAI1yE=; b=DmXvJZLuYTwclDL/3pRppJi0ycMCglM4GZpD0m6sECXqqSinna2t0i6V08rO7GoLDnat7ceJJmMvPH/nmOTUu5SzgAhpUeb4u089d1UAAqHtwZt1PwnjCaDJg8bXq1OAtYwu84TjlgE7UXlp+vgjrdzLKkZ3pAywzLq7sIaTMF33bdVH0dq61aj0d6iv0NHyJm29VSWJUjTL5ZG6E3waim8kIboapb9Sxw2fZWnLlncx5BEkatxf1FCqqJdXVm/xx7b+7nv3rdMCsJf4e1Fmn4MdWfmivANe6h22tBtq1OSkWBhd2uD73KegvMtqx/fcTgx1sgLRYNvXLUhkEiH44g== 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=pUcMjwXL7GaSO05SlJ1yWhC31FfxHNIGDoYinFAI1yE=; b=ahgSY3geH1iXicSEDyIdJp8ZtNN4MVHrr1wAzJAfZZVgwMlzHDnGm3qyXWNXllVFrvLtUqWfR2ANa88zh3paylexOfZRTZUCiD/RW1qLtAvL+/4mNbeL33G+thcYFEIS/EusuqIh7h4vJrtcxogjUeCxbBRd7VYgzJPFHxvUvgEAQWOQB/yjG8HsIqXChMXWvK4G6zpbepkFK7istRW0wkfQHyFd1EqqA9JBDka2BwmUuKGrn7/RZdZOrEHhNmKyXQBJf2Udebz8GJbNEM4OrJSVN8J3wkHbpXmGhpFqHT5ziXh20Fb17CPz1pHzIE8233kV4zA2VJFCiIZ/ucRIzA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [vDdQgXMvzL5q732vT/yBtKyb9ANP9gwvcSfytPhfRM8=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: ef9b5d40-ca0f-4099-1a2e-08daaa6d8ada X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHqHGvyAeIcodnmqYIaCfAmRHAp1KjAHBiPJkT4MZ6a6rIyoUWIRYOQstzUzFGqehslxrrk8QKTXLL9fcSlnmVwRMSyDRZf6rr5pOGmKIFG8yNRUbTp1UspgeGASmMqfwHUEahXFi/nRMBQ5bAhOF/BAzRO4sBs1JO7SJ1NP77y0NKfnVrfWicaCTA+wR/aww0frinVlVpbmCe/AGI3l5QE9AcH45N6NIZTtzJ+fkto/GkkT+6jyxz4mlKSBeS25Oxr0LEv4X4vqI3wQIdOzTuYaUB6XgLz72gy26wABtQ44ybXzJwgylVZToXBywNxcF5Pok2OY2GObOdtWTUPRWG6O0lmtFkI0t2bnJZoJ4caHm3OTv4H3h5ldV2heEdd69h3kgyZ67ZNtEfaa9qu5gnkdxlMRgGc7hLf0j6gRaDwkwZnaS5lZ0wg8unfX1mI7bMgN8GIQXMSYKfpLH9b0HtY7Sc6J9QqEeqdCsjawf2u++Euqu4Z0wId2PBPkBVneTTjGCzU+I8WC3pFzu6Dso4ZK92T4oo8BA2OBDXj9RUYxmDAnFGdWi2G9T2e0MpCeJfblEOmqE5ZS6F6dROgAGzOAAiVxxhnpiVOX4S0DS2ASh61ATaxQ7IWPIT5mTJT6cp+hHVDn68qX0wgpxAOnM3ER6E9X9T3JdLvLScb9cbWiTbCh540JoSoiOhzJCnQEWx+IY1O4B3IqPSZMDwVHcmxTBj86M4O/e1XM6PrYMV0As= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P0c/yOKkprAXTGnTNLq3YDI8zJMGZlXM3ejnmm8S5rsSkfABjJOvYV7mY1k/c7QTUDS+7mPBudi/IaLph6JfwdfK5QuGmympHmBzrkYASHi0EDTxSTapPl4Kx4QZl89MX9OYNSPF4VWPGeUlkp5qUVTsxdjlPUndlID1UJrMhrCvMwA1MrarQ938llWD+7jNjCCVkttCKKgOHUL7JlU0NfxWN19i7GiAL/DZOxsYku1DyObk7Gwikn8Eg7I+BInGuLsWHNLShb1Kx2wI8YGxxObEz5hD/MYlqbNLSEzCzRczLXxbYTAUdbhar7Z5fmotFmwG3Mlnvy78SfN8FzFUei3nORQYNgToxkOtKEwY+QJQ7nQTO1BzhElZzzD7RWCyhr8kra4uHNNn30s/sXkMGZZuPv5C8leVVrsf62UoOY83ex+IdhO8auYq7kyv6TKwIc7FIOW+LQH9vpmRKj3p5AFGrJpsaigNoWiH/q+QFZhLBZCncce38t55S1BeYE/BPYEDVpuXuGVvMRNUYnuLFF7QKgPFYYlQMxxyb9MLs9S9VkxhP/8oueynGRAd04EcJdb/f/R4Yonupb3tAMw27OhLPTlvzFT8LxPqtpB2Yn0+mWhLju92jGKfl99GUwVNIX1ib4c9RtB63gSuhWLO9uczUlMpUn59XVQBxcXeMi+uzzg7hyEBDj8DjFPt84cg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q1l65fW7RUENEbEVbUFXrbq7MMHLaGpbt8QdEwo7JFQc6qHVvJliB4fQf21trZymY1h3rDq1ACPBEQWeX4rW0hYZa61zaawy9gvkC0T0K/qvsApz+aNbWf9CU2DBfpSgOASSuQOkKK1SXPPR4SF2DL9sFE8ait5p0+b13f4xc85TU5EFvpOMSbq6m2ngoet5JgKdlArtpvFcINJGD6WSb0vm+BeNT9jhFleGTHTD/RoydOmmD3DwRLR2TfFG3vhL4lp6J6hkEW7j35XG4mmhxHl2ylzq5WkjjLedRO4V0Z24TBAGW2Zzz5xFsabCNUDj2QwYZlU7vNs2tqYtaotz3LhFM+S3V8TJaIwJsK6iOAszbxrSQZJM5T1yvpWddLfJJ+Ao0xe25tqS0v2tswzAyPwDWpFGuMUv4euNSWx+0t2l4Cugo3CCCNxJNXiLfhgQL8gmf4jRmiz0RvpZiA4RSKT3U/gmVDcZyCA07CMdnt03O/rZM2Wf1B6Uw6HYXMbWFYB6pi9Pezq0PXJrI2TCX+lO3sx/s1RD4AG4lQAGJloRLgyrwULNx/+J0A4FApQ5NCaks7qPEODGOR17zvuzEkTPVHj09XEEEWNcljp79QQgNiKYnh/R7ltn+autOE5HS0GfeUqN6HJj15fTogXltV3L1INNfbC0hvEDPuyvL7KfPDvg2ILh3D8viybl1cmu3zxPT9b67zI6jCsKj+AmtG4dfNNDo4yJyt327vntAqyUVHzkrlkU4y9SyL0CqwVFumH0yzFXu7H3gdgr6f3JDc3ivk+7ZKiheMcqipCVv9IuKDB9iW0J7TxfeConG+4A+nnB213QLtIPs0kCmAEn29fK/5HrLX7mukZMvgipvHmQDJ0x+4k/I0YukVICkTkWC0K+HRDimBTm0ZcXCbDEI66i4UUWE2OuqGFDAn7cRWa4d4E+NKVKYhS1J5UlC4Yui4goA/uvbKgc/K6ZhN8kTwAA0GLuBHZU/mdEyECHsOGMcmhRrwVUWusGF2KmALqh3Ec95BRAlvquTCX3YLV1kIRRu684R5+rhrJlGO/vHYMFKTi86Ns9Ibq8VDTkDmo3+F7vb188vUPUF7Iggw/h7+bgDqZC/kcfLEsKghhUQld7N7SDe1tEI0d/XLsL7rubbvJt/3OvUnn2DQvuFtQpeeWLvFT4leYqs/oJ9i+Uh6tiRNXWGWk+VwlRPB2wqBP8M5+pcycnxiDoombkOG3CoIGx2MQWoqQMnTwyh+yHabrZYyH9OrwNVVhLfCJvyUkXtQe2pH0YJP+iEh463FBpQmf8F2sl7GmvYHSgyh2iB2w= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9b5d40-ca0f-4099-1a2e-08daaa6d8ada X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:28.5771 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 20/20] avcodec/snowdec: Remove debug code 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: 5i236n1VU+0n The Snow decoder checks two bits of AVCodecContext.debug via numerical constants, not defines. One of these constants (512) used to be equivalent to FF_DEBUG_PTS which has been removed in 302554835e39b79b977ed60c9afe81b44590dfef (merged in 6e69525e6984d51165de0b17b796bbc29f9dd6e7). It is unlikely that 512 was intended to be FF_DEBUG_PTS, as it has nothing do to with PTS; instead it makes certain parts of the code behave like it does for keyframes even if the current frame is not a keyframe. Whatever it might have been intended for, it is almost certainly unused now. This commit therefore removes said checks. Signed-off-by: Andreas Rheinhardt --- Actually, I'd like to remove the other debug code (debug&2048), too; this would entail removing the mconly_picture, yet I wonder about the size of scratchbuf: Before a4ce3706595edd9b537861f0e5447e31babf2100 it's size was affected by the linesize of mconly_picture for encoders, too. Is it possible that these codecs are built on the assumption that the linesize of all frames stays the same if the dimensions stay the same, so that simply removing mconly_picture would leave scratchbuf too small? (Of course I am aware that the pixel format check would need that is currently performed with mconly_picture would need to be replaced by something similar. That should be easy.) libavcodec/snow.h | 2 +- libavcodec/snowdec.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 8da3d99885..0c59fb7ec4 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -418,7 +418,7 @@ static av_always_inline void predict_slice(SnowContext *s, IDWTELEM *buf, int pl int w= p->width; int h= p->height; av_assert2(s->chroma_h_shift == s->chroma_v_shift); // obmc params assume squares - if(s->keyframe || (s->avctx->debug&512)){ + if (s->keyframe) { if(mb_y==mb_h) return; diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 13948398b0..60eb9a7f52 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -191,7 +191,7 @@ static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer int w= p->width; int h= p->height; - if(s->keyframe || (s->avctx->debug&512)){ + if (s->keyframe) { if(mb_y==mb_h) return; @@ -694,7 +694,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, int slice_starty = block_h*mb_y; int slice_h = block_h*(mb_y+1); - if (!(s->keyframe || s->avctx->debug&512)){ + if (!s->keyframe) { slice_starty = FFMAX(0, slice_starty - (block_h >> 1)); slice_h -= (block_h >> 1); } @@ -709,7 +709,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, const int extra= 3; start_y = (mb_y ? ((block_h * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0); end_y = (((block_h * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra); - if (!(s->keyframe || s->avctx->debug&512)){ + if (!s->keyframe) { start_y = FFMAX(0, start_y - (block_h >> (1+s->spatial_decomposition_count - level))); end_y = FFMAX(0, end_y - (block_h >> (1+s->spatial_decomposition_count - level))); }