From patchwork Wed Jul 26 07:29:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp346044pzd; Wed, 26 Jul 2023 00:29:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlFGOam5Plv97yi1hoe00dvp4g/O5rUVl+1mvawZdSLPeD6g0mXGfe6ZRiypoOFtnRexjBmr X-Received: by 2002:a05:6402:1157:b0:522:5576:ec9b with SMTP id g23-20020a056402115700b005225576ec9bmr906936edw.0.1690356565771; Wed, 26 Jul 2023 00:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690356565; cv=none; d=google.com; s=arc-20160816; b=gj6a1nw2Z/eOb0WjrqlVvjc3if5u6Z7h9Xki2uhaVNXUWDmot+KJCiueMoR1N3+l3z tF9ZdmuDRPCAPIQ58Gm5w+yVyT8NNGMF2fKhC7BK5JCIrw+/+cGFGi3zJkFl4AQmKiY0 Fr+JOWQOXmI2bQkPcdmi3CcnUmPrJHQAhJFMNvHpQf3/rfQrbtTSsjnXqJwFINnOKhL7 POXSnbQ025Z15o7TobzCr3mdqhszq+WuDp0Rm2S3xmh1eAKsNLgsS4a4ev6cMIFfa13M 7RJXubRPM7Bl0opkyXyGAWm0naKuQX07t/Pwdn/lgweAd+KuOgzcDRijPd+HVUEX7wwe t9+g== 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=+kU8BZV6mtqz0HwVKoYCfdZ/IUPkk8F+ZuPS/C4H1UQ=; fh=NIkoTDpgqwsBDY3Ej4pG8uwJcqBS6rd7Vc7bU5x+v0U=; b=VibjKUuHwC8pafXAttzimGiIfqTdXhORabUNwhAE+ij/C0RABJodFolfDk/5Nq02/J JICagzfXhpkRAWaRnffqgQaHvq9qtiIK0BQhlt5ruDc962AYWR7VC7rbo7mDQ7FROhu0 FSVD3GcRO/54m7IVa2mLQg5OoDvT8QTqMYaJVK1LiELbXqaxZpjNTIrrG1/Ke3+gFwdT 6FpfMUFQBb5M9Y7quUj+i+k1xj0ns+lxGAGfVswzNOdbD4x8x+uDofhLZ+PhhvX0UYG4 Jf1H2P9/qnvcdVsEnDzwXu/Ojqfa2S+6t59VyzPBirGNfLpp4jdyPbN0bdwm45rJY47v PMHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=HLRx5wgs; 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 c12-20020a056402120c00b0052247678e8dsi2088905edw.305.2023.07.26.00.29.25; Wed, 26 Jul 2023 00:29:25 -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=@lynne.ee header.s=s1 header.b=HLRx5wgs; 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 3F46E68C91D; Wed, 26 Jul 2023 10:29:23 +0300 (EEST) 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 78DBD68C8B0 for ; Wed, 26 Jul 2023 10:29:16 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id B4C99106015C for ; Wed, 26 Jul 2023 07:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690356556; 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=8QOr/Hb60gi2ja7uBpPTY4WUkISYchwMpOi4wME/XkU=; b=HLRx5wgsC0EVfp5mY9gQcURw4xLmM+EmOYqwpTq26+aKlCAjObVHThpzvlcG+eqx JV8+QpgsTxQRNVbFKglAde9HoUFWKFBmhrVYynsU8XNxkj0u04PH7KERP2hPI/gBNvn xl0FfrBqWToBt3ilzpLrVb4l6FUM+yKdi0bGp1k3IBlFdqxyfd4gHFvHBRbj8hg9+QV XTa5k1uow2LX2dpxrodnCHdQMDYA48yR2jtNSv4GU4xP2Uv8GhUSzN3Eh7LWSUU/qYT qJR/i4wbgrTSdabCodJO2I74oc1aTUiFylot3lPO+wkEy7iRyBaIdOMJTwa8CiMluMI cGv8TXs9EA== Date: Wed, 26 Jul 2023 09:29:16 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfft: wrap lavu/tx instead of ff_fft 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: /NB5gwkykED+ Patch attached. From 3a595d6f177617ce89cc2709eca61b7cf486ce22 Mon Sep 17 00:00:00 2001 From: Lynne Date: Thu, 10 Nov 2022 11:23:38 +0100 Subject: [PATCH 1/3] avfft: wrap lavu/tx instead of ff_fft --- libavcodec/avfft.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 2200f37708..e4b19af272 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -18,38 +18,60 @@ #include "libavutil/attributes.h" #include "libavutil/mem.h" +#include "libavutil/tx.h" #include "avfft.h" #include "fft.h" #include "rdft.h" #include "dct.h" +typedef struct AVTXWrapper { + AVTXContext *ctx; + av_tx_fn fn; + + AVTXContext *ctx2; + av_tx_fn fn2; + + ptrdiff_t stride; +} AVTXWrapper; + /* FFT */ FFTContext *av_fft_init(int nbits, int inverse) { - FFTContext *s = av_mallocz(sizeof(*s)); - - if (s && ff_fft_init(s, nbits, inverse)) - av_freep(&s); + int ret; + float scale = 1.0f; + AVTXWrapper *s = av_malloc(sizeof(*s)); + if (!s) + return NULL; + + ret = av_tx_init(&s->ctx, &s->fn, AV_TX_FLOAT_FFT, inverse, 1 << nbits, + &scale, AV_TX_INPLACE); + if (ret < 0) { + av_free(s); + return NULL; + } - return s; + return (FFTContext *)s; } void av_fft_permute(FFTContext *s, FFTComplex *z) { - s->fft_permute(s, z); + /* Empty */ } void av_fft_calc(FFTContext *s, FFTComplex *z) { - s->fft_calc(s, z); + AVTXWrapper *w = (AVTXWrapper *)s; + w->fn(w->ctx, z, (void *)z, sizeof(AVComplexFloat)); } av_cold void av_fft_end(FFTContext *s) { if (s) { - ff_fft_end(s); - av_free(s); + AVTXWrapper *w = (AVTXWrapper *)s; + av_tx_uninit(&w->ctx); + av_tx_uninit(&w->ctx2); + av_free(w); } } -- 2.40.1