dsp: precalculate the scale

This commit is contained in:
Wim Taymans 2026-04-22 16:04:40 +02:00
parent 3c2552e671
commit 495c1c9dd0
3 changed files with 10 additions and 6 deletions

View file

@ -345,6 +345,7 @@ struct fft_info {
void *setup; void *setup;
#endif #endif
uint32_t size; uint32_t size;
float scale;
}; };
#ifdef HAVE_FFTW #ifdef HAVE_FFTW
@ -414,13 +415,13 @@ void dsp_fft_run_avx2(void *obj, void *fft, int direction,
fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst); fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst);
fft_blocked_avx2(dst, freq_size); fft_blocked_avx2(dst, freq_size);
} else { } else {
fft_interleaved_avx2((float*)src, freq_size, 1.0f / info->size); fft_interleaved_avx2((float*)src, freq_size, info->scale);
fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst); fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst);
} }
#else #else
if (direction < 0) if (direction < 0)
spa_fga_dsp_linear(obj, (float*)src, (float*)src, spa_fga_dsp_linear(obj, (float*)src, (float*)src,
1.0f / info->size, 0.0f, info->size); info->scale, 0.0f, info->size);
pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD); pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD);
#endif #endif
} }

View file

@ -243,6 +243,7 @@ struct fft_info {
void *setup; void *setup;
#endif #endif
uint32_t size; uint32_t size;
float scale;
}; };
void *dsp_fft_new_c(void *obj, uint32_t size, bool real) void *dsp_fft_new_c(void *obj, uint32_t size, bool real)
@ -253,6 +254,7 @@ void *dsp_fft_new_c(void *obj, uint32_t size, bool real)
return NULL; return NULL;
info->size = size; info->size = size;
info->scale = 1.0f / size;
#ifdef HAVE_FFTW #ifdef HAVE_FFTW
{ {
@ -328,13 +330,13 @@ void dsp_fft_run_c(void *obj, void *fft, int direction,
fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst); fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst);
} else { } else {
spa_fga_dsp_linear(obj, (float*)src, (float*)src, spa_fga_dsp_linear(obj, (float*)src, (float*)src,
1.0f / info->size, 0.0f, (info->size / 2 + 1) * 2); info->scale, 0.0f, (info->size / 2 + 1) * 2);
fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst); fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst);
} }
#else #else
if (direction < 0) if (direction < 0)
spa_fga_dsp_linear(obj, (float*)src, (float*)src, spa_fga_dsp_linear(obj, (float*)src, (float*)src,
1.0f / info->size, 0.0f, info->size); info->scale, 0.0f, info->size);
pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD); pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD);
#endif #endif
} }

View file

@ -792,6 +792,7 @@ struct fft_info {
void *setup; void *setup;
#endif #endif
uint32_t size; uint32_t size;
float scale;
}; };
#ifdef HAVE_FFTW #ifdef HAVE_FFTW
@ -855,13 +856,13 @@ void dsp_fft_run_sse(void *obj, void *fft, int direction,
fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst); fftwf_execute_dft_r2c(info->plan_r2c, (float*)src, (fftwf_complex*)dst);
fft_blocked_sse(dst, freq_size); fft_blocked_sse(dst, freq_size);
} else { } else {
fft_interleaved_sse((float*)src, freq_size, 1.0f / info->size); fft_interleaved_sse((float*)src, freq_size, info->scale);
fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst); fftwf_execute_dft_c2r(info->plan_c2r, (fftwf_complex*)src, dst);
} }
#else #else
if (direction < 0) if (direction < 0)
spa_fga_dsp_linear(obj, (float*)src, (float*)src, spa_fga_dsp_linear(obj, (float*)src, (float*)src,
1.0f / info->size, 0.0f, info->size); info->scale, 0.0f, info->size);
pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD); pffft_transform(info->setup, src, dst, NULL, direction < 0 ? PFFFT_BACKWARD : PFFFT_FORWARD);
#endif #endif
} }