[pulseaudio-commits] src/modules

[David Henningsson]

 src/modules/alsa/alsa-util.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 55a25246ee80aa950bf27f811c0cc176d0821a4e
Author: Peter Meerwald <pmeerw at pmeerw.net>
Date:   Sat Nov 15 13:33:19 2014 +0100

    alsa-util: No logging when sound card only supports non-interleaved sample format
    
    as suggested by
    https://bugs.freedesktop.org/show_bug.cgi?id=84804
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 46990fe..d62234c 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -181,6 +181,19 @@ static int set_buffer_size(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams,
     return 0;
 }
 
+static void check_access(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams, bool use_mmap) {
+    if ((use_mmap && !snd_pcm_hw_params_test_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_INTERLEAVED)) ||
+        !snd_pcm_hw_params_test_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED))
+        pa_log_error("Weird, PCM claims to support interleaved access, but snd_pcm_hw_params_set_access() failed.");
+
+    if ((use_mmap && !snd_pcm_hw_params_test_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED)) ||
+        !snd_pcm_hw_params_test_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_NONINTERLEAVED))
+        pa_log_error("PCM seems to support non-interleaved access, but PA doesn't.");
+    else if (use_mmap && !snd_pcm_hw_params_test_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_COMPLEX)) {
+        pa_log_error("PCM seems to support mmapped complex access, but PA doesn't.");
+    }
+}
+
 /* Set the hardware parameters of the given ALSA device. Returns the
  * selected fragment settings in *buffer_size and *period_size. Determine
  * whether mmap and tsched mode can be enabled. */
@@ -227,6 +240,7 @@ int pa_alsa_set_hw_params(
 
             if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
                 pa_log_debug("snd_pcm_hw_params_set_access() failed: %s", pa_alsa_strerror(ret));
+                check_access(pcm_handle, hwparams, true);
                 goto finish;
             }
 
@@ -235,6 +249,7 @@ int pa_alsa_set_hw_params(
 
     } else if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
         pa_log_debug("snd_pcm_hw_params_set_access() failed: %s", pa_alsa_strerror(ret));
+        check_access(pcm_handle, hwparams, false);
         goto finish;
     }