From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2673248694 for ; Wed, 14 Feb 2024 20:45:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87B3A68D1EF; Wed, 14 Feb 2024 22:45:01 +0200 (EET) 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 Content-Type: multipart/mixed; boundary="===============5408551813604911940==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5408551813604911940== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mtxv3jVdCKYiyMdX" Content-Disposition: inline --mtxv3jVdCKYiyMdX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 f= or * the double variant, it's a 'double'. If scale is NULL, 1.0 will be u= sed * 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 |=3D FF_TX_OUT_OF_PLACE; =20 - if (!scale && ((type =3D=3D AV_TX_FLOAT_MDCT) || (type =3D=3D AV_TX_IN= T32_MDCT))) + if (!scale && ((type =3D=3D AV_TX_FLOAT_MDCT) || (type =3D=3D AV_TX_IN= T32_MDCT) || (type =3D=3D AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT))) scale =3D &default_scale_f; - else if (!scale && (type =3D=3D AV_TX_DOUBLE_MDCT)) + else if (!scale && ((type =3D=3D AV_TX_DOUBLE_MDCT) || (type =3D=3D AV= _TX_DOUBLE_RDFT))) scale =3D &default_scale_d; =20 ret =3D ff_tx_init_subtx(&tmp, type, flags, NULL, len, inv, scale); --=20 2.43.0 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --mtxv3jVdCKYiyMdX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCZc0mMwAKCRBnYHnFrEDd a4M5AKC1Bbi850LCAseKnZuEumnn1EvPPQCgsn80An19xCJOfk6C8tAJlYk50II= =/ZPY -----END PGP SIGNATURE----- --mtxv3jVdCKYiyMdX-- --===============5408551813604911940== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============5408551813604911940==--