Changeset 3687

Timestamp:

02/13/06 18:29:49 (7 years ago)

Author:

piers

Message:

Changes: auddev.c, configure.in, auddev_alsa.[ch]

auddev: Changed DEF's to match standard RAT style Audio device configuration
alsa: Fixed ALSA for UCL-RAT

Modified Sample selection to be more lenient
Added ALSA "default" device for use by ALSA plugins
Added preliminary support for

 http://alsa.opensrc.org/index.php?action=find&find=emu10k1

(e.g. Audigy) style cards (with no "Capture" dev).

Location:

rat/trunk

Files:

• auddev.c (modified) (2 diffs)
• auddev_alsa.c (modified) (23 diffs)
• auddev_alsa.h (modified) (1 diff)
• configure.in (modified) (2 diffs)

rat/trunk/auddev.c

@@ -239 +239 @@
         },
 #endif /* HAVE_OSPREY_AUDIO */
-#ifdef HAVE_LIBASOUND
+#ifdef HAVE_ALSA_AUDIO
         {
                 alsa_audio_init,
@@ -270 +270 @@
                 alsa_audio_supports
         },
-#endif /* HAVE_LIBASOUND */
+#endif /* HAVE_ALSA_AUDIO */
 #ifdef HAVE_OSS_AUDIO
         {

rat/trunk/auddev_alsa.c

@@ -20 +20 @@
 #define ALSA_PCM_NEW_SW_PARAMS_API
 #include <alsa/asoundlib.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 #include "config_unix.h"
@@ -39 +41 @@
     int card_number;
     char *pcm_device;
+    char *pcm_mixer;
 } RatCardInfo;
 
@@ -108 +111 @@
     current.tx.handle = NULL;
     current.rx.handle = NULL;
+    current.mixer =  NULL;
     current.index = -1;
     current.info = NULL;
@@ -239 +243 @@
     fprintf(stderr, msg ": %s\n", snd_strerror(err)); \
     snd_pcm_close(stream->handle); \
+    stream->handle=NULL; \
     return FALSE; \
   } \
@@ -247 +252 @@
     {
     int err;
+    int dir=0;
     size_t bsize;
     snd_pcm_uframes_t frames;
@@ -252 +258 @@
     snd_pcm_hw_params_t *hw_params;
     snd_pcm_sw_params_t *sw_params;
+    /* Set avail min inside a software configuration container */
+    /* Can we tweak this up/down?*/
+    snd_pcm_uframes_t    avail_min=4;   
+    snd_pcm_uframes_t    xfer_align=1;  
 
     err = snd_pcm_open(&stream->handle, info->pcm_device,
@@ -277 +287 @@
     rrate = fmt->sample_rate;
     err = snd_pcm_hw_params_set_rate_near (stream->handle, hw_params,
-                                           &rrate, 0);
+                                           &rrate, &dir);
     CHECKOPENERR("Failed to set sample rate");
     if (rrate != fmt->sample_rate) {
@@ -291 +301 @@
     bsize = snd_pcm_format_size (mapformat(fmt->encoding),
                                  fmt->sample_rate / RAT_ALSA_BUFFER_DIVISOR);
+    bsize = (fmt->sample_rate * (fmt->bits_per_sample/8) * fmt->channels* RAT_ALSA_BUFFER_DIVISOR)/ (1000);
+            //* fmt->bytes_per_block 
+
     frames = bsize;
+    debug_msg("Bsize == %d\n", bsize);
     err = snd_pcm_hw_params_set_buffer_size_near(stream->handle, hw_params,
                                                  &frames);
@@ -299 +313 @@
     debug_msg("Buffer == %d\n", stream->buffer_size);
 
-    frames = bsize / 2;
+    frames = stream->buffer_size / 2;
     err = snd_pcm_hw_params_set_period_size_near(stream->handle, hw_params,
-                                                 &frames, 0);
+                                                 &frames, &dir);
+    stream->buffer_size = frames;
     CHECKOPENERR("Failed to set period size");
 
@@ -320 +335 @@
     CHECKOPENERR("Failed to set threshold value");
 
-    err = snd_pcm_sw_params_set_avail_min(stream->handle, sw_params, 4);
+    err = snd_pcm_sw_params_set_avail_min(stream->handle, sw_params, avail_min);
     CHECKOPENERR("Failed to set min available value");
 
-    err = snd_pcm_sw_params_set_xfer_align(stream->handle, sw_params, 1);
+    err = snd_pcm_sw_params_set_xfer_align(stream->handle,sw_params,xfer_align);
     CHECKOPENERR("Failed to set xfer align value");
 
@@ -342 +357 @@
     fprintf(stderr, msg ": %s\n", snd_strerror(err)); \
     snd_mixer_close(current.mixer); \
+    current.mixer=NULL; \
     return FALSE; \
   } \
