From 0068b3d0f0bc06b2b083eb729bf84f1a3196a2a9 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 27 Jul 2021 21:16:28 +0200 Subject: avfilter/avf_showcqt: switch to TX FFT from avutil --- libavfilter/avf_showcqt.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libavfilter/avf_showcqt.h') diff --git a/libavfilter/avf_showcqt.h b/libavfilter/avf_showcqt.h index 0cef5a2003..b6c1e0e108 100644 --- a/libavfilter/avf_showcqt.h +++ b/libavfilter/avf_showcqt.h @@ -21,12 +21,12 @@ #ifndef AVFILTER_SHOWCQT_H #define AVFILTER_SHOWCQT_H -#include "libavcodec/avfft.h" +#include "libavutil/tx.h" #include "avfilter.h" #include "internal.h" typedef struct Coeffs { - FFTSample *val; + float *val; int start, len; } Coeffs; @@ -58,11 +58,13 @@ typedef struct ShowCQTContext { int remaining_fill_max; int64_t next_pts; double *freq; - FFTContext *fft_ctx; + AVTXContext *fft_ctx; + av_tx_fn tx_fn; Coeffs *coeffs; - FFTComplex *fft_data; - FFTComplex *fft_result; - FFTComplex *cqt_result; + AVComplexFloat *fft_data; + AVComplexFloat *fft_input; + AVComplexFloat *fft_result; + AVComplexFloat *cqt_result; float *attack_data; int fft_bits; int fft_len; @@ -76,7 +78,7 @@ typedef struct ShowCQTContext { float cmatrix[3][3]; float cscheme_v[6]; /* callback */ - void (*cqt_calc)(FFTComplex *dst, const FFTComplex *src, const Coeffs *coeffs, + void (*cqt_calc)(AVComplexFloat *dst, const AVComplexFloat *src, const Coeffs *coeffs, int len, int fft_len); void (*permute_coeffs)(float *v, int len); void (*draw_bar)(AVFrame *out, const float *h, const float *rcp_h, -- cgit v1.2.1