History

avfilter/vaf_spectrumsynth: switch to TX FFT from avutil

Paul B Mahol committed 5 years ago

Commit b3117f31 parent a428d2a2 files · +47 −36Browse files

Unified · Split

2 files
  1. configure +0 −3
  2. libavfilter/vaf_spectrumsynth.c +47 −33
configure+0−3
@@ -3660,8 +3660,6 @@ sinc_filter_select="rdft" · 3659 unmodified lines
36603660 smartblur_filter_deps="gpl swscale"
36613661 sobel_opencl_filter_deps="opencl"
36623662 sofalizer_filter_deps="libmysofa"
3663−spectrumsynth_filter_deps="avcodec"
3664−spectrumsynth_filter_select="fft"
36653663 spp_filter_deps="gpl avcodec"
36663664 spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
36673665 sr_filter_deps="avformat swscale"
@@ -7278,7 +7276,6 @@ enabled scale2ref_filter && prepend avfilter_deps "swscale" · 3610 unmodified lines
72787276 enabled showcqt_filter && prepend avfilter_deps "avformat swscale"
72797277 enabled signature_filter && prepend avfilter_deps "avcodec avformat"
72807278 enabled smartblur_filter && prepend avfilter_deps "swscale"
7281−enabled spectrumsynth_filter && prepend avfilter_deps "avcodec"
72827279 enabled spp_filter && prepend avfilter_deps "avcodec"
72837280 enabled sr_filter && prepend avfilter_deps "avformat swscale"
72847281 enabled subtitles_filter && prepend avfilter_deps "avformat avcodec"
libavfilter/vaf_spectrumsynth.c+47−33
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 * @todo support float pixel format
2525 */
2626
27−#include "libavcodec/avfft.h"
27+#include "libavutil/tx.h"
2828 #include "libavutil/avassert.h"
2929 #include "libavutil/channel_layout.h"
3030 #include "libavutil/ffmath.h"
@@ -53,9 +53,10 @@ typedef struct SpectrumSynthContext { · 22 unmodified lines
5353 int orientation;
5454
5555 AVFrame *magnitude, *phase;
56− FFTContext *fft; ///< Fast Fourier Transform context
57− int fft_bits; ///< number of bits (FFT window size = 1<<fft_bits)
58− FFTComplex **fft_data; ///< bins holder for each (displayed) channels
56+ AVTXContext *fft; ///< Fast Fourier Transform context
57+ av_tx_fn tx_fn;
58+ AVComplexFloat **fft_in; ///< bins holder for each (displayed) channels
59+ AVComplexFloat **fft_out; ///< bins holder for each (displayed) channels
5960 int win_size;
6061 int size;
6162 int nb_freq;
@@ -150,8 +151,8 @@ static int config_output(AVFilterLink *outlink) · 88 unmodified lines
150151 int height = ctx->inputs[0]->h;
151152 AVRational time_base = ctx->inputs[0]->time_base;
152153 AVRational frame_rate = ctx->inputs[0]->frame_rate;
153− int i, ch, fft_bits;
154− float factor, overlap;
154+ float factor, overlap, scale;
155+ int i, ch, ret;
155156
156157 outlink->sample_rate = s->sample_rate;
157158 outlink->time_base = (AVRational){1, s->sample_rate};
@@ -182,23 +183,30 @@ static int config_output(AVFilterLink *outlink) · 24 unmodified lines
182183 s->size = s->orientation == VERTICAL ? height / s->channels : width / s->channels;
183184 s->xend = s->orientation == VERTICAL ? width : height;
184185
185− for (fft_bits = 1; 1 << fft_bits < 2 * s->size; fft_bits++);
186+ s->win_size = s->size * 2;
187+ s->nb_freq = s->size;
186188
187− s->win_size = 1 << fft_bits;
188− s->nb_freq = 1 << (fft_bits - 1);
189−
190− s->fft = av_fft_init(fft_bits, 1);
191− if (!s->fft) {
189+ ret = av_tx_init(&s->fft, &s->tx_fn, AV_TX_FLOAT_FFT, 1, s->win_size, &scale, 0);
190+ if (ret < 0) {
192191 av_log(ctx, AV_LOG_ERROR, "Unable to create FFT context. "
193192 "The window size might be too high.\n");
194− return AVERROR(EINVAL);
193+ return ret;
195194 }
196− s->fft_data = av_calloc(s->channels, sizeof(*s->fft_data));
197− if (!s->fft_data)
195+
196+ s->fft_in = av_calloc(s->channels, sizeof(*s->fft_in));
197+ if (!s->fft_in)
198198 return AVERROR(ENOMEM);
199+ s->fft_out = av_calloc(s->channels, sizeof(*s->fft_out));
200+ if (!s->fft_out)
201+ return AVERROR(ENOMEM);
202+
199203 for (ch = 0; ch < s->channels; ch++) {
200− s->fft_data[ch] = av_calloc(s->win_size, sizeof(**s->fft_data));
201− if (!s->fft_data[ch])
204+ s->fft_in[ch] = av_calloc(FFALIGN(s->win_size, av_cpu_max_align()), sizeof(**s->fft_in));
205+ if (!s->fft_in[ch])
206+ return AVERROR(ENOMEM);
207+
208+ s->fft_out[ch] = av_calloc(FFALIGN(s->win_size, av_cpu_max_align()), sizeof(**s->fft_out));
209+ if (!s->fft_out[ch])
202210 return AVERROR(ENOMEM);
203211 }
204212
@@ -244,8 +252,8 @@ static void read16_fft_bin(SpectrumSynthContext *s, · 39 unmodified lines
244252 }
245253 phase = ((p[x] / (double)UINT16_MAX) * 2. - 1.) * M_PI;
246254
247− s->fft_data[ch][f].re = magnitude * cos(phase);
248− s->fft_data[ch][f].im = magnitude * sin(phase);
255+ s->fft_in[ch][f].re = magnitude * cos(phase);
256+ s->fft_in[ch][f].im = magnitude * sin(phase);
249257 }
250258
251259 static void read8_fft_bin(SpectrumSynthContext *s,
@@ -269,8 +277,8 @@ static void read8_fft_bin(SpectrumSynthContext *s, · 17 unmodified lines
269277 }
270278 phase = ((p[x] / (double)UINT8_MAX) * 2. - 1.) * M_PI;
271279
272− s->fft_data[ch][f].re = magnitude * cos(phase);
273− s->fft_data[ch][f].im = magnitude * sin(phase);
280+ s->fft_in[ch][f].re = magnitude * cos(phase);
281+ s->fft_in[ch][f].im = magnitude * sin(phase);
274282 }
275283
276284 static void read_fft_data(AVFilterContext *ctx, int x, int h, int ch)
@@ -330,17 +338,16 @@ static void synth_window(AVFilterContext *ctx, int x) · 53 unmodified lines
330338 read_fft_data(ctx, x, h, ch);
331339
332340 for (y = h; y <= s->nb_freq; y++) {
333− s->fft_data[ch][y].re = 0;
334− s->fft_data[ch][y].im = 0;
341+ s->fft_in[ch][y].re = 0;
342+ s->fft_in[ch][y].im = 0;
335343 }
336344
337345 for (y = s->nb_freq + 1, f = s->nb_freq - 1; y < nb; y++, f--) {
338− s->fft_data[ch][y].re = s->fft_data[ch][f].re;
339− s->fft_data[ch][y].im = -s->fft_data[ch][f].im;
346+ s->fft_in[ch][y].re = s->fft_in[ch][f].re;
347+ s->fft_in[ch][y].im = -s->fft_in[ch][f].im;
340348 }
341349
342− av_fft_permute(s->fft, s->fft_data[ch]);
343− av_fft_calc(s->fft, s->fft_data[ch]);
350+ s->tx_fn(s->fft, s->fft_out[ch], s->fft_in[ch], sizeof(float));
344351 }
345352 }
346353
@@ -363,11 +370,11 @@ static int try_push_frame(AVFilterContext *ctx, int x) · 16 unmodified lines
363370 end = s->end;
364371 k = end;
365372 for (i = 0, j = start; j < k && i < s->win_size; i++, j++) {
366− buf[j] += s->fft_data[ch][i].re;
373+ buf[j] += s->fft_out[ch][i].re;
367374 }
368375
369376 for (; i < s->win_size; i++, j++) {
370− buf[j] = s->fft_data[ch][i].re;
377+ buf[j] = s->fft_out[ch][i].re;
371378 }
372379
373380 start += s->hop_size;
@@ -499,12 +506,19 @@ static av_cold void uninit(AVFilterContext *ctx) · 125 unmodified lines
499506 av_frame_free(&s->magnitude);
500507 av_frame_free(&s->phase);
501508 av_frame_free(&s->buffer);
502− av_fft_end(s->fft);
503− if (s->fft_data) {
509+
510+ av_tx_uninit(&s->fft);
511+
512+ if (s->fft_in) {
513+ for (i = 0; i < s->channels; i++)
514+ av_freep(&s->fft_in[i]);
515+ }
516+ if (s->fft_out) {
504517 for (i = 0; i < s->channels; i++)
505− av_freep(&s->fft_data[i]);
518+ av_freep(&s->fft_out[i]);
506519 }
507− av_freep(&s->fft_data);
520+ av_freep(&s->fft_in);
521+ av_freep(&s->fft_out);
508522 av_freep(&s->window_func_lut);
509523 }
510524

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t