@@ -350 +366 @@
 static int open_volume_ctl(char *name, snd_mixer_elem_t **ctl)
 {
-    snd_mixer_selem_id_t *sid;
-    int err;
-              
-    snd_mixer_selem_id_alloca(&sid);
-
-    // FIXME? Find the appropriate mixer element.  This feels really wrong,
-    // there has to be another way to do this.
-    snd_mixer_selem_id_set_name (sid, name);
-
-    *ctl = snd_mixer_find_selem(current.mixer, sid);
-    err = (int)*ctl;
-    CHECKOPENERR("Couldn't find mixer control element");
-
-    if (snd_mixer_selem_has_playback_volume(*ctl)) {
-        debug_msg("Got volume control %s of type PLAY\n", name);
-        // FIXME: Does this always work?
-        snd_mixer_selem_set_playback_volume_range (*ctl, 0, 100);
-
-        err = snd_mixer_selem_set_playback_switch_all(*ctl, 1);
-        CHECKOPENERR("Failed to switch on playback volume");
-
-    } else if (snd_mixer_selem_has_capture_volume(*ctl)) {
-        debug_msg("Got volume control %s of type CAPTURE\n", name);
-        snd_mixer_selem_set_capture_volume_range (*ctl, 0, 100);
-
-        err = snd_mixer_selem_set_capture_switch_all(*ctl, 1);
-        CHECKOPENERR("Failed to switch on capture volume");
-
-    } else {
-        debug_msg("Unknown mixer type %s set\n", name);
-        return FALSE;
-}
-
-    return TRUE;
+  snd_mixer_selem_id_t *sid;
+  int err=NULL;
+
+  snd_mixer_selem_id_alloca(&sid);
+
+  // FIXME? Find the appropriate mixer element.  This feels really wrong,
+  // there has to be another way to do this.
+  snd_mixer_selem_id_set_index (sid, 0);
+  snd_mixer_selem_id_set_name (sid, name);
+
+  *ctl = snd_mixer_find_selem(current.mixer, sid);
+  //err = (int)*ctl;
+  //CHECKOPENERR("Couldn't find mixer control element");
+  if (*ctl == NULL ) {
+   fprintf(stderr,"ALSA:Couldn't find mixer control element (name:%s)\n",name);
+   return FALSE;
+  }
+
+  printf("open_volume_ctl err2:%d\n",err);
+  if (snd_mixer_selem_has_playback_volume(*ctl)) {
+    debug_msg("Got volume control %s of type PLAY\n", name);
+    // FIXME: Does this always work?
+    snd_mixer_selem_set_playback_volume_range (*ctl, 0, 100);
+
+    if ( snd_mixer_selem_has_playback_switch( *ctl ) ) {
+      err = snd_mixer_selem_set_playback_switch_all(*ctl, 1);
+      CHECKOPENERR("Failed to switch on playback volume");
+    } 
+
+  } else if (snd_mixer_selem_has_capture_volume(*ctl)) {
+    debug_msg("Got volume control %s of type CAPTURE\n", name);
+    snd_mixer_selem_set_capture_volume_range (*ctl, 0, 100);
+
+    err = snd_mixer_selem_set_capture_switch_all(*ctl, 1);
+    CHECKOPENERR("Failed to switch on capture volume");
+
+  } else {
+    debug_msg("Unknown mixer type %s set\n", name);
+    return FALSE;
+  }
+
+  return TRUE;
 }
 
