From patchwork Wed Feb 14 20:44:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 46284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b819:b0:19e:cdac:8cce with SMTP id fi25csp186214pzb; Wed, 14 Feb 2024 12:45:07 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXMBeEo/uYEgQjyLDIqKtKb9ZcMHO78z7BeP47XMFE3yKh0NBnVK5+rm8wbsnmdfkJl+17rSKpK9L6sa9rsSxw2QBB5yplgDjVcBw== X-Google-Smtp-Source: AGHT+IG07abPkfnMJ93PC7Y34MgROELT2QCCSM9LjLJsN5qFGSkiH6vcs+Lazyu4lQhK5ZTR9J88 X-Received: by 2002:a17:906:5589:b0:a3c:edf6:a735 with SMTP id y9-20020a170906558900b00a3cedf6a735mr2733631ejp.47.1707943506547; Wed, 14 Feb 2024 12:45:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707943506; cv=none; d=google.com; s=arc-20160816; b=pMTvdjFsggpga9CW0TLavZJOt5mIhKYR+wUomtdOSAYxmX9ULMAUwhmtS2dmPFig+i gPGIeArSkFlVXInWCGr6Cqqnxx2Pcvs0IBeCgYEKrgNo+6p9Qml3shsw2LIkXLcpKN09 CpEpxHfmQNGxpFTz0ELPkqdNp6roHjOrYanoLG7Nyie7r9UNViZo4TQx9TfG1f2mP6Qx wfy6dBMv7y27TX5q79EkT4z2ko2fp1AiJoOtePKXzgMpmwkDQEJUmqsnvCd+LivLPCnf n+biM7fHwQLBzXYift5OVtVXdPlFrDPrzpojilLVq2NLrstHvaFKHPvjZt6AqE2wILM6 BDzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=84wJG2shsznOBkIMF6Nxo5V3o35YRdZrHxTnMAb8w4U=; fh=MJHVNHnsJ83ZxVLjejqg0xc3F6TeYQFbLcCULXxfot0=; b=fppM9LxK6xUngc806IuwdpUywD3+yJCgl5s7i6gWppDdMQxmsLTq1bAsJDaPVe10D3 l6euFb9NpwXgZJwngbNOMJqUGgVn4js21wwISuY/j0KKFewtq8tREWt2luRRUNrfkpnh 0JxnQciLleBzM/tDp4JAVh79M1LVyKbBHEwMWVjxKofjmuF0RDnmBPw8fwxbIGvxLEPP iPlRmsfyizX3SQptmoitBgSmGBnt86HeXbOKmsH7Pdyw4thcpt5AD8WOg9lNQZqlEstP 0g1qXTn0goKBKr8r89VRpsGLvHH3M3Re7JEp3lru3J7NyEesaSXsVe/kXpe4GEMs6TAa 7QVA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 X-Forwarded-Encrypted: i=1; AJvYcCUYo43NH8bsCf4iEHx/RMFdx+5zU8ZqDMFzyrp6gD4T3TUoNlfG9gtxMrmo16EpqJv08sHZMVmKFdT792T7KuKOx6/we2oh/Tg0aePIR2Nr2jLhbQ4EVEwOkry4t0iyX6U2p0ptInDovtzrIJz91yCFUjrlPjMPm6BFEWkjqwNwPaHyYNGbDlIbRJHG0araNcx860ybhjmVqvbKShjho47El0N/C3SJhuX9vbwrghf4yWXJvDDyfybKWUoKnQWJjaN6Q2q3CRlYtweD/4zxfgFIxeiimb1iMFSfO/pui0syZ4WRaSEKWKi5rn2zpzrafLwtxkKrKH7fKDQFS/6xcV0HSBwJ52+HuK4d56DSnKdHSdf2rMS0ThhiLbeMCKPL8J8Sil3VGwbMKCrM2a0mes8W5WNLsNGbmCMuQWAd3KwflB3wegcN2iuuMpsEx+KTOzs06HcWD4JDznbmogegRzvyr9r40vKGWUMRYu4VL7r/n0FQWsSL3oD6towQlxs0v6rbSdPzHnzeEFPnrViC//m9UxSs4DPa3bc3zS8JginnmhaWWBH1YY1ae/svb3M9DUrz6hFkQ/T1piRLVy/b/EGvfvVO//IypT+HXNDdkPu+w076jBTAt9fr1tIFXT0Mq4Ezk3XtjdwlRzoiwrqt5UaKWyKOLMWTJ1N60gX4NVv8qDoLTxqZLorAxIZEYHbIqSddiwejtutnnTEnrW8sZBXkeaVtbTh1lQBqAAP+UWZcUfvTzO2tSK4pXt3mfyMXJIKW8SUfGMYM17AJq8YGMDMQEI+7ojJkpD9bXadi0PkmBuDvkuOMjjAVk3x48+uzy3x93qrNJQ6tByVrZZdlJLSmIpBvLZAfkKVyevxHqlXThNzrwLFNPoyy/sqLvXOkNGoZrC2ytXBlqwBDSfS4/exELBLFSEVBXaCZpAK2aKHSQWQYwa6yoPWYQG0UWUUajFTcvf KEw+zVUf/GLA4zRFSKGgU1hxUyvwVVm66mrv8c48ZknedMYIzHdKo//C5winAHaPzElZQp/An6Lx5txa9RpdUdygXXRm7LOzepITmyLrDX8cNyDzdroV6dD7rZy7Z5NjRgb6dhhE9i+ryR+B62GWm1hUAhPAd0++eiws38Q4rvByLq55yeUbfvIcmlqLK0s/niIiS/fkdgee1SuJkH7SdtONdUoRB8Ja2Op4FCn3G2LcXANZ64VPocQVeVMxSBAUj/ZsFJiUUXzfWO+YPujULCa4D5eG0Xo9r2zyuFccjNuWdPPmatSX4zK9Hk8ZO85fEdsq23XuWaRqt3FzKYZy421N67kgQh3AYa6NcAY1tOyv2BuYYVA5WO+QS9VLDd87bPFbHWZhvrBAdH+MDHSTfezj5kc/MBwk0SzBM8xhdw+pI2O+nkuVvQZIiP+XTkSJn2cwIMaOju+Rku+ktVPrbk3+zCXgNL62wkfJ6y2qRg+gA/3rDzBBzTv+5y/ajWGIHkUKTQplBLw3K4EjDQLce/VogrhuaOsvyRM4kIK35gKUvdXhkgbD+88AdR4sSRMiXy1+N3hG5w6cXJk4YXrdxFltgeI9b9/Jg+ Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e24-20020a170906375800b00a3d3f802101si1009251ejc.919.2024.02.14.12.45.05; Wed, 14 Feb 2024 12:45:06 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C675868D1FF; Wed, 14 Feb 2024 22:45:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (unknown [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D40EA68CC5B for ; Wed, 14 Feb 2024 22:44:54 +0200 (EET) Received: from 869728a0df17329e597ee5994a1a1c9d ([1.145.146.222]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 41EKikq6015090 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 14 Feb 2024 20:44:51 GMT Date: Thu, 15 Feb 2024 07:44:40 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] av_tx_init: accept NULL scale for RDFT X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1fUmC26tZECG Make av_tx_init() agree with documentation: * Real to complex and complex to real DFTs. * For the float and int32 variants, the scale type is 'float', while for * the double variant, it's a 'double'. If scale is NULL, 1.0 will be used * as a default. --- libavutil/tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/tx.c b/libavutil/tx.c index d6740071b9..cc360cff31 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -914,9 +914,9 @@ av_cold int av_tx_init(AVTXContext **ctx, av_tx_fn *tx, enum AVTXType type, if (!(flags & AV_TX_INPLACE)) flags |= FF_TX_OUT_OF_PLACE; - if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT))) + if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT) || (type == AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT))) scale = &default_scale_f; - else if (!scale && (type == AV_TX_DOUBLE_MDCT)) + else if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_RDFT))) scale = &default_scale_d; ret = ff_tx_init_subtx(&tmp, type, flags, NULL, len, inv, scale);