Changeset 54974 in vbox

Timestamp:

Mar 26, 2015 7:10:45 PM (10 years ago)

Author:

vboxsync

Message:

PDM/DrvAudio.cpp: Handle ADC rate conversion as well.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (5 diffs)

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

@@ -619 +619 @@
      * Try figuring out which audio stream configuration this backend
      * should use. If fixed output is enabled the backend will be tied
-     * to a fixed rate in (Hz), regardless of what the backend could do else.
+     * to a fixed rate (in Hz, among other parameters), regardless of
+     * what the backend could do else.
      */
     PPDMAUDIOSTREAMCFG pBackendCfg;
@@ -679 +680 @@
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
 
-    PPDMAUDIOSTREAMCFG pThisCfg;
+/*
+     * Try figuring out which audio stream configuration this backend
+     * should use for the audio input data. If fixed input is enabled
+     * the backend will be tied to a fixed rate (in Hz, among other parameters),
+     * regardless of what the backend initially wanted to use.
+     */
+    PPDMAUDIOSTREAMCFG pBackendCfg;
     if (conf.fixed_in.enabled)
-    {
-        pThisCfg = &conf.fixed_in.settings;
-        LogFlowFunc(("Using fixed audio settings\n"));
-    }
+        pBackendCfg = &conf.fixed_in.settings;
     else
-        pThisCfg = pCfg;
-    AssertPtrReturn(pThisCfg, VERR_INVALID_POINTER);
+        pBackendCfg = pCfg;
+
+    AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("Using fixed audio input settings: %RTbool\n",
+                 RT_BOOL(conf.fixed_in.enabled)));
 
     PPDMAUDIOGSTSTRMIN pGstStrmIn = (PPDMAUDIOGSTSTRMIN)RTMemAllocZ(sizeof(PDMAUDIOGSTSTRMIN));
@@ -693 +701 @@
         return VERR_NO_MEMORY;
 
-
+    /*
+     * The host stream always will get the backend audio stream configuration.
+     */
     PPDMAUDIOHSTSTRMIN pHstStrmIn;
-    int rc = drvAudioHstInAdd(pThis, pszName, pThisCfg, enmRecSource, &pHstStrmIn);
+    int rc = drvAudioHstInAdd(pThis, pszName, pBackendCfg, enmRecSource, &pHstStrmIn);
     if (RT_FAILURE(rc))
     {
@@ -704 +714 @@
     }
 
-    rc = drvAudioGstInInit(pGstStrmIn, pHstStrmIn, pszName, pThisCfg);
+    /*
+     * The guest stream always will get the audio stream configuration told
+     * by the device emulation (which in turn was/could be set by the guest OS).
+     */
+    rc = drvAudioGstInInit(pGstStrmIn, pHstStrmIn, pszName, pCfg);
     if (RT_SUCCESS(rc))
     {
@@ -744 +758 @@
             return VERR_NO_MEMORY;
 
-        rc = audioMixBufInit(&pGstStrmIn->MixBuf, pszTemp, &pHstStrmIn->Props,
+        rc = audioMixBufInit(&pGstStrmIn->MixBuf, pszTemp, &pGstStrmIn->Props,
                              audioMixBufSize(&pHstStrmIn->MixBuf));
         if (RT_SUCCESS(rc))