mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-06 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support of little-endian on i386/x86_64 dmix

Browse source 
i386/x86_64 alsa-lib may need to handle big-endian formats, e.g.
when running via qemu on PPC.  The generic dmix code already has
both endian support, so let's use it as fallback.
This commit is contained in:
Takashi Iwai 2007-07-03 19:52:33 +02:00
parent f49e5859fd
commit 267d7c7281
4 changed files with 79 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/pcm/pcm_dmix_generic.c
View file

@ -119,14 +119,14 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix)
#else
/* non-concurrent version, supporting both endians */
static unsigned long long dmix_supported_format =
(1ULL << SND_PCM_FORMAT_S16_LE) | (1ULL << SND_PCM_FORMAT_S32_LE) |
(1ULL << SND_PCM_FORMAT_S16_BE) | (1ULL << SND_PCM_FORMAT_S32_BE) |
(1ULL << SND_PCM_FORMAT_S24_3LE);
#define generic_dmix_supported_format \
((1ULL << SND_PCM_FORMAT_S16_LE) | (1ULL << SND_PCM_FORMAT_S32_LE) |\
(1ULL << SND_PCM_FORMAT_S16_BE) | (1ULL << SND_PCM_FORMAT_S32_BE) |\
(1ULL << SND_PCM_FORMAT_S24_3LE))
#include <byteswap.h>
static void mix_areas1_native(unsigned int size,
static void generic_mix_areas1_native(unsigned int size,
volatile signed short *dst, signed short *src,
volatile signed int *sum, size_t dst_step,
size_t src_step, size_t sum_step)
@ -155,7 +155,7 @@ static void mix_areas1_native(unsigned int size,
}
}
static void mix_areas2_native(unsigned int size,
static void generic_mix_areas2_native(unsigned int size,
volatile signed int *dst, signed int *src,
volatile signed int *sum, size_t dst_step,
size_t src_step, size_t sum_step)
@ -186,7 +186,7 @@ static void mix_areas2_native(unsigned int size,
}
}
static void mix_areas1_swap(unsigned int size,
static void generic_mix_areas1_swap(unsigned int size,
volatile signed short *dst, signed short *src,
volatile signed int *sum, size_t dst_step,
size_t src_step, size_t sum_step)
@ -215,7 +215,7 @@ static void mix_areas1_swap(unsigned int size,
}
}
static void mix_areas2_swap(unsigned int size,
static void generic_mix_areas2_swap(unsigned int size,
volatile signed int *dst, signed int *src,
volatile signed int *sum, size_t dst_step,
size_t src_step, size_t sum_step)
@ -247,7 +247,7 @@ static void mix_areas2_swap(unsigned int size,
}
/* always little endian */
static void mix_areas3(unsigned int size,
static void generic_mix_areas3(unsigned int size,
volatile unsigned char *dst, unsigned char *src,
volatile signed int *sum, size_t dst_step,
size_t src_step, size_t sum_step)
@ -278,16 +278,16 @@ static void mix_areas3(unsigned int size,
}
static void mix_select_callbacks(snd_pcm_direct_t *dmix)
static void generic_mix_select_callbacks(snd_pcm_direct_t *dmix)
{
if (snd_pcm_format_cpu_endian(dmix->shmptr->s.format)) {
dmix->u.dmix.mix_areas1 = mix_areas1_native;
dmix->u.dmix.mix_areas2 = mix_areas2_native;
dmix->u.dmix.mix_areas1 = generic_mix_areas1_native;
dmix->u.dmix.mix_areas2 = generic_mix_areas2_native;
} else {
dmix->u.dmix.mix_areas1 = mix_areas1_swap;
dmix->u.dmix.mix_areas2 = mix_areas2_swap;
dmix->u.dmix.mix_areas1 = generic_mix_areas1_swap;
dmix->u.dmix.mix_areas2 = generic_mix_areas2_swap;
}
dmix->u.dmix.mix_areas3 = mix_areas3;
dmix->u.dmix.mix_areas3 = generic_mix_areas3;
}
#endif