Changeset 787 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Feb 8, 2007 4:34:04 PM (18 years ago)

Author:

vboxsync

Message:

made ALSA work again

File:

• trunk/src/VBox/Devices/Audio/alsaaudio.c (modified) (18 diffs)

trunk/src/VBox/Devices/Audio/alsaaudio.c

@@ -44 +44 @@
 } ALSAVoiceIn;
 
+/* latency = period_size * periods / (rate * bytes_per_frame) */
+
 static struct {
     int size_in_usec_in;
@@ -288 +290 @@
         );
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to open `%s':\n", pcm_name);
+#else
         LogRel(("Audio/ALSA: Failed to open '%s' as %s\n", pcm_name, typ));
+#endif
         return -1;
     }
@@ -295 +300 @@
     err = snd_pcm_hw_params_any (handle, hw_params);
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to initialize hardware parameters\n");
+#else
+        LogRel(("Audio/ALSA: Failed to initialize hardware parameters\n"));
+#endif
         goto err;
     }
@@ -305 +314 @@
         );
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to set access type\n");
+#else
+        LogRel(("Audio/ALSA: Failed to set access type\n"));
+#endif
         goto err;
     }
@@ -311 +324 @@
     err = snd_pcm_hw_params_set_format (handle, hw_params, req->fmt);
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to set format %d\n", req->fmt);
+#else
+        LogRel(("Audio/ALSA: Failed to set format %d\n", req->fmt));
+#endif
         goto err;
     }
@@ -317 +334 @@
     err = snd_pcm_hw_params_set_rate_near (handle, hw_params, &freq, 0);
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to set frequency %d\n", req->freq);
+#else
+        LogRel(("Audio/ALSA: Failed to set frequency %dHz\n", req->freq));
+#endif
         goto err;
     }
@@ -327 +348 @@
         );
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to set number of channels %d\n",
                       req->nchannels);
+#else
+        LogRel(("Audio/ALSA: Failed to set number of channels to %d\n", req->nchannels));
+#endif
         goto err;
     }
 
     if (nchannels != 1 && nchannels != 2) {
+#ifndef VBOX
         alsa_logerr2 (err, typ,
                       "Can not handle obtained number of channels %d\n",
                       nchannels);
+#else
+        LogRel(("Audio/ALSA: Cannot handle obtained number of channels (%d)\n", nchannels));
+#endif
         goto err;
     }
@@ -356 +385 @@
                     );
                 if (err < 0) {
+#ifndef VBOX
                     alsa_logerr2 (err, typ,
                                   "Failed to set period time %d\n",
                                   req->period_size);
+#else
+                    LogRel(("Audio/ALSA: Failed to set period time %d\n", req->period_size));
+#endif
                     goto err;
                 }
@@ -371 +404 @@
 
             if (err < 0) {
+#ifndef VBOX
                 alsa_logerr2 (err, typ,
                               "Failed to set buffer time %d\n",
                               req->buffer_size);
+#else
+                LogRel(("Audio/ALSA: Failed to set buffer time %d\n", req->buffer_size));
+#endif
                 goto err;
             }
@@ -391 +428 @@
                     );
                 if (err < 0) {
+#ifndef VBOX
                     alsa_logerr (
                         err,
@@ -396 +434 @@
                         typ
                         );
+#else
+                    LogRel(("Audio/ALSA: Could not get minimal period size for %s\n", typ));
+#endif
                 }
                 else {
+                    dolog("minimal period size %ld\n", minval);
                     if (period_size < minval) {
                         if ((in && conf.period_size_in_overriden)
@@ -411 +453 @@
                 }
 
+#ifndef VBOX
                 err = snd_pcm_hw_params_set_period_size (
                     handle,
@@ -417 +460 @@
                     0
                     );
+#else
+                err = snd_pcm_hw_params_set_period_size_near (
+                    handle,
+                    hw_params,
+                    (snd_pcm_uframes_t*)&period_size,
+                    0
+                    );
+#endif
+                dolog("PERIOD_SIZE %d\n", period_size);
                 if (err < 0) {
+#ifndef VBOX
                     alsa_logerr2 (err, typ, "Failed to set period size %d\n",
-                                  req->period_size);
+                                  period_size);
+#else
+                    LogRel(("Audio/ALSA: Failed to set period size %d (%s)\n",
+                            period_size, snd_strerror(err)));
+#endif
                     goto err;
                 }
             }
+
+#ifdef VBOX
+            /* Calculate default buffer size here since it might have been changed
+             * in the _near functions */
+            buffer_size = 4 * period_size;
+#endif
 
             minval = buffer_size;
@@ -430 +493 @@
                 );
             if (err < 0) {
+#ifndef VBOX
                 alsa_logerr (err, "Could not get minmal buffer size for %s\n",
                              typ);
+#else
+                LogRel(("Audio/ALSA: Could not get minimal buffer size for %s\n", typ));
+#endif
             }
             else {
@@ -449 +516 @@
             }
 
-            err = snd_pcm_hw_params_set_buffer_size (
+            err = snd_pcm_hw_params_set_buffer_size_near (
                 handle,
                 hw_params,
-                buffer_size
+                (snd_pcm_uframes_t*)&buffer_size
                 );
+            dolog("BUFFER_SIZE %d\n", buffer_size);
             if (err < 0) {
+#ifndef VBOX
                 alsa_logerr2 (err, typ, "Failed to set buffer size %d\n",
-                              req->buffer_size);
+                              buffer_size);
+#else
+                LogRel(("Audio/ALSA: Failed to set buffer size %d (%s)\n",
+                        buffer_size, snd_strerror(err)));
+#endif
                 goto err;
             }
@@ -467 +540 @@
     err = snd_pcm_hw_params (handle, hw_params);
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to apply audio parameters\n");
+#else
+        LogRel(("Audio/ALSA: Failed to apply audio parameters\n"));
+#endif
         goto err;
     }
@@ -473 +550 @@
     err = snd_pcm_hw_params_get_buffer_size (hw_params, &obt_buffer_size);
     if (err < 0) {
+#ifndef VBOX
         alsa_logerr2 (err, typ, "Failed to get buffer size\n");
+#else
+        LogRel(("Audio/ALSA: Failed to get buffer size\n"));
+#endif
         goto err;
     }
+
+#ifdef VBOX
+    LogRel(("Audio/ALSA: %s frequency %dHz, period size %d, buffer size %d\n",
+             typ, req->freq, period_size, obt_buffer_size));
+#endif
 
     err = snd_pcm_prepare (handle);
@@ -619 +705 @@
             }
 
-#if 0
-            mixeng_sniff_and_clear (hw, src, dst, written);
-#endif
             rpos = (rpos + written) % hw->samples;
             samples -= written;