@@ -391 +415 @@
 static int porder(const void *a, const void *b)
 {
-    return (((const port_t *)a)->priority - ((const port_t *)b)->priority);
+    return (((port_t*)a)->priority - ((port_t*)b)->priority);
 }
 
@@ -404 +428 @@
 
     // FIXME: Attach the mixer to the default card.  Is this enough?
-    err = snd_mixer_attach(current.mixer, "default");
+    //err = snd_mixer_attach(current.mixer, "default");
+    err = snd_mixer_attach(current.mixer, current.info->pcm_mixer);
+//  err = snd_mixer_attach(current.mixer, "hw:0,0");
     CHECKOPENERR("Failed to attach mixer");
 
@@ -425 +451 @@
     // can be flipped between.
     for (elem = snd_mixer_first_elem (current.mixer);
-         elem && (num_iports < MAX_RAT_DEVICES);
-         elem = snd_mixer_elem_next (elem))
+        elem && (num_iports < MAX_RAT_DEVICES);
+        elem = snd_mixer_elem_next (elem))
     {
-        if (snd_mixer_selem_is_active (elem) &&
-            snd_mixer_selem_has_capture_switch(elem) &&
-            snd_mixer_selem_has_capture_switch_exclusive(elem))
-        {
-            // FIXME: It's theoretically possible that there would be more
-            // than one capture group, but RAT isn't really equipped to handle
-            // the case so we'll just ignore it for now.
-            int gid = snd_mixer_selem_get_capture_group(elem);
-
-            const char *name = snd_mixer_selem_get_name(elem);
-       
-            debug_msg("Got CAPTURE element '%s' of group %d\n", name, gid);
-
-            snprintf(iports[num_iports].details.name, AUDIO_PORT_NAME_LENGTH,
-                     "%s", name);
-            iports[num_iports].mixer = elem;
-
-            // The principle of least-surprise means that we should present
-            // the ports in the same order as the other drivers.  As we're
-            // more flexible about retrieving the mixer ports we need to
-            // attempt to reorder the list, so we assign a priority and
-            // sort the list at the end.
-            if (strstr(name, RAT_ALSA_MIXER_MIC_NAME) == name) {
-                iports[num_iports].priority = 100;
-            } else if (strstr(name, RAT_ALSA_MIXER_LINE_NAME) == name) {
-                iports[num_iports].priority = 50;
-            } else if (strstr(name, RAT_ALSA_MIXER_CD_NAME) == name) {
-                iports[num_iports].priority = 30;
-            } else {
-                iports[num_iports].priority = 10;
-    }
-
-
-            num_iports++;
-
+      if (snd_mixer_selem_is_active (elem) &&
+          snd_mixer_selem_has_capture_switch(elem) &&
+          snd_mixer_selem_has_capture_switch_exclusive(elem))
+      {
+        // FIXME: It's theoretically possible that there would be more
+        // than one capture group, but RAT isn't really equipped to handle
+        // the case so we'll just ignore it for now.
+        int gid = snd_mixer_selem_get_capture_group(elem);
+
+        const char *name = snd_mixer_selem_get_name(elem);
+
+        debug_msg("Got CAPTURE element '%s' of group %d\n", name, gid);
+
+        snprintf(iports[num_iports].details.name, AUDIO_PORT_NAME_LENGTH,
+            "%s", name);
+        iports[num_iports].mixer = elem;
+
+        // The principle of least-surprise means that we should present
+        // the ports in the same order as the other drivers.  As we're
+        // more flexible about retrieving the mixer ports we need to
+        // attempt to reorder the list, so we assign a priority and
+        // sort the list at the end.
+        if (strstr(name, RAT_ALSA_MIXER_MIC_NAME) == name) {
+          iports[num_iports].priority = 100;
+        } else if (strstr(name, RAT_ALSA_MIXER_LINE_NAME) == name) {
+          iports[num_iports].priority = 50;
+        } else if (strstr(name, RAT_ALSA_MIXER_CD_NAME) == name) {
+          iports[num_iports].priority = 30;
+        } else {
+          iports[num_iports].priority = 10;
         }
-      
+        num_iports++;
+      }
     }
 
@@ -474 +496 @@
         iports[i].details.port = i;
     }
