From patchwork Sat Feb 17 19:53:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 46310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp455748pzb; Sat, 17 Feb 2024 11:53:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUVViM/GzshqbDKhzBPuaApoCfzh1VlTKMF3TGq4ir/xV6ZZZ6hZ5HV9Khf3eWkpJK1krBqkkS2hFxaD4/mfMSiR3g0vU2p9sHR3w== X-Google-Smtp-Source: AGHT+IEAwSgt23DvEKeAZ95iMiqCeIIZpwbZvaTCJsCkO+bMag2VP7ODCtSzVG4cyrtWuf8B/gcb X-Received: by 2002:a05:6402:65a:b0:564:da1:f6c with SMTP id u26-20020a056402065a00b005640da10f6cmr2431670edx.0.1708199623758; Sat, 17 Feb 2024 11:53:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708199623; cv=none; d=google.com; s=arc-20160816; b=hYFdBmSvLhaIYAWf9QektXCBYCTHEEW6nIxHynPyBVuuS4iix65sUb8jQLb551YWMz 3vPgliH+i+g0YhUmaNQkMEwMeBIhj9OaHqYFlAcD8YJnYa25oKzgqet7rcIvsBlp9rox qciuX9g5BEAfTv8ZX8pljlT9f1Uza3+KQWugR2AjX/1zKfXbMmtzH0R0mL5ZV8qi4ZqW TaYMqEdPNgXNjtdroDw0APUBWNhOIg6i5VxAYJfk01YrZ+0ig7QIZMMDzuHj9UQaGqRD n9+y8VCb1C85YnfJ3dyByctNzouqMkQnGV/RrzwItc25+XM/ICLcVgbUvyyQZd8ixYrs 3pkw== 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:dkim-signature:delivered-to; bh=RC7AoyMuX5TWoBVagjnWpwpRiQKQg4IUSTZzPyTz99Q=; fh=Q46kXK7oI5D1Jhi90JBr53c7NIaTxGaU4KPeRZyM/hI=; b=w3RuuWlXpLvjjo5H4OzK0/usM57Xe7lLccixeNSxUYdiHdHXi0aOK9fCWTiLYqJuBS LJ3IiiL0EByTTEqFLHQYjUuDFNjMXQAMq4wwYuf1ZS+Z8DEDhka64rXQ4LA5V0wETP0x 9EgpDJlPxDCARky34qsPgTIQtaiKRxFP2Lky8mOObBJN7mbqUjDk4WwZkRBTcmIzxAi0 lhE0nbxxw3R0sVeQv/xNNjlV+ifCGV5EWS7gPmLpZvmBlEnH0PukxtnfG0o0RnQNRJgG FKwrfl+fhG8eI4UySW8nNeH5aybngjUhR3meOuVvunm8AIY9W80XRK3nDJO3F6rYVtlp Lmdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=TfH9CjJR; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v14-20020a056402174e00b00560ce8fd505si1012924edx.581.2024.02.17.11.53.43; Sat, 17 Feb 2024 11:53:43 -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; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=TfH9CjJR; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFD5468D2E3; Sat, 17 Feb 2024 21:53:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79D7668CDBE for ; Sat, 17 Feb 2024 21:53:33 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id D571F1060229 for ; Sat, 17 Feb 2024 19:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1708199612; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=zn8sPcIYKX+3bJxxaT+mX1yjgfw4VjpivV/iv7oFOLM=; b=TfH9CjJRFcDQ/ch0uxZMIKsRPwVympF7jz7nbSsxr165II2nYK8SSyoGBXQEep57 6hJtz8g8zzZdDV6coOsk0IZ1UL9419MmP8ZzAoYUOe0RKsvhN5X8qouMgQyJKaOblhT IpnVMB0J+H66mWuNxwAOdAGfF9pzkW/JSqQ8UIEtFM438Y1k9avhNdQtz/yJPQrtMd5 yltw0+ZLNVN6kAqyTh9a865r9rMCn4jbI16Vttrwda+bmdMGMxI9vZGujwMsj1LqfQQ POStBZLa4wKWHbWM1y2Awyn4/vm09Dzhoax4/EOYBOMywhFqtdk0pe0EINLKrjZz/wk CJV6y06PTQ== Date: Sat, 17 Feb 2024 20:53:32 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/tx: correctly use a default scale parameter for all transform types 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: RkUlNYsxHW9O This fixes the previous commit and adds more cases (DCT-I and DST-I). I am holding off on defining a scale parameter for FFTs as I'd like to use a complex value for them. Patch attached. From 5b58ac6995cd52c3d61d46f5d4eca42a686752b7 Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 17 Feb 2024 20:50:48 +0100 Subject: [PATCH] lavu/tx: correctly use a default scale parameter for all transform types This fixes the previous commit and adds more cases (DCT-I and DST-I). I am holding off on defining a scale parameter for FFTs as I'd like to use a complex value for them. --- libavutil/tx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavutil/tx.c b/libavutil/tx.c index cc360cff31..f991618b4b 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -914,10 +914,12 @@ 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) || (type == AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT))) - scale = &default_scale_f; - else if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_RDFT))) + if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_DCT) || + (type == AV_TX_DOUBLE_DCT_I) || (type == AV_TX_DOUBLE_DST_I) || + (type == AV_TX_DOUBLE_RDFT))) scale = &default_scale_d; + else if (!scale && !TYPE_IS(FFT, type)) + scale = &default_scale_f; ret = ff_tx_init_subtx(&tmp, type, flags, NULL, len, inv, scale); if (ret < 0) -- 2.43.0.381.gb435a96ce8