diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-24 00:55:40 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-24 00:55:40 +0000 |
commit | 74ffe75c3831e7d538146b9849cfaa57db884eea (patch) | |
tree | 0d9d4e68c82c6c7bf78259766cf18b0674de4bbe /channels | |
parent | 7957f8152cc34fe91ba09e54235b2771f9742cf2 (diff) |
fix endianness of OSS/Alsa (bug #3839)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5241 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/chan_alsa.c | 6 | ||||
-rwxr-xr-x | channels/chan_oss.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index d907c1a83..9811cb8d2 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <endian.h> #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API @@ -59,7 +60,12 @@ /* Don't switch between read/write modes faster than every 300 ms */ #define MIN_SWITCH_TIME 600 +#if __BYTE_ORDER == __LITTLE_ENDIAN static snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE; +#else +static snd_pcm_format_t format = SND_PCM_FORMAT_S16_BE; +#endif + /* static int block = O_NONBLOCK; */ static char indevname[50] = ALSA_INDEV; static char outdevname[50] = ALSA_OUTDEV; diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 1a34a5eb5..316529c94 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -34,6 +34,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <endian.h> #ifdef __linux #include <linux/soundcard.h> #elif defined(__FreeBSD__) @@ -350,7 +351,13 @@ static int setformat(void) int fmt, desired, res, fd = sounddev; static int warnedalready = 0; static int warnedalready2 = 0; + +#if __BYTE_ORDER == __LITTLE_ENDIAN fmt = AFMT_S16_LE; +#else + fmt = AFMT_S16_BE; +#endif + res = ioctl(fd, SNDCTL_DSP_SETFMT, &fmt); if (res < 0) { ast_log(LOG_WARNING, "Unable to set format to 16-bit signed\n"); |