-
 
     return TRUE;
@@ -490 +511 @@
     dump_audio_format(outfmt);
     
+    //clear_current();
     if (current.tx.handle != NULL) {
         fprintf(stderr, "Attempt to open a device while another is open\n");
@@ -498 +520 @@
     current.bytes_per_block = infmt->bytes_per_block;
 
+        fprintf(stderr, "to open device for playback\n");
     if (!open_stream(current.info, &current.tx,
                      SND_PCM_STREAM_PLAYBACK, outfmt)) {
+        alsa_audio_close(ad); 
         fprintf(stderr, "Failed to open device for playback\n");
         return FALSE;
     }
+        fprintf(stderr, "to open device for capture\n");
     if (!open_stream(current.info, &current.rx,
                      SND_PCM_STREAM_CAPTURE, infmt)) {
+        alsa_audio_close(ad); 
         fprintf(stderr, "Failed to open device for capture\n");
         return FALSE;
     }
 
-    setup_mixers();
+    if (setup_mixers() == FALSE) {
+      alsa_audio_close(ad); 
+        fprintf(stderr, "Failed to set mixer levels \n");
+      return FALSE;
+    }
 
     err = snd_pcm_prepare(current.tx.handle);
@@ -535 +565 @@
     debug_msg("Closing device \"%s\"\n", current.info->name);
 
-    err = snd_pcm_close(current.tx.handle);
-    CHECKERRCONT("Error closing playback PCM");
-
-    err = snd_pcm_close(current.rx.handle);
-    CHECKERRCONT("Error closing capture PCM");
-
-    // Open a mixer for each of the ports
-    err = snd_mixer_close(current.mixer);
-    CHECKERRCONT("Error closing mixer");
+    if (current.tx.handle != NULL ) {
+            err = snd_pcm_close(current.tx.handle);
+            CHECKERRCONT("Error closing playback PCM");
+    }
+
+    if (current.rx.handle != NULL ) {
+            err = snd_pcm_close(current.rx.handle);
+            CHECKERRCONT("Error closing capture PCM");
+    }
+
+    // Close mixer 
+    if (current.mixer !=  NULL ) {
+        err = snd_mixer_close(current.mixer);
+        CHECKERRCONT("Error closing mixer");
+    }
 
     clear_current();
@@ -605 +641 @@
     debug_msg("Set igain %d %d\n", ad, vol);
 
+    err = snd_mixer_selem_set_playback_switch_all(current.txgain, 1);
+    VCHECKERR("Failed to switch on playback volume");
+
     err = snd_mixer_selem_set_playback_volume_all(current.txgain, vol);
     VCHECKERR("Couldn't set mixer playback volume");
 
-    err = snd_mixer_selem_set_playback_switch_all(current.txgain, 1);
-    VCHECKERR("Failed to switch on playback volume");
 }
 
@@ -660 +697 @@
         err = snd_pcm_prepare(current.rx.handle);
         CHECKERR("Can't recover from capture overrun");
+    err = snd_pcm_start(current.rx.handle);
+    CHECKERR("Failed to start PCM capture");
         return FALSE;
 
@@ -922 +961 @@
     int err, cindex = 0;
     char card[128];
+    // Ptr to ratCards array
     RatCardInfo *ratCard;
 
     debug_msg("ALSA get device count\n");
