mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioconvert: use blackman window again

Browse source 
I'm not convinced the cosh window is better and it causes some weird
nan numbers in some cases.

See #2483
This commit is contained in:
Wim Taymans 2022-07-06 09:57:52 +02:00
parent a4f6598f47
commit 0b351aab99
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/audioconvert/resample-native.c
View file

@ -58,7 +58,6 @@ static inline double sinc(double x)
return sin(x) / x; return sin(x) / x;
} }
#if 0
static inline double window_blackman(double x, double n_taps) static inline double window_blackman(double x, double n_taps)
{ {
double alpha = 0.232, r; double alpha = 0.232, r;
@ -67,16 +66,16 @@ static inline double window_blackman(double x, double n_taps)
(alpha / 2.0) * cos(2 * x); (alpha / 2.0) * cos(2 * x);
return r; return r;
} }
#else
static inline double window_cosh(double x, double n_taps) static inline double window_cosh(double x, double n_taps)
{ {
double R = 95.0, r; double R = 95.0, r;
double A = -325.1E-6 * (R * R) + 0.1677 * R - 3.149; double A = -325.1E-6 * (R * R) + 0.1677 * R - 3.149;
x = 2.0 * M_PI * x / n_taps; x = 2.0 * x / n_taps;
r = cosh(A * sqrt(1 - pow(x / M_PI, 2))) / cosh(A); r = cosh(A * sqrt(1 - pow(x, 2))) / cosh(A);
return isnan(r) ? 0.0 : r; return r;
} }
#endif
#define window window_blackman
static int build_filter(float *taps, uint32_t stride, uint32_t n_taps, uint32_t n_phases, double cutoff) static int build_filter(float *taps, uint32_t stride, uint32_t n_taps, uint32_t n_phases, double cutoff)
{ {
@ -88,7 +87,7 @@ static int build_filter(float *taps, uint32_t stride, uint32_t n_taps, uint32_t
/* exploit symmetry in filter taps */ /* exploit symmetry in filter taps */
taps[(n_phases - i) * stride + n_taps12 + j] = taps[(n_phases - i) * stride + n_taps12 + j] =
taps[i * stride + (n_taps12 - j - 1)] = taps[i * stride + (n_taps12 - j - 1)] =
cutoff * sinc(t * cutoff) * window_cosh(t, n_taps); cutoff * sinc(t * cutoff) * window(t, n_taps);
} }
} }
return 0; return 0;