[FFmpeg-cvslog] avfft: wrap lavu/tx instead of ff_fft
Lynne
git at videolan.org
Sat Sep 2 01:00:12 EEST 2023
ffmpeg | branch: master | Lynne <dev at lynne.ee> | Thu Nov 10 11:23:38 2022 +0100| [dfcd4bbf5118b9fa601ba36e3c5984db61478d5f] | committer: Lynne
avfft: wrap lavu/tx instead of ff_fft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfcd4bbf5118b9fa601ba36e3c5984db61478d5f
---
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);
}
}
More information about the ffmpeg-cvslog
mailing list