-            
+
+    snd_ctl_card_info_alloca(&ctl_info);
     do {
         sprintf (card , "hw:%d", cindex);
-        err = snd_ctl_open (&ctl_handle, card, 0);
-
+    debug_msg("ALSA for dev:%s\n",card);
+        err = snd_ctl_open (&ctl_handle, card, SND_CTL_NONBLOCK);
 
         if (err == 0) {
@@ -935 +976 @@
             ratCard = ratCards + cindex;
             ratCard->card_number = cindex;
+            ratCard->pcm_mixer = strdup(card);
             sprintf (card , "plughw:%d", cindex);
             ratCard->pcm_device = strdup(card);
 
-            snd_ctl_card_info_alloca(&ctl_info);
             if ((err = snd_ctl_card_info (ctl_handle, ctl_info) < 0)) {
                 fprintf(stderr, "Card query failed: %s\n", snd_strerror(err));
-                return 0;
-    }
+                snprintf(card, sizeof(card), "ALSA %d: Not Available", cindex);
+                ratCard->name = strdup (card);
+                debug_msg("Got failed ALSA card %s\n", ratCard->name);
+                snd_ctl_close(ctl_handle);
+                cindex++;
+                err=0;
+                continue;
+            }
             snprintf(card, sizeof(card), "ALSA %d: %s", cindex,
                      snd_ctl_card_info_get_name (ctl_info));
             ratCard->name = strdup (card);
-            debug_msg("  Got card %s\n", ratCard->name);
+            debug_msg("Got ALSA card %s\n", ratCard->name);
     
             snd_ctl_close(ctl_handle);
-}
+        }
         cindex++;
 
     } while (err == 0);
+        cindex--;
+
+    // Get ALSA "default" card - so things like dsnoop etc can work
+    if (!snd_ctl_open(&ctl_handle, "default", SND_CTL_NONBLOCK)) {
+      ratCard = ratCards + cindex;
+      ratCard->card_number = cindex;
+      ratCard->pcm_device = strdup("default");
+      ratCard->pcm_mixer = "default";
+      if ((err = snd_ctl_card_info (ctl_handle, ctl_info) < 0)) {
+        fprintf(stderr, "ALSA default Card query failed: %s\n", snd_strerror(err));
+        snd_ctl_close(ctl_handle);
+      } else {
+        snprintf(card, sizeof(card), "ALSA default: %s", 
+                                  snd_ctl_card_info_get_name (ctl_info));
+        ratCard->name = strdup (card);
+        debug_msg("Got \"default\" card %s\n", ratCard->name);
+        snd_ctl_close(ctl_handle);
+        cindex++;
+        cindex++;
+      }
+    }
 
     nRatCards = cindex - 1;

rat/trunk/auddev_alsa.h

@@ -22 +22 @@
 /* Define some tuneables: */
 
-/* Buffer length, in fractions of a second.  This value is used to
+/* Buffer length, in milliseconds.  This value is used to
  * divide the sample-rate to define the buffer-size. */
-#define RAT_ALSA_BUFFER_DIVISOR 6
+#define RAT_ALSA_BUFFER_DIVISOR 80
 
 // External prototypes

rat/trunk/configure.in

@@ -1 +1 @@
 dnl UCL RAT configure script.
-dnl $Header$
+dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.54 2004/11/16 14:39:36 ucaccsp Exp $
 dnl
 dnl Process this file with GNU autoconf to generate a configure script.
@@ -188 +188 @@
         ])
         # Do we have ALSA?
-        AC_CHECK_HEADER(alsa/asoundlib.h,[
+        AC_CHECK_HEADER(sys/asoundlib.h,[
                 AU_OBJ="$AU_OBJ auddev_alsa.o"
-                AU_LIB="$AU_LIB /usr/lib/libasound.a"
+                AU_LIB="$AU_LIB -lasound"
                 AC_DEFINE(HAVE_ALSA_AUDIO)
                 # HAVE_OSS_AUDIO is defined so that the ALSA OSS emulation