pcm_dmix: add support for S24_LE format

From: Bart De Vos <bart_dv@eia.be>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index d9e596e542dcdb65da19feec908cfb1cd3873502..b648f3a9ca161031b44110faa0583fc785f1dd39 100644 (file)
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -888,6 +888,7 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
                        SND_PCM_FORMAT_S32 ^ SND_PCM_FORMAT_S32_LE ^ SND_PCM_FORMAT_S32_BE,
                        SND_PCM_FORMAT_S16,
                        SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE,
+                       SND_PCM_FORMAT_S24_LE,
                        SND_PCM_FORMAT_S24_3LE,
                        SND_PCM_FORMAT_U8,
                };

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index 90470e0a2a316990bd4fd82669660869568dd9fb..3b791c15913102d3f58e9830f1a6786803aec4d3 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -174,6 +174,10 @@ static void mix_areas(snd_pcm_direct_t *dmix,
                sample_size = 4;
                do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_32;
                break;
+       case SND_PCM_FORMAT_S24_LE:
+               sample_size = 4;
+               do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
+               break;
        case SND_PCM_FORMAT_S24_3LE:
                sample_size = 3;
                do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
@@ -238,6 +242,10 @@ static void remix_areas(snd_pcm_direct_t *dmix,
                sample_size = 4;
                do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_32;
                break;
+       case SND_PCM_FORMAT_S24_LE:
+               sample_size = 4;
+               do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;
+               break;
        case SND_PCM_FORMAT_S24_3LE:
                sample_size = 3;
                do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;

diff --git a/src/pcm/pcm_dmix_generic.c b/src/pcm/pcm_dmix_generic.c
index a1086c9513b88f43927253ef7f206e0b77b00180..9e9d3c3cf66402bd10d73a23eb42aedca04d8e31 100644 (file)
--- a/src/pcm/pcm_dmix_generic.c
+++ b/src/pcm/pcm_dmix_generic.c
@@ -122,7 +122,7 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix)
 #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) | \
+        (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \
         (1ULL << SND_PCM_FORMAT_U8))
 
 #include <byteswap.h>

diff --git a/src/pcm/pcm_dmix_i386.c b/src/pcm/pcm_dmix_i386.c
index 68c475538f3f06db5d706449a70db122c94d4ddd..dcc6b9a4222e909c15b10785af6f3874ef14d5b6 100644 (file)
--- a/src/pcm/pcm_dmix_i386.c
+++ b/src/pcm/pcm_dmix_i386.c
@@ -77,6 +77,7 @@
 #define i386_dmix_supported_format \
        ((1ULL << SND_PCM_FORMAT_S16_LE) |\
         (1ULL << SND_PCM_FORMAT_S32_LE) |\
+        (1ULL << SND_PCM_FORMAT_S24_LE) |\
         (1ULL << SND_PCM_FORMAT_S24_3LE))
 
 #define dmix_supported_format \