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 2C0144707A for ; Wed, 26 Jul 2023 07:31:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2300068C92C; Wed, 26 Jul 2023 10:31:03 +0300 (EEST) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEF1D68C912 for ; Wed, 26 Jul 2023 10:30:56 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 179071060165 for ; Wed, 26 Jul 2023 07:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690356656; 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:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=kEUd3LKV4LG0zrPQwD2e1KJKgPX6DS4lBPDp5mXKaj8=; b=Ph8pTXSANF8bdVM546saOdg0EMQjoWhJykUIM78MdlcPYFOZ1MS/YNHG9iZ6ptYO ke15G+LKq4v+kfzcMueqbsK0NolcBzXaVcpsiTb+Rd7jCECK+PD3P4oAuLsle5VGSFi TCSFrX3vojI7Vr/X0krJfvIQ+PENiy1AOZVj/aGXKNtIswO9zfy2ayJm+Iaqpgjyvgs 2xvvn3Dpuf+AAH4lOIQ3MgvDoHoOs3ZnAZ5KrdEaWeWDg03ucKZLEljA8ZOR3UL7Hro r7G8eLjSJzG1hnEoilFnkoJXd/sakjw2IDD7+MZ7hJpeaPfX//DzonJLNwIKQrXwsw4 c+hldlEw5Q== Date: Wed, 26 Jul 2023 09:30:56 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_580740_2055405850.1690356656548" Subject: [FFmpeg-devel] [PATCH 3/3] avfft: wrap lavu/tx instead of ff_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" Archived-At: List-Archive: List-Post: ------=_Part_580740_2055405850.1690356656548 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Patch attached. ------=_Part_580740_2055405850.1690356656548 Content-Type: text/x-diff; charset=us-ascii; name=0003-avfft-wrap-lavu-tx-instead-of-ff_rdft.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-avfft-wrap-lavu-tx-instead-of-ff_rdft.patch >From 68781f3bc021fe96c4b4b4a355e03d7c5bd3539b Mon Sep 17 00:00:00 2001 From: Lynne Date: Thu, 10 Nov 2022 11:26:59 +0100 Subject: [PATCH 3/3] avfft: wrap lavu/tx instead of ff_rdft --- libavcodec/avfft.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index ff5c739897..f5880f9932 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -125,33 +125,44 @@ av_cold void av_mdct_end(FFTContext *s) av_fft_end(s); } -#if CONFIG_RDFT - RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) { - RDFTContext *s = av_malloc(sizeof(*s)); + int ret; + float scale = 1.0f; + AVTXWrapper *s; - if (s && ff_rdft_init(s, nbits, trans)) - av_freep(&s); + /* The other 2 modes are unconventional, do not form an orthogonal + * transform, have never been useful, and so they're not implemented. */ + if (trans != IDFT_C2R && trans != DFT_R2C) + return NULL; - return s; + s = av_malloc(sizeof(*s)); + if (!s) + return NULL; + + ret = av_tx_init(&s->ctx, &s->fn, AV_TX_FLOAT_RDFT, trans == IDFT_C2R, + 1 << nbits, &scale, AV_TX_INPLACE); + if (ret < 0) { + av_free(s); + return NULL; + } + + s->stride = (trans == DFT_C2R) ? sizeof(float) : sizeof(AVComplexFloat); + + return (RDFTContext *)s; } void av_rdft_calc(RDFTContext *s, FFTSample *data) { - s->rdft_calc(s, data); + AVTXWrapper *w = (AVTXWrapper *)s; + w->fn(w->ctx, data, (void *)data, w->stride); } av_cold void av_rdft_end(RDFTContext *s) { - if (s) { - ff_rdft_end(s); - av_free(s); - } + av_fft_end((FFTContext *)s); } -#endif /* CONFIG_RDFT */ - #if CONFIG_DCT DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse) -- 2.40.1 ------=_Part_580740_2055405850.1690356656548 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". ------=_Part_580740_2055405850.1690356656548--