Removed obsolete interleave plugin. Rewritten and fixed other for efficiency.

This commit is contained in:
Abramo Bagnara 2000-04-12 20:38:48 +00:00
parent 87ab887d33
commit e963b9f371
10 changed files with 1638 additions and 1448 deletions

View file

@ -24,8 +24,6 @@
#include "../../include/driver.h"
#include "../../include/pcm.h"
#include "../../include/pcm_plugin.h"
#define bswap_16(x) __swab16((x))
#define bswap_32(x) __swab32((x))
#else
#include <stdio.h>
#include <stdlib.h>
@ -42,261 +40,51 @@
* Basic linear conversion plugin
*/
typedef void (*linear_f)(void *src, void *dst, size_t size);
typedef struct linear_private_data {
int src_sample_size, dst_sample_size;
linear_f func;
int copy;
} linear_t;
#define LIN_FUNC(name, srctype, dsttype, val) \
static void lin_##name(void *src_ptr, void *dst_ptr, size_t size) \
{ \
srctype *srcp = src_ptr; \
dsttype *dstp = dst_ptr; \
while (size--) { \
srctype src = *srcp++; \
*dstp++ = val; \
} \
static void convert(snd_pcm_plugin_t *plugin,
const snd_pcm_plugin_voice_t *src_voices,
const snd_pcm_plugin_voice_t *dst_voices,
size_t samples)
{
#define COPY_LABELS
#include "plugin_ops.h"
#undef COPY_LABELS
linear_t *data = (linear_t *)plugin->extra_data;
void *copy = copy_labels[data->copy];
int voice;
int nvoices = plugin->src_format.voices;
for (voice = 0; voice < nvoices; ++voice) {
char *src;
char *dst;
int src_step, dst_step;
size_t samples1;
if (src_voices[voice].addr == NULL) {
if (dst_voices[voice].addr != NULL) {
// null_voice(&dst_voices[voice]);
zero_voice(plugin, &dst_voices[voice], samples);
}
continue;
}
src = src_voices[voice].addr + src_voices[voice].offset / 8;
dst = dst_voices[voice].addr + dst_voices[voice].offset / 8;
src_step = src_voices[voice].next / 8;
dst_step = dst_voices[voice].next / 8;
samples1 = samples;
while (samples1-- > 0) {
goto *copy;
#define COPY_END after
#include "plugin_ops.h"
#undef COPY_END
after:
src += src_step;
dst += dst_step;
}
}
}
LIN_FUNC(8_sign, u_int8_t, u_int8_t, src ^ 0x80)
LIN_FUNC(8_16, u_int8_t, u_int16_t, (u_int16_t)src << 8)
LIN_FUNC(8_16_end, u_int8_t, u_int16_t, (u_int16_t)src)
LIN_FUNC(8_16_sign, u_int8_t, u_int16_t, (u_int16_t)(src ^ 0x80) << 8)
LIN_FUNC(8_16_sign_end, u_int8_t, u_int16_t, (u_int16_t)src ^ 0x80)
LIN_FUNC(8_24, u_int8_t, u_int32_t, (u_int32_t)src << 16)
LIN_FUNC(8_24_end, u_int8_t, u_int32_t, (u_int32_t)src << 8)
LIN_FUNC(8_24_sign, u_int8_t, u_int32_t, (u_int32_t)(src ^ 0x80) << 16)
LIN_FUNC(8_24_sign_end, u_int8_t, u_int32_t, (u_int32_t)(src ^ 0x80) << 8)
LIN_FUNC(8_32, u_int8_t, u_int32_t, (u_int32_t)src << 24)
LIN_FUNC(8_32_end, u_int8_t, u_int32_t, (u_int32_t)src)
LIN_FUNC(8_32_sign, u_int8_t, u_int32_t, (u_int32_t)(src ^ 0x80) << 24)
LIN_FUNC(8_32_sign_end, u_int8_t, u_int32_t, (u_int32_t)src ^ 0x80)
LIN_FUNC(16_8, u_int16_t, u_int8_t, src >> 8)
LIN_FUNC(16_end_8, u_int16_t, u_int8_t, src)
LIN_FUNC(16_8_sign, u_int16_t, u_int8_t, (src >> 8) ^ 0x80)
LIN_FUNC(16_end_8_sign, u_int16_t, u_int8_t, src ^ 0x80)
LIN_FUNC(16_sign, u_int16_t, u_int16_t, src ^ 0x8000)
LIN_FUNC(16_end, u_int16_t, u_int16_t, bswap_16(src))
LIN_FUNC(16_end_sign, u_int16_t, u_int16_t, bswap_16(src) ^ 0x8000)
LIN_FUNC(16_sign_end, u_int16_t, u_int16_t, bswap_16(src ^ 0x8000))
LIN_FUNC(16_end_sign_end, u_int16_t, u_int16_t, src ^ 0x80)
LIN_FUNC(16_24, u_int16_t, u_int32_t, (u_int32_t)src << 8)
LIN_FUNC(16_24_sign, u_int16_t, u_int32_t, (u_int32_t)(src ^ 0x8000) << 8)
LIN_FUNC(16_24_end, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src) << 8)
LIN_FUNC(16_24_sign_end, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src ^ 0x8000) << 8)
LIN_FUNC(16_end_24, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src) << 8)
LIN_FUNC(16_end_24_sign, u_int16_t, u_int32_t, (u_int32_t)(bswap_16(src) ^ 0x8000) << 8)
LIN_FUNC(16_end_24_end, u_int16_t, u_int32_t, (u_int32_t)src << 8)
LIN_FUNC(16_end_24_sign_end, u_int16_t, u_int32_t, ((u_int32_t)src ^ 0x80) << 8)
LIN_FUNC(16_32, u_int16_t, u_int32_t, (u_int32_t)src << 16)
LIN_FUNC(16_32_sign, u_int16_t, u_int32_t, (u_int32_t)(src ^ 0x8000) << 16)
LIN_FUNC(16_32_end, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src))
LIN_FUNC(16_32_sign_end, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src ^ 0x8000))
LIN_FUNC(16_end_32, u_int16_t, u_int32_t, (u_int32_t)bswap_16(src) << 16)
LIN_FUNC(16_end_32_sign, u_int16_t, u_int32_t, (u_int32_t)(bswap_16(src) ^ 0x8000) << 16)
LIN_FUNC(16_end_32_end, u_int16_t, u_int32_t, (u_int32_t)src)
LIN_FUNC(16_end_32_sign_end, u_int16_t, u_int32_t, (u_int32_t)src ^ 0x80)
LIN_FUNC(24_8, u_int32_t, u_int8_t, src >> 16)
LIN_FUNC(24_end_8, u_int32_t, u_int8_t, src >> 8)
LIN_FUNC(24_8_sign, u_int32_t, u_int8_t, (src >> 16) ^ 0x80)
LIN_FUNC(24_end_8_sign, u_int32_t, u_int8_t, (src >> 8) ^ 0x80)
LIN_FUNC(24_16, u_int32_t, u_int16_t, src >> 8)
LIN_FUNC(24_16_sign, u_int32_t, u_int16_t, (src >> 8) ^ 0x8000)
LIN_FUNC(24_16_end, u_int32_t, u_int16_t, bswap_32(src >> 8))
LIN_FUNC(24_16_sign_end, u_int32_t, u_int16_t, bswap_32((src >> 8) ^ 0x8000))
LIN_FUNC(24_end_16, u_int32_t, u_int16_t, bswap_32(src) >> 8)
LIN_FUNC(24_end_16_sign, u_int32_t, u_int16_t, (bswap_32(src) >> 8) ^ 0x8000)
LIN_FUNC(24_end_16_end, u_int32_t, u_int16_t, src >> 8)
LIN_FUNC(24_end_16_sign_end, u_int32_t, u_int16_t, (src >> 8) ^ 0x80)
LIN_FUNC(24_sign, u_int32_t, u_int32_t, src ^ 0x800000)
LIN_FUNC(24_end, u_int32_t, u_int32_t, bswap_32(src))
LIN_FUNC(24_end_sign, u_int32_t, u_int32_t, bswap_32(src) ^ 0x800000)
LIN_FUNC(24_sign_end, u_int32_t, u_int32_t, bswap_32(src) ^ 0x80)
LIN_FUNC(24_end_sign_end, u_int32_t, u_int32_t, src ^ 0x80)
LIN_FUNC(24_32, u_int32_t, u_int32_t, src << 8)
LIN_FUNC(24_32_sign, u_int32_t, u_int32_t, (src << 8) ^ 0x80000000)
LIN_FUNC(24_32_end, u_int32_t, u_int32_t, bswap_32(src << 8))
LIN_FUNC(24_32_sign_end, u_int32_t, u_int32_t, bswap_32((src << 8) ^ 0x80000000))
LIN_FUNC(24_end_32, u_int32_t, u_int32_t, bswap_32(src) << 8)
LIN_FUNC(24_end_32_sign, u_int32_t, u_int32_t, (bswap_32(src) << 8) ^ 0x80000000)
LIN_FUNC(24_end_32_end, u_int32_t, u_int32_t, src >> 8)
LIN_FUNC(24_end_32_sign_end, u_int32_t, u_int32_t, (src >> 8) ^ 0x80)
LIN_FUNC(32_8, u_int32_t, u_int8_t, src >> 24)
LIN_FUNC(32_end_8, u_int32_t, u_int8_t, src)
LIN_FUNC(32_8_sign, u_int32_t, u_int8_t, (src >> 24) ^ 0x80)
LIN_FUNC(32_end_8_sign, u_int32_t, u_int8_t, src ^ 0x80)
LIN_FUNC(32_16, u_int32_t, u_int16_t, src >> 16)
LIN_FUNC(32_16_sign, u_int32_t, u_int16_t, (src >> 16) ^ 0x8000)
LIN_FUNC(32_16_end, u_int32_t, u_int16_t, bswap_16(src >> 16))
LIN_FUNC(32_16_sign_end, u_int32_t, u_int16_t, bswap_16((src >> 16) ^ 0x8000))
LIN_FUNC(32_end_16, u_int32_t, u_int16_t, bswap_16(src))
LIN_FUNC(32_end_16_sign, u_int32_t, u_int16_t, bswap_16(src) ^ 0x8000)
LIN_FUNC(32_end_16_end, u_int32_t, u_int16_t, src)
LIN_FUNC(32_end_16_sign_end, u_int32_t, u_int16_t, src ^ 0x80)
LIN_FUNC(32_24, u_int32_t, u_int32_t, src >> 8)
LIN_FUNC(32_24_sign, u_int32_t, u_int32_t, (src >> 8) ^ 0x800000)
LIN_FUNC(32_24_end, u_int32_t, u_int32_t, bswap_32(src >> 8))
LIN_FUNC(32_24_sign_end, u_int32_t, u_int32_t, bswap_32((src >> 8) ^ 0x800000))
LIN_FUNC(32_end_24, u_int32_t, u_int32_t, bswap_32(src) >> 8)
LIN_FUNC(32_end_24_sign, u_int32_t, u_int32_t, (bswap_32(src) >> 8) ^ 0x800000)
LIN_FUNC(32_end_24_end, u_int32_t, u_int32_t, src << 8)
LIN_FUNC(32_end_24_sign_end, u_int32_t, u_int32_t, (src << 8) ^ 0x80)
LIN_FUNC(32_sign, u_int32_t, u_int32_t, src ^ 0x80000000)
LIN_FUNC(32_end, u_int32_t, u_int32_t, bswap_32(src))
LIN_FUNC(32_end_sign, u_int32_t, u_int32_t, bswap_32(src) ^ 0x80000000)
LIN_FUNC(32_sign_end, u_int32_t, u_int32_t, bswap_32(src) ^ 0x80)
LIN_FUNC(32_end_sign_end, u_int32_t, u_int32_t, src ^ 0x80)
/* src_wid dst_wid src_endswap, dst_endswap, sign_swap */
static linear_f linear_functions[4 * 4 * 2 * 2 * 2] = {
NULL, /* 8->8: Nothing to do */
lin_8_sign, /* 8->8 sign: lin_8_sign */
NULL, /* 8->8 dst_end: Nothing to do */
lin_8_sign, /* 8->8 dst_end sign: lin_8_sign */
NULL, /* 8->8 src_end: Nothing to do */
lin_8_sign, /* 8->8 src_end sign: lin_8_sign */
NULL, /* 8->8 src_end dst_end: Nothing to do */
lin_8_sign, /* 8->8 src_end dst_end sign: lin_8_sign */
lin_8_16, /* 8->16: lin_8_16 */
lin_8_16_sign, /* 8->16 sign: lin_8_16_sign */
lin_8_16_end, /* 8->16 dst_end: lin_8_16_end */
lin_8_16_sign_end, /* 8->16 dst_end sign: lin_8_16_sign_end */
lin_8_16, /* 8->16 src_end: lin_8_16 */
lin_8_16_sign, /* 8->16 src_end sign: lin_8_16_sign */
lin_8_16_end, /* 8->16 src_end dst_end: lin_8_16_end */
lin_8_16_sign_end, /* 8->16 src_end dst_end sign: lin_8_16_sign_end */
lin_8_24, /* 8->24: lin_8_24 */
lin_8_24_sign, /* 8->24 sign: lin_8_24_sign */
lin_8_24_end, /* 8->24 dst_end: lin_8_24_end */
lin_8_24_sign_end, /* 8->24 dst_end sign: lin_8_24_sign_end */
lin_8_24, /* 8->24 src_end: lin_8_24 */
lin_8_24_sign, /* 8->24 src_end sign: lin_8_24_sign */
lin_8_24_end, /* 8->24 src_end dst_end: lin_8_24_end */
lin_8_24_sign_end, /* 8->24 src_end dst_end sign: lin_8_24_sign_end */
lin_8_32, /* 8->32: lin_8_32 */
lin_8_32_sign, /* 8->32 sign: lin_8_32_sign */
lin_8_32_end, /* 8->32 dst_end: lin_8_32_end */
lin_8_32_sign_end, /* 8->32 dst_end sign: lin_8_32_sign_end */
lin_8_32, /* 8->32 src_end: lin_8_32 */
lin_8_32_sign, /* 8->32 src_end sign: lin_8_32_sign */
lin_8_32_end, /* 8->32 src_end dst_end: lin_8_32_end */
lin_8_32_sign_end, /* 8->32 src_end dst_end sign: lin_8_32_sign_end */
lin_16_8, /* 16->8: lin_16_8 */
lin_16_8_sign, /* 16->8 sign: lin_16_8_sign */
lin_16_8, /* 16->8 dst_end: lin_16_8 */
lin_16_8_sign, /* 16->8 dst_end sign: lin_16_8_sign */
lin_16_end_8, /* 16->8 src_end: lin_16_end_8 */
lin_16_end_8_sign, /* 16->8 src_end sign: lin_16_end_8_sign */
lin_16_end_8, /* 16->8 src_end dst_end: lin_16_end_8 */
lin_16_end_8_sign, /* 16->8 src_end dst_end sign: lin_16_end_8_sign */
NULL, /* 16->16: Nothing to do */
lin_16_sign, /* 16->16 sign: lin_16_sign */
lin_16_end, /* 16->16 dst_end: lin_16_end */
lin_16_sign_end, /* 16->16 dst_end sign: lin_16_sign_end */
lin_16_end, /* 16->16 src_end: lin_16_end */
lin_16_end_sign, /* 16->16 src_end sign: lin_16_end_sign */
NULL, /* 16->16 src_end dst_end: Nothing to do */
lin_16_end_sign_end, /* 16->16 src_end dst_end sign: lin_16_end_sign_end */
lin_16_24, /* 16->24: lin_16_24 */
lin_16_24_sign, /* 16->24 sign: lin_16_24_sign */
lin_16_24_end, /* 16->24 dst_end: lin_16_24_end */
lin_16_24_sign_end, /* 16->24 dst_end sign: lin_16_24_sign_end */
lin_16_end_24, /* 16->24 src_end: lin_16_end_24 */
lin_16_end_24_sign, /* 16->24 src_end sign: lin_16_end_24_sign */
lin_16_end_24_end, /* 16->24 src_end dst_end: lin_16_end_24_end */
lin_16_end_24_sign_end,/* 16->24 src_end dst_end sign: lin_16_end_24_sign_end */
lin_16_32, /* 16->32: lin_16_32 */
lin_16_32_sign, /* 16->32 sign: lin_16_32_sign */
lin_16_32_end, /* 16->32 dst_end: lin_16_32_end */
lin_16_32_sign_end, /* 16->32 dst_end sign: lin_16_32_sign_end */
lin_16_end_32, /* 16->32 src_end: lin_16_end_32 */
lin_16_end_32_sign, /* 16->32 src_end sign: lin_16_end_32_sign */
lin_16_end_32_end, /* 16->32 src_end dst_end: lin_16_end_32_end */
lin_16_end_32_sign_end,/* 16->32 src_end dst_end sign: lin_16_end_32_sign_end */
lin_24_8, /* 24->8: lin_24_8 */
lin_24_8_sign, /* 24->8 sign: lin_24_8_sign */
lin_24_8, /* 24->8 dst_end: lin_24_8 */
lin_24_8_sign, /* 24->8 dst_end sign: lin_24_8_sign */
lin_24_end_8, /* 24->8 src_end: lin_24_end_8 */
lin_24_end_8_sign, /* 24->8 src_end sign: lin_24_end_8_sign */
lin_24_end_8, /* 24->8 src_end dst_end: lin_24_end_8 */
lin_24_end_8_sign, /* 24->8 src_end dst_end sign: lin_24_end_8_sign */
lin_24_16, /* 24->16: lin_24_16 */
lin_24_16_sign, /* 24->16 sign: lin_24_16_sign */
lin_24_16_end, /* 24->16 dst_end: lin_24_16_end */
lin_24_16_sign_end, /* 24->16 dst_end sign: lin_24_16_sign_end */
lin_24_end_16, /* 24->16 src_end: lin_24_end_16 */
lin_24_end_16_sign, /* 24->16 src_end sign: lin_24_end_16_sign */
lin_24_end_16_end, /* 24->16 src_end dst_end: lin_24_end_16_end */
lin_24_end_16_sign_end,/* 24->16 src_end dst_end sign: lin_24_end_16_sign_end */
NULL, /* 24->24: Nothing to do */
lin_24_sign, /* 24->24 sign: lin_24_sign */
lin_24_end, /* 24->24 dst_end: lin_24_end */
lin_24_sign_end, /* 24->24 dst_end sign: lin_24_sign_end */
lin_24_end, /* 24->24 src_end: lin_24_end */
lin_24_end_sign, /* 24->24 src_end sign: lin_24_end_sign */
NULL, /* 24->24 src_end dst_end: Nothing to do */
lin_24_end_sign_end, /* 24->24 src_end dst_end sign: lin_24_end_sign_end */
lin_24_32, /* 24->32: lin_24_32 */
lin_24_32_sign, /* 24->32 sign: lin_24_32_sign */
lin_24_32_end, /* 24->32 dst_end: lin_24_32_end */
lin_24_32_sign_end, /* 24->32 dst_end sign: lin_24_32_sign_end */
lin_24_end_32, /* 24->32 src_end: lin_24_end_32 */
lin_24_end_32_sign, /* 24->32 src_end sign: lin_24_end_32_sign */
lin_24_end_32_end, /* 24->32 src_end dst_end: lin_24_end_32_end */
lin_24_end_32_sign_end,/* 24->32 src_end dst_end sign: lin_24_end_32_sign_end */
lin_32_8, /* 32->8: lin_32_8 */
lin_32_8_sign, /* 32->8 sign: lin_32_8_sign */
lin_32_8, /* 32->8 dst_end: lin_32_8 */
lin_32_8_sign, /* 32->8 dst_end sign: lin_32_8_sign */
lin_32_end_8, /* 32->8 src_end: lin_32_end_8 */
lin_32_end_8_sign, /* 32->8 src_end sign: lin_32_end_8_sign */
lin_32_end_8, /* 32->8 src_end dst_end: lin_32_end_8 */
lin_32_end_8_sign, /* 32->8 src_end dst_end sign: lin_32_end_8_sign */
lin_32_16, /* 32->16: lin_32_16 */
lin_32_16_sign, /* 32->16 sign: lin_32_16_sign */
lin_32_16_end, /* 32->16 dst_end: lin_32_16_end */
lin_32_16_sign_end, /* 32->16 dst_end sign: lin_32_16_sign_end */
lin_32_end_16, /* 32->16 src_end: lin_32_end_16 */
lin_32_end_16_sign, /* 32->16 src_end sign: lin_32_end_16_sign */
lin_32_end_16_end, /* 32->16 src_end dst_end: lin_32_end_16_end */
lin_32_end_16_sign_end,/* 32->16 src_end dst_end sign: lin_32_end_16_sign_end */
lin_32_24, /* 32->24: lin_32_24 */
lin_32_24_sign, /* 32->24 sign: lin_32_24_sign */
lin_32_24_end, /* 32->24 dst_end: lin_32_24_end */
lin_32_24_sign_end, /* 32->24 dst_end sign: lin_32_24_sign_end */
lin_32_end_24, /* 32->24 src_end: lin_32_end_24 */
lin_32_end_24_sign, /* 32->24 src_end sign: lin_32_end_24_sign */
lin_32_end_24_end, /* 32->24 src_end dst_end: lin_32_end_24_end */
lin_32_end_24_sign_end,/* 32->24 src_end dst_end sign: lin_32_end_24_sign_end */
NULL, /* 32->32: Nothing to do */
lin_32_sign, /* 32->32 sign: lin_32_sign */
lin_32_end, /* 32->32 dst_end: lin_32_end */
lin_32_sign_end, /* 32->32 dst_end sign: lin_32_sign_end */
lin_32_end, /* 32->32 src_end: lin_32_end */
lin_32_end_sign, /* 32->32 src_end sign: lin_32_end_sign */
NULL, /* 32->32 src_end dst_end: Nothing to do */
lin_32_end_sign_end /* 32->32 src_end dst_end sign: lin_32_end_sign_end */
};
static ssize_t linear_transfer(snd_pcm_plugin_t *plugin,
const snd_pcm_plugin_voice_t *src_voices,
const snd_pcm_plugin_voice_t *dst_voices,
@ -304,25 +92,56 @@ static ssize_t linear_transfer(snd_pcm_plugin_t *plugin,
{
linear_t *data;
int voice;
ssize_t result;
if (plugin == NULL || src_voices == NULL || dst_voices == NULL || samples < 0)
if (plugin == NULL || src_voices == NULL || dst_voices == NULL)
return -EFAULT;
data = (linear_t *)plugin->extra_data;
if (samples < 0)
return -EINVAL;
if (samples == 0)
return 0;
data = (linear_t *)plugin->extra_data;
for (voice = 0, result = 0; voice < plugin->src_format.voices; voice++) {
if (src_voices[voice].addr == NULL)
continue;
if (dst_voices[voice].addr == NULL)
for (voice = 0; voice < plugin->src_format.voices; voice++) {
if (src_voices[voice].addr != NULL &&
dst_voices[voice].addr == NULL)
return -EFAULT;
if (src_voices[voice].offset % 8 != 0 ||
src_voices[voice].next % 8 != 0)
return -EINVAL;
if (dst_voices[voice].offset % 8 != 0 ||
dst_voices[voice].next % 8 != 0)
return -EINVAL;
data->func(src_voices[voice].addr,
dst_voices[voice].addr,
samples);
}
convert(plugin, src_voices, dst_voices, samples);
return samples;
}
int copy_index(int src_format, int dst_format)
{
int src_endian, dst_endian, sign, src_width, dst_width;
sign = (snd_pcm_format_signed(src_format) !=
snd_pcm_format_signed(dst_format));
#if __BYTE_ORDER == __LITTLE_ENDIAN
src_endian = snd_pcm_format_big_endian(src_format);
dst_endian = snd_pcm_format_big_endian(dst_format);
#elif __BYTE_ORDER == __BIG_ENDIAN
src_endian = snd_pcm_format_little_endian(src_format);
dst_endian = snd_pcm_format_little_endian(dst_format);
#else
#error "Unsupported endian..."
#endif
if (src_endian < 0)
src_endian = 0;
if (dst_endian < 0)
dst_endian = 0;
src_width = snd_pcm_format_width(src_format) / 8 - 1;
dst_width = snd_pcm_format_width(dst_format) / 8 - 1;
return src_width * 32 + src_endian * 16 + sign * 8 + dst_width * 2 + dst_endian;
}
int snd_pcm_plugin_build_linear(snd_pcm_plugin_handle_t *handle,
snd_pcm_format_t *src_format,
snd_pcm_format_t *dst_format,
@ -330,16 +149,11 @@ int snd_pcm_plugin_build_linear(snd_pcm_plugin_handle_t *handle,
{
struct linear_private_data *data;
snd_pcm_plugin_t *plugin;
linear_f func;
int src_endian, dst_endian, sign, src_width, dst_width;
if (r_plugin == NULL)
return -EINVAL;
return -EFAULT;
*r_plugin = NULL;
if (src_format->interleave != dst_format->interleave &&
src_format->voices > 1)
return -EINVAL;
if (src_format->rate != dst_format->rate)
return -EINVAL;
if (src_format->voices != dst_format->voices)
@ -348,42 +162,6 @@ int snd_pcm_plugin_build_linear(snd_pcm_plugin_handle_t *handle,
snd_pcm_format_linear(dst_format->format)))
return -EINVAL;
sign = (snd_pcm_format_signed(src_format->format) !=
snd_pcm_format_signed(dst_format->format));
src_width = snd_pcm_format_width(src_format->format);
dst_width = snd_pcm_format_width(dst_format->format);
#if __BYTE_ORDER == __LITTLE_ENDIAN
src_endian = snd_pcm_format_big_endian(src_format->format);
dst_endian = snd_pcm_format_big_endian(dst_format->format);
#elif __BYTE_ORDER == __BIG_ENDIAN
src_endian = snd_pcm_format_little_endian(src_format->format);
dst_endian = snd_pcm_format_little_endian(dst_format->format);
#else
#error "Unsupported endian..."
#endif
src_width = snd_pcm_format_width(src_format->format);
if (src_width < 0)
return src_width;
src_width /= 8;
src_width--;
dst_width = snd_pcm_format_width(dst_format->format);
if (dst_width < 0)
return dst_width;
dst_width /= 8;
dst_width--;
if (src_endian < 0)
src_endian = 0;
if (dst_endian < 0)
dst_endian = 0;
func = ((linear_f(*)[4][2][2][2])linear_functions)[src_width][dst_width][src_endian][dst_endian][sign];
if (func == NULL)
return -EINVAL;
plugin = snd_pcm_plugin_build(handle,
"linear format conversion",
src_format,
@ -392,9 +170,7 @@ int snd_pcm_plugin_build_linear(snd_pcm_plugin_handle_t *handle,
if (plugin == NULL)
return -ENOMEM;
data = (linear_t *)plugin->extra_data;
data->func = func;
data->src_sample_size = plugin->src_width / 8;
data->dst_sample_size = plugin->dst_width / 8;
data->copy = copy_index(src_format->format, dst_format->format);
plugin->transfer = linear_transfer;
*r_plugin = plugin;
return 0;