encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alsa: clean up macro salsa a little.

This commit is contained in:
Ryan C. Gordon 2021-09-21 11:13:46 -04:00
parent f5e636a621
commit c45facf2ca
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/audio/alsa/SDL_alsa_audio.c
View File

@ -274,42 +274,25 @@ ALSA_WaitDevice(_THIS)
/* !!! FIXME: is there a channel swizzler in alsalib instead? */ /* !!! FIXME: is there a channel swizzler in alsalib instead? */
/* /*
* http://bugzilla.libsdl.org/show_bug.cgi?id=110 * https://bugzilla.libsdl.org/show_bug.cgi?id=110
* "For Linux ALSA, this is FL-FR-RL-RR-C-LFE * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE
* and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR" * and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR"
*/ */
#define SWIZ6(T, buf, numframes) \ #define SWIZ6(T) \
T *ptr = (T *) buf; \ static void swizzle_alsa_channels_6_##T(void *buffer, const Uint32 bufferlen) { \
T *ptr = (T *) buffer; \
Uint32 i; \ Uint32 i; \
for (i = 0; i < numframes; i++, ptr += 6) { \ for (i = 0; i < bufferlen; i++, ptr += 6) { \
T tmp; \ T tmp; \
tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \ tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \
tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \ tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \
} } \
static void
swizzle_alsa_channels_6_64bit(void *buffer, Uint32 bufferlen)
{
SWIZ6(Uint64, buffer, bufferlen);
} }
static void SWIZ6(Uint64)
swizzle_alsa_channels_6_32bit(void *buffer, Uint32 bufferlen) SWIZ6(Uint32)
{ SWIZ6(Uint16)
SWIZ6(Uint32, buffer, bufferlen); SWIZ6(Uint8)
}
static void
swizzle_alsa_channels_6_16bit(void *buffer, Uint32 bufferlen)
{
SWIZ6(Uint16, buffer, bufferlen);
}
static void
swizzle_alsa_channels_6_8bit(void *buffer, Uint32 bufferlen)
{
SWIZ6(Uint8, buffer, bufferlen);
}
#undef SWIZ6 #undef SWIZ6
@ -323,10 +306,10 @@ swizzle_alsa_channels(_THIS, void *buffer, Uint32 bufferlen)
{ {
if (this->spec.channels == 6) { if (this->spec.channels == 6) {
switch (SDL_AUDIO_BITSIZE(this->spec.format)) { switch (SDL_AUDIO_BITSIZE(this->spec.format)) {
case 8: swizzle_alsa_channels_6_8bit(buffer, bufferlen); break; case 8: swizzle_alsa_channels_6_Uint8(buffer, bufferlen); break;
case 16: swizzle_alsa_channels_6_16bit(buffer, bufferlen); break; case 16: swizzle_alsa_channels_6_Uint16(buffer, bufferlen); break;
case 32: swizzle_alsa_channels_6_32bit(buffer, bufferlen); break; case 32: swizzle_alsa_channels_6_Uint32(buffer, bufferlen); break;
case 64: swizzle_alsa_channels_6_64bit(buffer, bufferlen); break; case 64: swizzle_alsa_channels_6_Uint64(buffer, bufferlen); break;
default: SDL_assert(!"unhandled bitsize"); break; default: SDL_assert(!"unhandled bitsize"); break;
} }
} }