audioconvert: improvements

This commit is contained in:
Wim Taymans 2018-04-02 20:05:11 +02:00
parent 2cfb206d7c
commit 0b4cef586f
8 changed files with 710 additions and 29 deletions

View file

@ -22,6 +22,16 @@
#include <spa/utils/defs.h>
#define U8_TO_F32(v) (((v) / 128.0) - 1.0)
#define F32_TO_U8(v) \
({ \
typeof(v) _v = (v); \
_v < -1.0f ? 0 : \
_v >= 1.0f ? 255 : \
(_v * 127.0f) + 128.0f; \
})
#define S16_TO_F32(v) ((v) / 32767.0)
#define F32_TO_S16(v) \
@ -33,7 +43,7 @@
})
static void
s16_to_f32(void *dst, const void *src, int n_bytes)
conv_s16_to_f32(void *dst, const void *src, int n_bytes)
{
const int16_t *s = src;
float *d = dst;
@ -44,51 +54,98 @@ s16_to_f32(void *dst, const void *src, int n_bytes)
}
static void
s16_to_f32_di(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
conv_s16_to_f32d(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
{
const int16_t *s = src;
float **d = (float **) dst;
int i;
n_bytes /= sizeof(int16_t);
n_bytes /= (sizeof(int16_t) * n_dst);
while (n_bytes--)
for (i = 0; i < n_dst; i++)
*d[i]++ = S16_TO_F32(*s++);
}
static void
s16_to_f32_i(void *dst, int n_src, const void *src[n_src], int n_bytes)
conv_f32d_to_s16(void *dst, int n_src, const void *src[n_src], int n_bytes)
{
const int16_t **s = src;
const int16_t **s = (const int16_t **) src;
float *d = dst;
int i;
n_bytes /= sizeof(int16_t);
n_bytes /= (sizeof(float) * n_src);
while (n_bytes--)
for (i = 0; i < n_src; i++)
*d++ = S16_TO_F32(*s[i]++);
*d++ = F32_TO_S16(*s[i]++);
}
static void
f32_to_s16(void *dst, const void *src, int n_bytes)
conv_f32_to_s16(void *dst, const void *src, int n_bytes)
{
const float *s = src;
int16_t *d = dst;
n_bytes /= sizeof(float);
while (n_bytes--) {
*d++ = F32_TO_S16(*s);
s++;
}
while (n_bytes--)
*d++ = F32_TO_S16(*s++);
}
static void
conv_u8_to_f32(void *dst, const void *src, int n_bytes)
{
const int8_t *s = src;
float *d = dst;
while (n_bytes--)
*d++ = U8_TO_F32(*s++);
}
static void
deinterleave_1(void *dst[], int n_dst, const void *src, int n_bytes)
conv_u8_to_f32d(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
{
const int8_t *s = src;
float **d = (float **) dst;
int i;
n_bytes /= n_dst;
while (n_bytes--)
for (i = 0; i < n_dst; i++)
*d[i]++ = U8_TO_F32(*s++);
}
static void
conv_f32d_to_u8(void *dst, int n_src, const void *src[n_src], int n_bytes)
{
const int8_t **s = (const int8_t **) src;
float *d = dst;
int i;
n_bytes /= (sizeof(float) * n_src);
while (n_bytes--)
for (i = 0; i < n_src; i++)
*d++ = F32_TO_U8(*s[i]++);
}
static void
conv_f32_to_u8(void *dst, const void *src, int n_bytes)
{
const float *s = src;
int8_t *d = dst;
n_bytes /= sizeof(float);
while (n_bytes--)
*d++ = F32_TO_U8(*s++);
}
static void
deinterleave_8(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
{
const uint8_t *s = src;
uint8_t **d = (uint8_t **) dst;
int i;
n_bytes /= n_dst;
while (n_bytes--) {
for (i = 0; i < n_dst; i++)
*d[i]++ = *s++;
@ -96,13 +153,13 @@ deinterleave_1(void *dst[], int n_dst, const void *src, int n_bytes)
}
static void
deinterleave_2(void *dst[], int n_dst, const void *src, int n_bytes)
deinterleave_16(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
{
const uint16_t *s = src;
uint16_t **d = (uint16_t **) dst;
int i;
n_bytes /= sizeof(uint16_t);
n_bytes /= (sizeof(uint16_t) * n_dst);
while (n_bytes--) {
for (i = 0; i < n_dst; i++)
*d[i]++ = *s++;
@ -110,15 +167,29 @@ deinterleave_2(void *dst[], int n_dst, const void *src, int n_bytes)
}
static void
deinterleave_4(void *dst[], int n_dst, const void *src, int n_bytes)
deinterleave_32(int n_dst, void *dst[n_dst], const void *src, int n_bytes)
{
const uint32_t *s = src;
uint32_t **d = (uint32_t **) dst;
int i;
n_bytes /= sizeof(uint32_t);
n_bytes /= (sizeof(uint32_t) * n_dst);
while (n_bytes--) {
for (i = 0; i < n_dst; i++)
*d[i]++ = *s++;
}
}
static void
interleave_32(void *dst, int n_src, const void *src[n_src], int n_bytes)
{
const int32_t **s = (const int32_t **) src;
uint32_t *d = dst;
int i;
n_bytes /= (sizeof(uint32_t) * n_src);
while (n_bytes--) {
for (i = 0; i < n_src; i++)
*d++ = *s[i]++;
}
}