audioconvert: simplify 24 bits handling

Make a new uint42_t and int24_t type and use that to handle 24 bits
samples. This makes it easier because we can iterate and copy the
structs like other types.
This commit is contained in:
Wim Taymans 2022-07-01 12:24:35 +02:00
parent e395f62425
commit 817d5bd7a4
6 changed files with 204 additions and 247 deletions

View file

@ -30,7 +30,7 @@ static void
conv_s24_to_f32d_4s_ssse3(void *data, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src,
uint32_t n_channels, uint32_t n_samples)
{
const uint8_t *s = src;
const int24_t *s = src;
float *d0 = dst[0], *d1 = dst[1], *d2 = dst[2], *d3 = dst[3];
uint32_t n, unrolled;
__m128i in[4];
@ -48,9 +48,9 @@ conv_s24_to_f32d_4s_ssse3(void *data, void * SPA_RESTRICT dst[], const void * SP
for(n = 0; n < unrolled; n += 4) {
in[0] = _mm_loadu_si128((__m128i*)(s + 0*n_channels));
in[1] = _mm_loadu_si128((__m128i*)(s + 3*n_channels));
in[2] = _mm_loadu_si128((__m128i*)(s + 6*n_channels));
in[3] = _mm_loadu_si128((__m128i*)(s + 9*n_channels));
in[1] = _mm_loadu_si128((__m128i*)(s + 1*n_channels));
in[2] = _mm_loadu_si128((__m128i*)(s + 2*n_channels));
in[3] = _mm_loadu_si128((__m128i*)(s + 3*n_channels));
in[0] = _mm_shuffle_epi8(in[0], mask);
in[1] = _mm_shuffle_epi8(in[1], mask);
in[2] = _mm_shuffle_epi8(in[2], mask);
@ -74,13 +74,13 @@ conv_s24_to_f32d_4s_ssse3(void *data, void * SPA_RESTRICT dst[], const void * SP
_mm_store_ps(&d1[n], out[1]);
_mm_store_ps(&d2[n], out[2]);
_mm_store_ps(&d3[n], out[3]);
s += 12 * n_channels;
s += 4 * n_channels;
}
for(; n < n_samples; n++) {
out[0] = _mm_cvtsi32_ss(factor, read_s24(s));
out[1] = _mm_cvtsi32_ss(factor, read_s24(s+3));
out[2] = _mm_cvtsi32_ss(factor, read_s24(s+6));
out[3] = _mm_cvtsi32_ss(factor, read_s24(s+9));
out[0] = _mm_cvtsi32_ss(factor, s24_to_s32(*s));
out[1] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+1)));
out[2] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+2)));
out[3] = _mm_cvtsi32_ss(factor, s24_to_s32(*(s+3)));
out[0] = _mm_mul_ss(out[0], factor);
out[1] = _mm_mul_ss(out[1], factor);
out[2] = _mm_mul_ss(out[2], factor);
@ -89,7 +89,7 @@ conv_s24_to_f32d_4s_ssse3(void *data, void * SPA_RESTRICT dst[], const void * SP
_mm_store_ss(&d1[n], out[1]);
_mm_store_ss(&d2[n], out[2]);
_mm_store_ss(&d3[n], out[3]);
s += 3 * n_channels;
s += n_channels;
}
}