audioconvert: add and use CLAMP macros

This commit is contained in:
Wim Taymans 2022-07-12 10:33:37 +02:00
parent fd2cc19eaa
commit c31928c5f0

View file

@ -26,6 +26,12 @@
#include <emmintrin.h>
#define _MM_CLAMP_PS(r,min,max) \
_mm_min_ps(_mm_max_ps(r, min), max)
#define _MM_CLAMP_SS(r,min,max) \
_mm_min_ss(_mm_max_ss(r, min), max)
static void
conv_s16_to_f32d_1s_sse2(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
uint32_t n_channels, uint32_t n_samples)
@ -395,8 +401,7 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
for(n = 0; n < unrolled; n += 4) {
in[0] = _mm_mul_ps(_mm_load_ps(&s0[n]), scale);
in[0] = _mm_min_ps(in[0], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvttps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
@ -412,8 +417,7 @@ conv_f32d_to_s32_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
for(; n < n_samples; n++) {
in[0] = _mm_load_ss(&s0[n]);
in[0] = _mm_mul_ss(in[0], scale);
in[0] = _mm_min_ss(in[0], int_max);
in[0] = _mm_max_ss(in[0], int_min);
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d = _mm_cvtss_si32(in[0]) << 8;
d += n_channels;
}
@ -442,10 +446,8 @@ conv_f32d_to_s32_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_mul_ps(_mm_load_ps(&s0[n]), scale);
in[1] = _mm_mul_ps(_mm_load_ps(&s1[n]), scale);
in[0] = _mm_min_ps(in[0], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[1] = _mm_min_ps(in[1], int_max);
in[1] = _mm_max_ps(in[1], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
in[1] = _MM_CLAMP_PS(in[1], int_min, int_max);
out[0] = _mm_cvttps_epi32(in[0]);
out[1] = _mm_cvttps_epi32(in[1]);
@ -468,8 +470,7 @@ conv_f32d_to_s32_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_unpacklo_ps(in[0], in[1]);
in[0] = _mm_mul_ps(in[0], scale);
in[0] = _mm_min_ps(in[0], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvttps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
_mm_storel_epi64((__m128i*)d, out[0]);
@ -504,14 +505,10 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[2] = _mm_mul_ps(_mm_load_ps(&s2[n]), scale);
in[3] = _mm_mul_ps(_mm_load_ps(&s3[n]), scale);
in[0] = _mm_min_ps(in[0], int_max);
in[1] = _mm_min_ps(in[1], int_max);
in[2] = _mm_min_ps(in[2], int_max);
in[3] = _mm_min_ps(in[3], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[1] = _mm_max_ps(in[1], int_min);
in[2] = _mm_max_ps(in[2], int_min);
in[3] = _mm_max_ps(in[3], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
in[1] = _MM_CLAMP_PS(in[1], int_min, int_max);
in[2] = _MM_CLAMP_PS(in[2], int_min, int_max);
in[3] = _MM_CLAMP_PS(in[3], int_min, int_max);
_MM_TRANSPOSE4_PS(in[0], in[1], in[2], in[3]);
@ -541,8 +538,7 @@ conv_f32d_to_s32_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[0] = _mm_unpacklo_ps(in[0], in[1]);
in[0] = _mm_mul_ps(in[0], scale);
in[0] = _mm_min_ps(in[0], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvttps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
_mm_storeu_si128((__m128i*)d, out[0]);
@ -629,8 +625,7 @@ conv_f32d_to_s32_1s_dither_sse2(struct convert *conv, void * SPA_RESTRICT dst, c
for(n = 0; n < unrolled; n += 4) {
in[0] = _mm_mul_ps(_mm_load_ps(&s[n]), scale);
in[0] = _mm_add_ps(in[0], _mm_load_ps(&dither[n]));
in[0] = _mm_min_ps(in[0], int_max);
in[0] = _mm_max_ps(in[0], int_min);
in[0] = _MM_CLAMP_PS(in[0], int_min, int_max);
out[0] = _mm_cvttps_epi32(in[0]);
out[0] = _mm_slli_epi32(out[0], 8);
out[1] = _mm_shuffle_epi32(out[0], _MM_SHUFFLE(0, 3, 2, 1));
@ -647,8 +642,7 @@ conv_f32d_to_s32_1s_dither_sse2(struct convert *conv, void * SPA_RESTRICT dst, c
in[0] = _mm_load_ss(&s[n]);
in[0] = _mm_mul_ss(in[0], scale);
in[0] = _mm_add_ss(in[0], _mm_load_ss(&dither[n]));
in[0] = _mm_min_ss(in[0], int_max);
in[0] = _mm_max_ss(in[0], int_min);
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d = _mm_cvtss_si32(in[0]) << 8;
d += n_channels;
}
@ -1049,7 +1043,7 @@ conv_f32_to_s16_1_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_RES
}
for(; n < n_samples; n++) {
in[0] = _mm_mul_ss(_mm_load_ss(&s[n]), int_scale);
in[0] = _mm_min_ss(int_max, _mm_max_ss(in[0], int_min));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d++ = _mm_cvtss_si32(in[0]);
}
}
@ -1107,7 +1101,7 @@ conv_f32d_to_s16_1s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
}
for(; n < n_samples; n++) {
in[0] = _mm_mul_ss(_mm_load_ss(&s0[n]), int_scale);
in[0] = _mm_min_ss(int_max, _mm_max_ss(in[0], int_min));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
*d = _mm_cvttss_si32(in[0]);
d += n_channels;
}
@ -1156,8 +1150,8 @@ conv_f32d_to_s16_2s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
for(; n < n_samples; n++) {
in[0] = _mm_mul_ss(_mm_load_ss(&s0[n]), int_scale);
in[1] = _mm_mul_ss(_mm_load_ss(&s1[n]), int_scale);
in[0] = _mm_min_ss(int_max, _mm_max_ss(in[0], int_min));
in[1] = _mm_min_ss(int_max, _mm_max_ss(in[1], int_min));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
in[1] = _MM_CLAMP_SS(in[1], int_min, int_max);
d[0] = _mm_cvtss_si32(in[0]);
d[1] = _mm_cvtss_si32(in[1]);
d += n_channels;
@ -1216,10 +1210,10 @@ conv_f32d_to_s16_4s_sse2(void *data, void * SPA_RESTRICT dst, const void * SPA_R
in[1] = _mm_mul_ss(_mm_load_ss(&s1[n]), int_scale);
in[2] = _mm_mul_ss(_mm_load_ss(&s2[n]), int_scale);
in[3] = _mm_mul_ss(_mm_load_ss(&s3[n]), int_scale);
in[0] = _mm_min_ss(int_max, _mm_max_ss(in[0], int_min));
in[1] = _mm_min_ss(int_max, _mm_max_ss(in[1], int_min));
in[2] = _mm_min_ss(int_max, _mm_max_ss(in[2], int_min));
in[3] = _mm_min_ss(int_max, _mm_max_ss(in[3], int_min));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
in[1] = _MM_CLAMP_SS(in[1], int_min, int_max);
in[2] = _MM_CLAMP_SS(in[2], int_min, int_max);
in[3] = _MM_CLAMP_SS(in[3], int_min, int_max);
d[0] = _mm_cvtss_si32(in[0]);
d[1] = _mm_cvtss_si32(in[1]);
d[2] = _mm_cvtss_si32(in[2]);
@ -1287,8 +1281,8 @@ conv_f32d_to_s16_2_sse2(struct convert *conv, void * SPA_RESTRICT dst[], const v
for(; n < n_samples; n++) {
in[0] = _mm_mul_ss(_mm_load_ss(&s0[n]), int_scale);
in[1] = _mm_mul_ss(_mm_load_ss(&s1[n]), int_scale);
in[0] = _mm_min_ss(int_max, _mm_max_ss(in[0], int_min));
in[1] = _mm_min_ss(int_max, _mm_max_ss(in[1], int_min));
in[0] = _MM_CLAMP_SS(in[0], int_min, int_max);
in[1] = _MM_CLAMP_SS(in[1], int_min, int_max);
d[0] = _mm_cvtss_si32(in[0]);
d[1] = _mm_cvtss_si32(in[1]);
d += 2;