mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-12-20 08:56:56 -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"
|
||||
|
||||
void
|
||||
mix_s8_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;
|
||||
int8_t *d = dst;
|
||||
|
||||
if (n_src == 0)
|
||||
memset(dst, 0, n_samples * ops->n_channels * sizeof(int8_t));
|
||||
else if (dst != src[0])
|
||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(int8_t));
|
||||
|
||||
for (i = 1; i < n_src; i++) {
|
||||
const int8_t *s = src[i];
|
||||
for (n = 0; n < n_samples * ops->n_channels; n++)
|
||||
d[n] = S8_MIX(d[n], s[n]);
|
||||
}
|
||||
#define MAKE_FUNC(name,type,func) \
|
||||
void mix_ ##name## _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; \
|
||||
type *d = dst; \
|
||||
n_samples *= ops->n_channels; \
|
||||
if (n_src == 0) \
|
||||
memset(dst, 0, n_samples * sizeof(type)); \
|
||||
else if (dst != src[0]) \
|
||||
spa_memcpy(dst, src[0], n_samples * sizeof(type)); \
|
||||
for (i = 1; i < n_src; i++) { \
|
||||
const type *s = src[i]; \
|
||||
for (n = 0; n < n_samples; n++) \
|
||||
d[n] = func (d[n], s[n]); \
|
||||
} \
|
||||
}
|
||||
|
||||
void
|
||||
mix_u8_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));
|
||||
else if (dst != src[0])
|
||||
spa_memcpy(dst, src[0], n_samples * ops->n_channels * sizeof(uint8_t));
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
MAKE_FUNC(s8, int8_t, S8_MIX);
|
||||
MAKE_FUNC(u8, uint8_t, U8_MIX);
|
||||
MAKE_FUNC(s16, int16_t, S16_MIX);
|
||||
MAKE_FUNC(u16, uint16_t, U16_MIX);
|
||||
MAKE_FUNC(s24, int24_t, S24_MIX);
|
||||
MAKE_FUNC(u24, uint24_t, U24_MIX);
|
||||
MAKE_FUNC(s32, int32_t, S32_MIX);
|
||||
MAKE_FUNC(u32, uint32_t, U32_MIX);
|
||||
MAKE_FUNC(s24_32, int32_t, S24_32_MIX);
|
||||
MAKE_FUNC(u24_32, uint32_t, U24_32_MIX);
|
||||
MAKE_FUNC(f32, float, F32_MIX);
|
||||
MAKE_FUNC(f64, double, F64_MIX);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue