Changeset 68376 in vbox for trunk/src/VBox

Timestamp:

Aug 10, 2017 4:16:01 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvHostALSAAudio.cpp: Fixed recording by actually doing a snd_pcm_start() after preparing the device. This never has been the case and only worked by coincidence before (as snd_pcm_readi() internally starts the device if never done so).

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostALSAAudio.cpp (modified) (4 diffs)
• alsa_mangling.h (modified) (2 diffs)
• alsa_stubs.c (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp

@@ -921 +921 @@
     }
 
+    LogFunc(("cFrames=%ld, rc=%Rrc\n", framesAvail, rc));
     return rc;
 }
@@ -957 +958 @@
 static int drvHostALSAAudioStreamCtl(snd_pcm_t *phPCM, bool fPause)
 {
+    int rc = VINF_SUCCESS;
+
     int err;
     if (fPause)
@@ -964 +967 @@
         {
             LogRel(("ALSA: Error stopping stream %p: %s\n", phPCM, snd_strerror(err)));
-            return VERR_ACCESS_DENIED;
+            rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
         }
     }
@@ -973 +976 @@
         {
             LogRel(("ALSA: Error preparing stream %p: %s\n", phPCM, snd_strerror(err)));
-            return VERR_ACCESS_DENIED;
-        }
-    }
-
-    return VINF_SUCCESS;
+            rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
+        }
+        else
+        {
+            err = snd_pcm_start(phPCM);
+            if (err < 0)
+            {
+                LogRel(("ALSA: Error starting stream %p: %s\n", phPCM, snd_strerror(err)));
+                rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
+            }
+        }
+    }
+
+    return rc;
 }
 

trunk/src/VBox/Devices/Audio/alsa_mangling.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2013-2016 Oracle Corporation
+ * Copyright (C) 2013-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +45 @@
 #define snd_pcm_readi                           ALSA_MANGLER(snd_pcm_readi)
 #define snd_strerror                            ALSA_MANGLER(snd_strerror)
+#define snd_pcm_start                           ALSA_MANGLER(snd_pcm_start)
 #define snd_pcm_drop                            ALSA_MANGLER(snd_pcm_drop)
 #define snd_pcm_resume                          ALSA_MANGLER(snd_pcm_resume)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -89 +89 @@
            (pcm, buffer, size))
 PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum))
+PROXY_STUB(snd_pcm_start, int, (snd_pcm_t *pcm), (pcm))
 PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm))
 PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm))
@@ -154 +155 @@
     ELEMENT(snd_pcm_readi),
     ELEMENT(snd_strerror),
+    ELEMENT(snd_pcm_start),
     ELEMENT(snd_pcm_drop),
     ELEMENT(snd_pcm_resume),