From 968a51cfef19c0dd390001de742d775410ef3071 Mon Sep 17 00:00:00 2001 From: iive Date: Sun, 19 Jul 2009 10:26:48 +0000 Subject: Handle 24bit audio formats natively by ALSA. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29428 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'libao2/ao_alsa.c') diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 5e848446f2..581fb36c29 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -392,6 +392,18 @@ static int init(int rate_hz, int channels, int format, int flags) case AF_FORMAT_S32_BE: alsa_format = SND_PCM_FORMAT_S32_BE; break; + case AF_FORMAT_U24_LE: + alsa_format = SND_PCM_FORMAT_U24_LE; + break; + case AF_FORMAT_U24_BE: + alsa_format = SND_PCM_FORMAT_U24_BE; + break; + case AF_FORMAT_S24_LE: + alsa_format = SND_PCM_FORMAT_S24_LE; + break; + case AF_FORMAT_S24_BE: + alsa_format = SND_PCM_FORMAT_S24_BE; + break; case AF_FORMAT_FLOAT_LE: alsa_format = SND_PCM_FORMAT_FLOAT_LE; break; -- cgit v1.2.3 From dc8bb7837a122ed2cd99adb76c98a59160abc728 Mon Sep 17 00:00:00 2001 From: cladisch Date: Tue, 21 Jul 2009 08:20:22 +0000 Subject: Use correct ALSA sample format for 24-bit samples packed in three bytes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29434 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libao2/ao_alsa.c') diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 581fb36c29..3bb10eddd0 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -393,16 +393,16 @@ static int init(int rate_hz, int channels, int format, int flags) alsa_format = SND_PCM_FORMAT_S32_BE; break; case AF_FORMAT_U24_LE: - alsa_format = SND_PCM_FORMAT_U24_LE; + alsa_format = SND_PCM_FORMAT_U24_3LE; break; case AF_FORMAT_U24_BE: - alsa_format = SND_PCM_FORMAT_U24_BE; + alsa_format = SND_PCM_FORMAT_U24_3BE; break; case AF_FORMAT_S24_LE: - alsa_format = SND_PCM_FORMAT_S24_LE; + alsa_format = SND_PCM_FORMAT_S24_3LE; break; case AF_FORMAT_S24_BE: - alsa_format = SND_PCM_FORMAT_S24_BE; + alsa_format = SND_PCM_FORMAT_S24_3BE; break; case AF_FORMAT_FLOAT_LE: alsa_format = SND_PCM_FORMAT_FLOAT_LE; -- cgit v1.2.3 From e5751ced4f16fe75f835b70e37ecf48a2032506b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 26 Jul 2009 19:53:00 +0000 Subject: Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libao2/ao_alsa.c') diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 3bb10eddd0..cc80b0ded3 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -368,13 +368,13 @@ static int init(int rate_hz, int channels, int format, int flags) case AF_FORMAT_U16_BE: alsa_format = SND_PCM_FORMAT_U16_BE; break; -#ifndef WORDS_BIGENDIAN +#if !HAVE_BIGENDIAN case AF_FORMAT_AC3: #endif case AF_FORMAT_S16_LE: alsa_format = SND_PCM_FORMAT_S16_LE; break; -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN case AF_FORMAT_AC3: #endif case AF_FORMAT_S16_BE: -- cgit v1.2.3