Changeset 54941 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 25, 2015 3:01:04 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99189

Message:

DrvAudio.cpp: Guest/Host audio stream tagging.

File:

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

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

@@ -73 +73 @@
 static int drvAudioDestroyGstIn(PDRVAUDIO pThis, PPDMAUDIOGSTSTRMIN pGstStrmIn);
 
-static int drvAudioAllocHstIn(PDRVAUDIO pThis, PPDMAUDIOSTREAMCFG pCfg, PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOHSTSTRMIN *ppHstStrmIn);
+static int drvAudioAllocHstIn(PDRVAUDIO pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg, PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOHSTSTRMIN *ppHstStrmIn);
 static int drvAudioDestroyHstIn(PDRVAUDIO pThis, PPDMAUDIOHSTSTRMIN pHstStrmIn);
 
@@ -479 +479 @@
 }
 
-static int drvAudioHstInAdd(PDRVAUDIO pThis, PPDMAUDIOSTREAMCFG pCfg, PDMAUDIORECSOURCE enmRecSource,
+static int drvAudioHstInAdd(PDRVAUDIO pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg, PDMAUDIORECSOURCE enmRecSource,
                             PPDMAUDIOHSTSTRMIN *ppHstStrmIn)
 {
@@ -487 +487 @@
 
     PPDMAUDIOHSTSTRMIN pHstStrmIn;
-    int rc = drvAudioAllocHstIn(pThis, pCfg, enmRecSource, &pHstStrmIn);
+    int rc = drvAudioAllocHstIn(pThis, pszName, pCfg, enmRecSource, &pHstStrmIn);
     if (RT_SUCCESS(rc))
         *ppHstStrmIn = pHstStrmIn;
@@ -501 +501 @@
     if (RT_SUCCESS(rc))
     {
-        rc = audioMixBufInit(&pGstStrmOut->MixBuf, pszName, &pGstStrmOut->Props,
+        char *pszTemp;
+        if (RTStrAPrintf(&pszTemp, "%s (Guest)", pszName) <= 0)
+            return VERR_NO_MEMORY;
+
+        rc = audioMixBufInit(&pGstStrmOut->MixBuf, pszTemp, &pGstStrmOut->Props,
                              audioMixBufSize(&pHostStrmOut->MixBuf));
         if (RT_SUCCESS(rc))
             rc = audioMixBufLinkTo(&pGstStrmOut->MixBuf, &pHostStrmOut->MixBuf);
 
+        RTStrFree(pszTemp);
+
         if (RT_SUCCESS(rc))
         {
@@ -542 +548 @@
     }
 
-    PPDMAUDIOHSTSTRMOUT pHstStrmOut =
-        (PPDMAUDIOHSTSTRMOUT)RTMemAllocZ(pThis->BackendCfg.cbStreamOut);
+    PPDMAUDIOHSTSTRMOUT pHstStrmOut = (PPDMAUDIOHSTSTRMOUT)RTMemAllocZ(pThis->BackendCfg.cbStreamOut);
     if (!pHstStrmOut)
     {
@@ -559 +564 @@
 
         uint32_t cSamples;
-        rc = pThis->pHostDrvAudio->pfnInitOut(pThis->pHostDrvAudio, pHstStrmOut, pCfg,
-                                              &cSamples);
+        rc = pThis->pHostDrvAudio->pfnInitOut(pThis->pHostDrvAudio, pHstStrmOut, pCfg, &cSamples);
         if (RT_FAILURE(rc))
         {
@@ -569 +573 @@
         fInitialized = true;
 
-        rc = audioMixBufInit(&pHstStrmOut->MixBuf, pszName, &pHstStrmOut->Props, cSamples);
+        char *pszTemp;
+        if (RTStrAPrintf(&pszTemp, "%s (Host)", pszName) <= 0)
+        {
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        rc = audioMixBufInit(&pHstStrmOut->MixBuf, pszTemp, &pHstStrmOut->Props, cSamples);
         if (RT_SUCCESS(rc))
         {
@@ -576 +587 @@
         }
 
+        RTStrFree(pszTemp);
+
     } while (0);
 
@@ -582 +595 @@
         if (fInitialized)
         {
-            int rc2 = pThis->pHostDrvAudio->pfnFiniOut(pThis->pHostDrvAudio,
-                                                       pHstStrmOut);
+            int rc2 = pThis->pHostDrvAudio->pfnFiniOut(pThis->pHostDrvAudio, pHstStrmOut);
             AssertRC(rc2);
         }
@@ -665 +677 @@
     AssertPtrReturn(pThisCfg, VERR_INVALID_POINTER);
 
-    PPDMAUDIOGSTSTRMIN pGstStrmIn =
-        (PPDMAUDIOGSTSTRMIN)RTMemAllocZ(sizeof(PDMAUDIOGSTSTRMIN));
+    PPDMAUDIOGSTSTRMIN pGstStrmIn = (PPDMAUDIOGSTSTRMIN)RTMemAllocZ(sizeof(PDMAUDIOGSTSTRMIN));
     if (!pGstStrmIn)
         return VERR_NO_MEMORY;
 
+
     PPDMAUDIOHSTSTRMIN pHstStrmIn;
-    int rc = drvAudioHstInAdd(pThis, pThisCfg, enmRecSource, &pHstStrmIn);
+    int rc = drvAudioHstInAdd(pThis, pszName, pThisCfg, enmRecSource, &pHstStrmIn);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("Failed to add host audio input stream \"%s\", rc=%Rrc\n",
-                 pszName, rc));
+        LogFunc(("Failed to add host audio input stream \"%s\", rc=%Rrc\n", pszName, rc));
 
         RTMemFree(pGstStrmIn);
@@ -717 +728 @@
     if (RT_SUCCESS(rc))
     {
-        rc = audioMixBufInit(&pGstStrmIn->MixBuf, pszName, &pHstStrmIn->Props,
+        char *pszTemp;
+        if (RTStrAPrintf(&pszTemp, "%s (Guest)", pszName) <= 0)
+            return VERR_NO_MEMORY;
+
+        rc = audioMixBufInit(&pGstStrmIn->MixBuf, pszTemp, &pHstStrmIn->Props,
                              audioMixBufSize(&pHstStrmIn->MixBuf));
         if (RT_SUCCESS(rc))
             rc = audioMixBufLinkTo(&pHstStrmIn->MixBuf, &pGstStrmIn->MixBuf);
 
+        RTStrFree(pszTemp);
+
         if (RT_SUCCESS(rc))
         {
-    #ifdef DEBUG
+#ifdef DEBUG
             drvAudioStreamCfgPrint(pCfg);
-    #endif
+#endif
             pGstStrmIn->State.fActive = false;
             pGstStrmIn->State.fEmpty  = true;
@@ -742 +759 @@
 }
 
-static int drvAudioAllocHstIn(PDRVAUDIO pThis, PPDMAUDIOSTREAMCFG pCfg,
+static int drvAudioAllocHstIn(PDRVAUDIO pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg,
                               PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOHSTSTRMIN *ppHstStrmIn)
 {
@@ -783 +800 @@
         fInitialized = true;
 
-        rc = audioMixBufInit(&pHstStrmIn->MixBuf, "HostIn", &pHstStrmIn->Props,
-                             cSamples);
+        char *pszTemp;
+        if (RTStrAPrintf(&pszTemp, "%s (Host)", pszName) <= 0)
+        {
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        rc = audioMixBufInit(&pHstStrmIn->MixBuf, pszTemp, &pHstStrmIn->Props, cSamples);
         if (RT_SUCCESS(rc))
         {
@@ -790 +813 @@
             pThis->cFreeInputStreams--;
         }
+
+        RTStrFree(pszTemp);
 
     } while (0);
@@ -1382 +1407 @@
             *pcbRead = 0;
         return VINF_SUCCESS;
-    } 
+    }
 
     PPDMAUDIOHSTSTRMIN pHstStrmIn = pGstStrmIn->pHstStrmIn;
@@ -1612 +1637 @@
 
         drvAudioGstInFreeRes(pGstStrmIn);
+
+        char *pszTemp;
+        if (RTStrAPrintf(&pszTemp, "%s (Guest)", pszName) <= 0)
+        {
+            RTMemFree(pGstStrmIn);
+            return VERR_NO_MEMORY;
+        }
+
         rc = drvAudioGstInInit(pGstStrmIn, pHstStrmIn, pszName, pCfg);
+
+        RTStrFree(pszTemp);
     }
     else