mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioconvert: somewhat avoid precision loss in F32 to S32 conversion

Browse source 
At the very least, we should go through s25_32 intermediate
instead of s24_32, to avoid needlessly loosing 1 LSB precision bit.

FIXME: the noise codepath is not covered with tests.
This commit is contained in:
Roman Lebedev 2024-06-14 04:48:03 +03:00
parent 2a035ac49e
commit 175d533b56
No known key found for this signature in database
GPG key ID: 083C3EBB4A1689E0
4 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

57
spa/plugins/audioconvert/fmt-ops-sse2.c
View file

@ -381,9 +381,9 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
uint32_t n, unrolled;
__m128 in[1];
__m128i out[4];
__m128 scale = _mm_set1_ps(S24_SCALE);
__m128 int_min = _mm_set1_ps(S24_MIN);
__m128 int_max = _mm_set1_ps(S24_MAX);
__m128 scale = _mm_set1_ps(S25_SCALE);
__m128 int_min = _mm_set1_ps(S25_MIN);
__m128 int_max = _mm_set1_ps(S25_MAX);
if (SPA_IS_ALIGNED(s0, 16))
unrolled = n_samples & ~3;
@ -394,7 +394,7 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_mul_ps(_mm_load_ps(&s0[n]), scale);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvtps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[0] = _mm_slli_epi32(out[0], 7);
out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
@ -409,7 +409,7 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_load_ss(&s0[n]);
in[0] = _mm_mul_ss(in[0], scale);
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d = _mm_cvtss_si32(in[0]) << 8;
*d = _mm_cvtss_si32(in[0]) << 7;
d += n_channels;
}
}
@ -423,12 +423,12 @@ conv_f32d_to_s32_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
uint32_t n, unrolled;
__m128 in[2];
__m128i out[2], t[2];
__m128 scale = _mm_set1_ps(S24_SCALE);
__m128 int_min = _mm_set1_ps(S24_MIN);
__m128 int_max = _mm_set1_ps(S24_MAX);
__m128 scale = _mm_set1_ps(S25_SCALE);
__m128 int_min = _mm_set1_ps(S25_MIN);
__m128 int_max = _mm_set1_ps(S25_MAX);
if (SPA_IS_ALIGNED(s0, 16) &&
SPA_IS_ALIGNED(s1, 16))
SPA_IS_ALIGNED(s1, 16))
unrolled = n_samples & ~3;
else
unrolled = 0;
@ -442,8 +442,8 @@ conv_f32d_to_s32_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
out[0] = _mm_cvtps_epi32(in[0]);
out[1] = _mm_cvtps_epi32(in[1]);
out[0] = _mm_slli_epi32(out[0], 8);
out[1] = _mm_slli_epi32(out[1], 8);
out[0] = _mm_slli_epi32(out[0], 7);
out[1] = _mm_slli_epi32(out[1], 7);
t[0] = _mm_unpacklo_epi32(out[0], out[1]);
t[1] = _mm_unpackhi_epi32(out[0], out[1]);
@ -463,7 +463,7 @@ conv_f32d_to_s32_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_mul_ps(in[0], scale);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvtps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[0] = _mm_slli_epi32(out[0], 7);
_mm_storel_epi64((__m128i*)d, out[0]);
d += n_channels;
}
@ -478,14 +478,14 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
uint32_t n, unrolled;
__m128 in[4];
__m128i out[4];
__m128 scale = _mm_set1_ps(S24_SCALE);
__m128 int_min = _mm_set1_ps(S24_MIN);
__m128 int_max = _mm_set1_ps(S24_MAX);
__m128 scale = _mm_set1_ps(S25_SCALE);
__m128 int_min = _mm_set1_ps(S25_MIN);
__m128 int_max = _mm_set1_ps(S25_MAX);
if (SPA_IS_ALIGNED(s0, 16) &&
SPA_IS_ALIGNED(s1, 16) &&
SPA_IS_ALIGNED(s2, 16) &&
SPA_IS_ALIGNED(s3, 16))
SPA_IS_ALIGNED(s1, 16) &&
SPA_IS_ALIGNED(s2, 16) &&
SPA_IS_ALIGNED(s3, 16))
unrolled = n_samples & ~3;
else
unrolled = 0;
@ -507,10 +507,10 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
out[1] = _mm_cvtps_epi32(in[1]);
out[2] = _mm_cvtps_epi32(in[2]);
out[3] = _mm_cvtps_epi32(in[3]);
out[0] = _mm_slli_epi32(out[0], 8);
out[1] = _mm_slli_epi32(out[1], 8);
out[2] = _mm_slli_epi32(out[2], 8);
out[3] = _mm_slli_epi32(out[3], 8);
out[0] = _mm_slli_epi32(out[0], 7);
out[1] = _mm_slli_epi32(out[1], 7);
out[2] = _mm_slli_epi32(out[2], 7);
out[3] = _mm_slli_epi32(out[3], 7);
_mm_storeu_si128((__m128i*)(d + 0*n_channels), out[0]);
_mm_storeu_si128((__m128i*)(d + 1*n_channels), out[1]);
@ -531,7 +531,7 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_mul_ps(in[0], scale);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvtps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[0] = _mm_slli_epi32(out[0], 7);
_mm_storeu_si128((__m128i*)d, out[0]);
d += n_channels;
}
@ -620,6 +620,7 @@ void conv_noise_tri_hf_sse2(struct convert *conv, float *noise, uint32_t n_sampl
_mm_store_si128((__m128i*)p, old[0]);
}
// FIXME: this function is not covered with tests.
static void
conv_f32d_to_s32_1s_noise_sse2(struct convert *conv, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src,
float *noise, uint32_t n_channels, uint32_t n_samples)
@ -629,9 +630,9 @@ conv_f32d_to_s32_1s_noise_sse2(struct convert *conv, void * SPA_RESTRICT dst, co
uint32_t n, unrolled;
__m128 in[1];
__m128i out[4];
__m128 scale = _mm_set1_ps(S24_SCALE);
__m128 int_min = _mm_set1_ps(S24_MIN);
__m128 int_max = _mm_set1_ps(S24_MAX);
__m128 scale = _mm_set1_ps(S25_SCALE);
__m128 int_min = _mm_set1_ps(S25_MIN);
__m128 int_max = _mm_set1_ps(S25_MAX);
if (SPA_IS_ALIGNED(s, 16))
unrolled = n_samples & ~3;
@ -643,7 +644,7 @@ conv_f32d_to_s32_1s_noise_sse2(struct convert *conv, void * SPA_RESTRICT dst, co
in[0] = _mm_add_ps(in[0], _mm_load_ps(&noise[n]));
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvtps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[0] = _mm_slli_epi32(out[0], 7);
out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
out[2] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(1, 0, 3, 2));
out[3] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(2, 1, 0, 3));
@ -659,7 +660,7 @@ conv_f32d_to_s32_1s_noise_sse2(struct convert *conv, void * SPA_RESTRICT dst, co
in[0] = _mm_mul_ss(in[0], scale);
in[0] = _mm_add_ss(in[0], _mm_load_ss(&noise[n]));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d = _mm_cvtss_si32(in[0]) << 8;
*d = _mm_cvtss_si32(in[0]) << 7;
d += n_channels;
}
}