mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-03 09:01:54 -05:00
audiomixer: clean up mixer functions
Use the same limits as the format converter. Use a struct for 24bits. Use macros to generate the mixers.
This commit is contained in:
Wim Taymans
parent
4a82cb74e8
commit
f9660f5e8f
2 changed files with 85 additions and 280 deletions
|
|
@ -30,236 +30,34 @@
|
||||||
|
|
||||||
#include "mix-ops.h"
|
#include "mix-ops.h"
|
||||||
|
|
||||||
void
|
#define MAKE_FUNC(name,type,func) \
|
||||||
mix_s8_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
void mix_ ##name## _c(struct mix_ops *ops, \
|
||||||
uint32_t n_src, uint32_t n_samples)
|
void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[], \
|
||||||
{
|
uint32_t n_src, uint32_t n_samples) \
|
||||||
uint32_t i, n;
|
{ \
|
||||||
int8_t *d = dst;
|
uint32_t i, n; \
|
||||||
|
type *d = dst; \
|
||||||
if (n_src == 0)
|
n_samples *= ops->n_channels; \
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(int8_t));
|
if (n_src == 0) \
|
||||||
else if (dst != src[0])
|
memset(dst, 0, n_samples * sizeof(type)); \
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(int8_t));
|
else if (dst != src[0]) \
|
||||||
|
spa_memcpy(dst, src[0], n_samples * sizeof(type)); \
|
||||||
for (i = 1; i < n_src; i++) {
|
for (i = 1; i < n_src; i++) { \
|
||||||
const int8_t *s = src[i];
|
const type *s = src[i]; \
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
for (n = 0; n < n_samples; n++) \
|
||||||
d[n] = S8_MIX(d[n], s[n]);
|
d[n] = func (d[n], s[n]); \
|
||||||
}
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
MAKE_FUNC(s8, int8_t, S8_MIX);
|
||||||
mix_u8_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
MAKE_FUNC(u8, uint8_t, U8_MIX);
|
||||||
uint32_t n_src, uint32_t n_samples)
|
MAKE_FUNC(s16, int16_t, S16_MIX);
|
||||||
{
|
MAKE_FUNC(u16, uint16_t, U16_MIX);
|
||||||
uint32_t i, n;
|
MAKE_FUNC(s24, int24_t, S24_MIX);
|
||||||
uint8_t *d = dst;
|
MAKE_FUNC(u24, uint24_t, U24_MIX);
|
||||||
|
MAKE_FUNC(s32, int32_t, S32_MIX);
|
||||||
if (n_src == 0)
|
MAKE_FUNC(u32, uint32_t, U32_MIX);
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint8_t));
|
MAKE_FUNC(s24_32, int32_t, S24_32_MIX);
|
||||||
else if (dst != src[0])
|
MAKE_FUNC(u24_32, uint32_t, U24_32_MIX);
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint8_t));
|
MAKE_FUNC(f32, float, F32_MIX);
|
||||||
|
MAKE_FUNC(f64, double, F64_MIX);
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint8_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = U8_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_s16_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
int16_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(int16_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(int16_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const int16_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = S16_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_u16_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
uint16_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint16_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint16_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint16_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = U16_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_s24_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
uint8_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint8_t) * 3);
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint8_t) * 3);
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint8_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++) {
|
|
||||||
write_s24(d, S24_MIX(read_s24(d), read_s24(s)));
|
|
||||||
d += 3;
|
|
||||||
s += 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_u24_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
uint8_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint8_t) * 3);
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint8_t) * 3);
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint8_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++) {
|
|
||||||
write_u24(d, U24_MIX(read_u24(d), read_u24(s)));
|
|
||||||
d += 3;
|
|
||||||
s += 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_s32_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
int32_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(int32_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(int32_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const int32_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = S32_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_u32_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
uint32_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint32_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint32_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint32_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = U32_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_s24_32_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
int32_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(int32_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(int32_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const int32_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = S24_32_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_u24_32_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
uint32_t *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(uint32_t));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint32_t));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const uint32_t *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = U24_32_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_f32_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
float *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(float));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(float));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const float *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = F32_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
mix_f64_c(struct mix_ops *ops, void * SPA_RESTRICT dst, const void * SPA_RESTRICT src[],
|
|
||||||
uint32_t n_src, uint32_t n_samples)
|
|
||||||
{
|
|
||||||
uint32_t i, n;
|
|
||||||
double *d = dst;
|
|
||||||
|
|
||||||
if (n_src == 0)
|
|
||||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(double));
|
|
||||||
else if (dst != src[0])
|
|
||||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(double));
|
|
||||||
|
|
||||||
for (i = 1; i < n_src; i++) {
|
|
||||||
const double *s = src[i];
|
|
||||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
|
||||||
d[n] = F64_MIX(d[n], s[n]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -24,79 +24,86 @@
|
||||||
|
|
||||||
#include <spa/utils/defs.h>
|
#include <spa/utils/defs.h>
|
||||||
|
|
||||||
static inline uint32_t read_u24(const void *src)
|
typedef struct {
|
||||||
{
|
|
||||||
const uint8_t *s = src;
|
|
||||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||||
return (((uint32_t)s[2] << 16) | ((uint32_t)(uint8_t)s[1] << 8) | (uint32_t)(uint8_t)s[0]);
|
uint8_t v3;
|
||||||
|
uint8_t v2;
|
||||||
|
uint8_t v1;
|
||||||
#else
|
#else
|
||||||
return (((uint32_t)s[0] << 16) | ((uint32_t)(uint8_t)s[1] << 8) | (uint32_t)(uint8_t)s[2]);
|
uint8_t v1;
|
||||||
|
uint8_t v2;
|
||||||
|
uint8_t v3;
|
||||||
#endif
|
#endif
|
||||||
|
} __attribute__ ((packed)) uint24_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||||
|
uint8_t v3;
|
||||||
|
uint8_t v2;
|
||||||
|
int8_t v1;
|
||||||
|
#else
|
||||||
|
int8_t v1;
|
||||||
|
uint8_t v2;
|
||||||
|
uint8_t v3;
|
||||||
|
#endif
|
||||||
|
} __attribute__ ((packed)) int24_t;
|
||||||
|
|
||||||
|
static inline uint32_t u24_to_u32(uint24_t src)
|
||||||
|
{
|
||||||
|
return ((uint32_t)src.v1 << 16) | ((uint32_t)src.v2 << 8) | (uint32_t)src.v3;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int32_t read_s24(const void *src)
|
#define U32_TO_U24(s) (uint24_t) { .v1 = (uint8_t)(((uint32_t)s) >> 16), \
|
||||||
|
.v2 = (uint8_t)(((uint32_t)s) >> 8), .v3 = (uint8_t)((uint32_t)s) }
|
||||||
|
|
||||||
|
static inline uint24_t u32_to_u24(uint32_t src)
|
||||||
{
|
{
|
||||||
const int8_t *s = src;
|
return U32_TO_U24(src);
|
||||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
||||||
return (((int32_t)s[2] << 16) | ((uint32_t)(uint8_t)s[1] << 8) | (uint32_t)(uint8_t)s[0]);
|
|
||||||
#else
|
|
||||||
return (((int32_t)s[0] << 16) | ((uint32_t)(uint8_t)s[1] << 8) | (uint32_t)(uint8_t)s[2]);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void write_u24(void *dst, uint32_t val)
|
static inline int32_t s24_to_s32(int24_t src)
|
||||||
{
|
{
|
||||||
uint8_t *d = dst;
|
return ((int32_t)src.v1 << 16) | ((uint32_t)src.v2 << 8) | (uint32_t)src.v3;
|
||||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
||||||
d[0] = (uint8_t) (val);
|
|
||||||
d[1] = (uint8_t) (val >> 8);
|
|
||||||
d[2] = (uint8_t) (val >> 16);
|
|
||||||
#else
|
|
||||||
d[0] = (uint8_t) (val >> 16);
|
|
||||||
d[1] = (uint8_t) (val >> 8);
|
|
||||||
d[2] = (uint8_t) (val);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void write_s24(void *dst, int32_t val)
|
#define S32_TO_S24(s) (int24_t) { .v1 = (int8_t)(((int32_t)s) >> 16), \
|
||||||
|
.v2 = (uint8_t)(((uint32_t)s) >> 8), .v3 = (uint8_t)((uint32_t)s) }
|
||||||
|
|
||||||
|
static inline int24_t s32_to_s24(int32_t src)
|
||||||
{
|
{
|
||||||
uint8_t *d = dst;
|
return S32_TO_S24(src);
|
||||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
||||||
d[0] = (uint8_t) (val);
|
|
||||||
d[1] = (uint8_t) (val >> 8);
|
|
||||||
d[2] = (uint8_t) (val >> 16);
|
|
||||||
#else
|
|
||||||
d[0] = (uint8_t) (val >> 16);
|
|
||||||
d[1] = (uint8_t) (val >> 8);
|
|
||||||
d[2] = (uint8_t) (val);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define S8_MIN -127
|
|
||||||
|
#define S8_MIN -128
|
||||||
#define S8_MAX 127
|
#define S8_MAX 127
|
||||||
#define S8_MIX(a, b) (int8_t)(SPA_CLAMP((int16_t)(a) + (int16_t)(b), S8_MIN, S8_MAX))
|
#define S8_MIX(a,b) (int8_t)(SPA_CLAMP((int16_t)(a) + (int16_t)(b), S8_MIN, S8_MAX))
|
||||||
#define U8_MIX(a, b) (uint8_t)((int16_t)S8_MIX((int16_t)(a) - S8_MAX, (int16_t)(b) - S8_MAX) + S8_MAX)
|
#define U8_OFFS 128
|
||||||
|
#define U8_MIX(a,b) (uint8_t)((int16_t)S8_MIX((int16_t)(a) - U8_OFFS, (int16_t)(b) - U8_OFFS) + U8_OFFS)
|
||||||
|
|
||||||
#define S16_MIN -32767
|
#define S16_MIN -32768
|
||||||
#define S16_MAX 32767
|
#define S16_MAX 32767
|
||||||
#define S16_MIX(a, b) (int16_t)(SPA_CLAMP((int32_t)(a) + (int32_t)(b), S16_MIN, S16_MAX))
|
#define S16_MIX(a,b) (int16_t)(SPA_CLAMP((int32_t)(a) + (int32_t)(b), S16_MIN, S16_MAX))
|
||||||
#define U16_MIX(a, b) (uint16_t)((int32_t)S16_MIX((int32_t)(a) - S16_MAX, (int32_t)(b) - S16_MAX) + S16_MAX)
|
#define U16_OFFS 32768
|
||||||
|
#define U16_MIX(a,b) (uint16_t)((int32_t)S16_MIX((int32_t)(a) - U16_OFFS, (int32_t)(b) - U16_OFFS) + U16_OFFS)
|
||||||
|
|
||||||
#define S24_MIN -8388607
|
#define S24_MIN -8388608
|
||||||
#define S24_MAX 8388607
|
#define S24_MAX 8388607
|
||||||
#define S24_MIX(a, b) (int32_t)(SPA_CLAMP((int32_t)(a) + (int32_t)(b), S24_MIN, S24_MAX))
|
#define S24_MIX_32(a,b) (int32_t)(SPA_CLAMP((int32_t)(a) + (int32_t)(b), S24_MIN, S24_MAX))
|
||||||
#define U24_MIX(a, b) (uint32_t)((int32_t)S24_MIX((int32_t)(a) - S24_MAX, (int32_t)(b) - S24_MAX) + S24_MAX)
|
#define S24_MIX(a,b) s32_to_s24(S24_MIX_32(s24_to_s32(a), s24_to_s32(b)))
|
||||||
|
#define U24_OFFS 8388608
|
||||||
|
#define U24_MIX(a,b) u32_to_u24(S24_MIX_32((int32_t)u24_to_u32(a) - U24_OFFS, (int32_t)u24_to_u32(b) - U24_OFFS) + U24_OFFS)
|
||||||
|
|
||||||
#define S32_MIN -2147483647
|
#define S32_MIN -2147483648
|
||||||
#define S32_MAX 2147483647
|
#define S32_MAX 2147483647
|
||||||
#define S32_MIX(a, b) (int32_t)(SPA_CLAMP((int64_t)(a) + (int64_t)(b), S32_MIN, S32_MAX))
|
#define S32_MIX(a,b) (int32_t)(SPA_CLAMP((int64_t)(a) + (int64_t)(b), S32_MIN, S32_MAX))
|
||||||
#define U32_MIX(a, b) (uint32_t)((int64_t)S32_MIX((int64_t)(a) - S32_MAX, (int64_t)(b) - S32_MAX) + S32_MAX)
|
#define U32_OFFS 2147483648
|
||||||
|
#define U32_MIX(a,b) (uint32_t)((int64_t)S32_MIX((int64_t)(a) - U32_OFFS, (int64_t)(b) - U32_OFFS) + U32_OFFS)
|
||||||
|
|
||||||
#define S24_32_MIX(a, b) S24_MIX (a, b)
|
#define S24_32_MIX(a,b) (int32_t)(SPA_CLAMP((int32_t)(a) + (int32_t)(b), S24_MIN, S24_MAX))
|
||||||
#define U24_32_MIX(a, b) U24_MIX (a, b)
|
#define U24_32_MIX(a,b) (uint32_t)((int32_t)S24_32_MIX((int32_t)(a) - U24_OFFS, (int32_t)(b) - U24_OFFS) + U24_OFFS)
|
||||||
|
|
||||||
#define F32_MIX(a, b) (float)((float)(a) + (float)(b))
|
#define F32_MIX(a, b) (float)((float)(a) + (float)(b))
|
||||||
|
|
||||||
#define F64_MIX(a, b) (double)((double)(a) + (double)(b))
|
#define F64_MIX(a, b) (double)((double)(a) + (double)(b))
|
||||||
|
|
||||||
struct mix_ops {
|
struct mix_ops {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue