Changeset 89532 in vbox

Timestamp:

Jun 7, 2021 12:31:09 AM (3 years ago)

Author:

vboxsync

Message:

DrvHostAudioPulseAudio: Implemented input/output device selection. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp (modified) (6 diffs)

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

@@ -199 +199 @@
      *  Specify UINT32_MAX for unlimited logging. */
     uint32_t                cLogErrors;
-    /** The stream (base) name; needed for distinguishing
-     *  streams in the PulseAudio mixer controls if multiple
-     *  VMs are running at the same time. */
-    char                    szStreamName[64];
     /** Don't want to put this on the stack... */
     DRVHSTAUDPASTATECHGCTX  InitStateChgCtx;
     /** Pointer to host audio interface. */
     PDMIHOSTAUDIO           IHostAudio;
+    /** Upwards notification interface. */
+    PPDMIHOSTAUDIOPORT      pIHostAudioPort;
+
+    /** The stream (base) name.
+     * This is needed for distinguishing streams in the PulseAudio mixer controls if
+     * multiple VMs are running at the same time. */
+    char                    szStreamName[64];
+    /** The name of the input device to use. Empty string for default. */
+    char                    szInputDev[256];
+    /** The name of the output device to use. Empty string for default. */
+    char                    szOutputDev[256];
 } DRVHSTAUDPA;
 
@@ -690 +697 @@
 
 /**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnSetDevice}
+ */
+static DECLCALLBACK(int) drvHstAudPaHA_SetDevice(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir, const char *pszId)
+{
+    PDRVHSTAUDPA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+
+    /*
+     * Validate and normalize input.
+     */
+    AssertReturn(enmDir == PDMAUDIODIR_IN || enmDir == PDMAUDIODIR_OUT || enmDir == PDMAUDIODIR_DUPLEX, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pszId, VERR_INVALID_POINTER);
+    if (!pszId || !*pszId)
+        pszId = "";
+    else
+    {
+        size_t cch = strlen(pszId);
+        AssertReturn(cch < sizeof(pThis->szInputDev), VERR_INVALID_NAME);
+    }
+    LogFunc(("enmDir=%d pszId=%s\n", enmDir, pszId));
+
+    /*
+     * Update input.
+     */
+    if (enmDir == PDMAUDIODIR_IN || enmDir == PDMAUDIODIR_DUPLEX)
+    {
+        pa_threaded_mainloop_lock(pThis->pMainLoop);
+        if (strcmp(pThis->szInputDev, pszId) == 0)
+            pa_threaded_mainloop_unlock(pThis->pMainLoop);
+        else
+        {
+            LogRel(("PulseAudio: Changing input device: '%s' -> '%s'\n", pThis->szInputDev, pszId));
+            RTStrCopy(pThis->szInputDev, sizeof(pThis->szInputDev), pszId);
+            PPDMIHOSTAUDIOPORT pIHostAudioPort = pThis->pIHostAudioPort;
+            pa_threaded_mainloop_unlock(pThis->pMainLoop);
+            if (pIHostAudioPort)
+            {
+                LogFlowFunc(("Notifying parent driver about input device change...\n"));
+                pIHostAudioPort->pfnNotifyDeviceChanged(pIHostAudioPort, PDMAUDIODIR_IN, NULL /*pvUser*/);
+            }
+        }
+    }
+
+    /*
+     * Update output.
+     */
+    if (enmDir == PDMAUDIODIR_OUT || enmDir == PDMAUDIODIR_DUPLEX)
+    {
+        pa_threaded_mainloop_lock(pThis->pMainLoop);
+        if (strcmp(pThis->szOutputDev, pszId) == 0)
+            pa_threaded_mainloop_unlock(pThis->pMainLoop);
+        else
+        {
+            LogRel(("PulseAudio: Changing output device: '%s' -> '%s'\n", pThis->szOutputDev, pszId));
+            RTStrCopy(pThis->szOutputDev, sizeof(pThis->szOutputDev), pszId);
+            PPDMIHOSTAUDIOPORT pIHostAudioPort = pThis->pIHostAudioPort;
+            pa_threaded_mainloop_unlock(pThis->pMainLoop);
+            if (pIHostAudioPort)
+            {
+                LogFlowFunc(("Notifying parent driver about output device change...\n"));
+                pIHostAudioPort->pfnNotifyDeviceChanged(pIHostAudioPort, PDMAUDIODIR_OUT, NULL /*pvUser*/);
+            }
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+
+
+/**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
@@ -954 +1032 @@
         LogFunc(("Input stream attributes: maxlength=%d fragsize=%d\n",
                  pStreamPA->BufAttr.maxlength, pStreamPA->BufAttr.fragsize));
-        rc = pa_stream_connect_record(pStream, NULL /*dev*/, &pStreamPA->BufAttr, (pa_stream_flags_t)fFlags);
+        rc = pa_stream_connect_record(pStream, pThis->szInputDev[0] ? pThis->szInputDev : NULL,
+                                      &pStreamPA->BufAttr, (pa_stream_flags_t)fFlags);
     }
     else
@@ -960 +1039 @@
         LogFunc(("Output buffer attributes: maxlength=%d tlength=%d prebuf=%d minreq=%d\n",
                  pStreamPA->BufAttr.maxlength, pStreamPA->BufAttr.tlength, pStreamPA->BufAttr.prebuf, pStreamPA->BufAttr.minreq));
-        rc = pa_stream_connect_playback(pStream, NULL /*dev*/, &pStreamPA->BufAttr, (pa_stream_flags_t)fFlags,
+        rc = pa_stream_connect_playback(pStream, pThis->szOutputDev[0] ? pThis->szOutputDev : NULL, &pStreamPA->BufAttr, (pa_stream_flags_t)fFlags,
                                         NULL /*volume*/, NULL /*sync_stream*/);
     }
@@ -2142 +2221 @@
     pThis->IHostAudio.pfnGetConfig                  = drvHstAudPaHA_GetConfig;
     pThis->IHostAudio.pfnGetDevices                 = drvHstAudPaHA_GetDevices;
-    pThis->IHostAudio.pfnSetDevice                  = NULL;
+    pThis->IHostAudio.pfnSetDevice                  = drvHstAudPaHA_SetDevice;
     pThis->IHostAudio.pfnGetStatus                  = drvHstAudPaHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
@@ -2165 +2244 @@
      * Read configuration.
      */
-    int rc2 = CFGMR3QueryString(pCfg, "VmName", pThis->szStreamName, sizeof(pThis->szStreamName));
-    AssertMsgRCReturn(rc2, ("Confguration error: No/bad \"VmName\" value, rc=%Rrc\n", rc2), rc2);
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "VmName|InputDeviceID|OutputDeviceID", "");
+    int rc = CFGMR3QueryString(pCfg, "VmName", pThis->szStreamName, sizeof(pThis->szStreamName));
+    AssertMsgRCReturn(rc, ("Confguration error: No/bad \"VmName\" value, rc=%Rrc\n", rc), rc);
+    rc = CFGMR3QueryStringDef(pCfg, "InputDeviceID", pThis->szInputDev, sizeof(pThis->szInputDev), "");
+    AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"InputDeviceID\" as string: rc=%Rrc\n", rc), rc);
+    rc = CFGMR3QueryStringDef(pCfg, "OutputDeviceID", pThis->szOutputDev, sizeof(pThis->szOutputDev), "");
+    AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"OutputDeviceID\" as string: rc=%Rrc\n", rc), rc);
+
+    /*
+     * Query the notification interface from the driver/device above us.
+     */
+    pThis->pIHostAudioPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIHOSTAUDIOPORT);
+    AssertReturn(pThis->pIHostAudioPort, VERR_PDM_MISSING_INTERFACE_ABOVE);
 
     /*
      * Load the pulse audio library.
      */
-    int rc = audioLoadPulseLib();
+    rc = audioLoadPulseLib();
     if (RT_SUCCESS(rc))
         LogRel(("PulseAudio: Using version %s\n", pa_get_library_version()));