Changeset 61166 in vbox for trunk

Timestamp:

May 24, 2016 3:26:06 PM (9 years ago)

Author:

vboxsync

Message:

Audio: Implemented ability to specify two different audio formats via PDMIAUDIOCONNECTOR::CreateStream, renamed AudioMixerCreateStream() to AudioMixerSinkCreateStream().

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioMixer.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/DevIchHda.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (10 diffs)
• src/VBox/Devices/Audio/DrvAudio.h (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -637 +637 @@
      * @returns VBox status code.
      * @param   pInterface           Pointer to the interface structure containing the called function pointer.
-     * @param   pszName              Friendly name of this input stream.
-     * @param   ppGstStrmIn          Pointer where to return the guest guest input stream on success.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOSTREAM *ppStream));
+     * @param   pCfgHost             Stream configuration for host side.
+     * @param   pCfgGuest            Stream configuration for guest side.
+     * @param   ppStream             Pointer where to return the created audio stream on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest, PPDMAUDIOSTREAM *ppStream));
 
     /**
@@ -694 +695 @@
 
 /** PDMIAUDIOCONNECTOR interface ID. */
-#define PDMIAUDIOCONNECTOR_IID                  "45620608-5014-4322-8593-A15ACFDA2B12"
+#define PDMIAUDIOCONNECTOR_IID                  "9CDE2581-41B1-838E-24A5-448B2D0C822E"
 
 

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

@@ -105 +105 @@
 }
 
-int AudioMixerCreateStream(PAUDIOMIXER pMixer,
-                           PPDMIAUDIOCONNECTOR pConn, PPDMAUDIOSTREAMCFG pCfg, uint32_t fFlags, PAUDMIXSTREAM *ppStream)
-{
-    AssertPtrReturn(pMixer, VERR_INVALID_POINTER);
-    AssertPtrReturn(pConn,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
-    /** @todo Validate fFlags. */
-    /* ppStream is optional. */
-
-    PAUDMIXSTREAM pMixStream = (PAUDMIXSTREAM)RTMemAllocZ(sizeof(AUDMIXSTREAM));
-    if (!pMixStream)
-        return VERR_NO_MEMORY;
-
-    pMixStream->pszName = RTStrDup(pCfg->szName);
-    if (!pMixStream->pszName)
-    {
-        RTMemFree(pMixStream);
-        return VERR_NO_MEMORY;
-    }
-
-    LogFlowFunc(("[%s]: fFlags=0x%x (enmDir=%ld, %s, %RU8 channels, %RU32Hz)\n",
-                 pMixer->pszName, fFlags, pCfg->enmDir, DrvAudioAudFmtToStr(pCfg->enmFormat), pCfg->cChannels, pCfg->uHz));
-
-    PPDMAUDIOSTREAM pStream;
-    int rc = pConn->pfnStreamCreate(pConn, pCfg, &pStream);
-    if (RT_SUCCESS(rc))
-    {
-        /* Save the audio stream pointer to this mixing stream. */
-        pMixStream->pStream = pStream;
-
-        /* Increase the stream's reference count to let others know
-         * we're reyling on it to be around now. */
-        pConn->pfnStreamAddRef(pConn, pStream);
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        pMixStream->fFlags = fFlags;
-        pMixStream->pConn  = pConn;
-
-        if (ppStream)
-            *ppStream = pMixStream;
-    }
-    else if (pMixStream)
-    {
-        RTStrFree(pMixStream->pszName);
-        pMixStream->pszName = NULL;
-
-        RTMemFree(pMixStream);
-        pMixStream = NULL;
-    }
-
-    return rc;
-}
-
 int AudioMixerCreate(const char *pszName, uint32_t uFlags, PAUDIOMIXER *ppMixer)
 {
@@ -417 +362 @@
 
     LogFlowFunc(("[%s]: cStreams=%RU8, rc=%Rrc\n", pSink->pszName, pSink->cStreams, rc));
+    return rc;
+}
+
+int AudioMixerSinkCreateStream(PAUDMIXSINK pSink,
+                               PPDMIAUDIOCONNECTOR pConn, PPDMAUDIOSTREAMCFG pCfg, uint32_t fFlags, PAUDMIXSTREAM *ppStream)
+{
+    AssertPtrReturn(pSink,  VERR_INVALID_POINTER);
+    AssertPtrReturn(pConn,  VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
+    /** @todo Validate fFlags. */
+    /* ppStream is optional. */
+
+    PAUDMIXSTREAM pMixStream = (PAUDMIXSTREAM)RTMemAllocZ(sizeof(AUDMIXSTREAM));
+    if (!pMixStream)
+        return VERR_NO_MEMORY;
+
+    pMixStream->pszName = RTStrDup(pCfg->szName);
+    if (!pMixStream->pszName)
+    {
+        RTMemFree(pMixStream);
+        return VERR_NO_MEMORY;
+    }
+
+    LogFlowFunc(("[%s]: fFlags=0x%x (enmDir=%ld, %s, %RU8 channels, %RU32Hz)\n",
+                 pSink->pszName, fFlags, pCfg->enmDir, DrvAudioAudFmtToStr(pCfg->enmFormat), pCfg->cChannels, pCfg->uHz));
+
+    PDMAUDIOSTREAMCFG CfgSink;
+    int rc = DrvAudioPCMPropsToStreamCfg(&pSink->PCMProps, &CfgSink);
+    AssertRCReturn(rc, rc);
+
+    /* Always use the sink's PCM audio format as the host side when creating a stream for it. */
+    PPDMAUDIOSTREAM pStream;
+    rc = pConn->pfnStreamCreate(pConn, &CfgSink, pCfg, &pStream);
+    if (RT_SUCCESS(rc))
+    {
+        /* Save the audio stream pointer to this mixing stream. */
+        pMixStream->pStream = pStream;
+
+        /* Increase the stream's reference count to let others know
+         * we're reyling on it to be around now. */
+        pConn->pfnStreamAddRef(pConn, pStream);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        pMixStream->fFlags = fFlags;
+        pMixStream->pConn  = pConn;
+
+        if (ppStream)
+            *ppStream = pMixStream;
+    }
+    else if (pMixStream)
+    {
+        RTStrFree(pMixStream->pszName);
+        pMixStream->pszName = NULL;
+
+        RTMemFree(pMixStream);
+        pMixStream = NULL;
+    }
+
     return rc;
 }

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

@@ -156 +156 @@
 int AudioMixerCreate(const char *pszName, uint32_t uFlags, PAUDIOMIXER *ppMixer);
 int AudioMixerCreateSink(PAUDIOMIXER pMixer, const char *pszName, AUDMIXSINKDIR enmDir, PAUDMIXSINK *ppSink);
-int AudioMixerCreateStream(PAUDIOMIXER pMixer, PPDMIAUDIOCONNECTOR pConnector, PPDMAUDIOSTREAMCFG pCfg, uint32_t fFlags, PAUDMIXSTREAM *ppStream);
 void AudioMixerDestroy(PAUDIOMIXER pMixer);
 int AudioMixerGetDeviceFormat(PAUDIOMIXER pMixer, PPDMAUDIOSTREAMCFG pCfg);
@@ -166 +165 @@
 
 int AudioMixerSinkAddStream(PAUDMIXSINK pSink, PAUDMIXSTREAM pStream);
+int AudioMixerSinkCreateStream(PAUDMIXSINK pSink, PPDMIAUDIOCONNECTOR pConnector, PPDMAUDIOSTREAMCFG pCfg, uint32_t fFlags, PAUDMIXSTREAM *ppStream);
 int AudioMixerSinkCtl(PAUDMIXSINK pSink, AUDMIXSINKCMD enmCmd);
 void AudioMixerSinkDestroy(PAUDMIXSINK pSink);

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

@@ -760 +760 @@
         pStream->pMixStrm = NULL;
 
-        int rc2 = AudioMixerCreateStream(pThis->pMixer, pDrv->pConnector, pCfg, 0 /* fFlags */ , &pStream->pMixStrm);
+        int rc2 = AudioMixerSinkCreateStream(pSink, pDrv->pConnector, pCfg, 0 /* fFlags */ , &pStream->pMixStrm);
         if (RT_SUCCESS(rc2))
         {
@@ -805 +805 @@
         pDrv->Out.pMixStrm = NULL;
 
-        int rc2 = AudioMixerCreateStream(pThis->pMixer, pDrv->pConnector, pCfg, 0 /* fFlags */, &pDrv->Out.pMixStrm);
+        int rc2 = AudioMixerSinkCreateStream(pThis->pSinkOutput, pDrv->pConnector, pCfg, 0 /* fFlags */, &pDrv->Out.pMixStrm);
         if (RT_SUCCESS(rc2))
         {

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

@@ -3775 +3775 @@
 
             PAUDMIXSTREAM pMixStrm;
-            rc2 = AudioMixerCreateStream(pThis->pMixer, pDrv->pConnector, pCfg, 0 /* fFlags */, &pMixStrm);
+            rc2 = AudioMixerSinkCreateStream(pSink->pMixSink, pDrv->pConnector, pCfg, 0 /* fFlags */, &pMixStrm);
             if (RT_SUCCESS(rc2))
             {

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

@@ -2054 +2054 @@
         pDrv->Out.pMixStrm = NULL;
 
-        int rc2 = AudioMixerCreateStream(pThis->pMixer, pDrv->pConnector, pCfg, 0 /* fFlags */, &pDrv->Out.pMixStrm);
+        int rc2 = AudioMixerSinkCreateStream(pThis->pSinkOutput, pDrv->pConnector, pCfg, 0 /* fFlags */, &pDrv->Out.pMixStrm);
         if (RT_SUCCESS(rc2))
         {

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

@@ -1455 +1455 @@
 #endif
 
-static DECLCALLBACK(int) drvAudioStreamCreate(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAMCFG pCfg,
+static DECLCALLBACK(int) drvAudioStreamCreate(PPDMIAUDIOCONNECTOR pInterface,
+                                              PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest,
                                               PPDMAUDIOSTREAM *ppStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,       VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgHost,   VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgGuest,  VERR_INVALID_POINTER);
     AssertPtrReturn(ppStream,   VERR_INVALID_POINTER);
 
@@ -1468 +1470 @@
         return rc;
 
-    LogFlowFunc(("szName=%s\n", pCfg->szName));
+    LogFlowFunc(("Host=%s, Guest=%s\n", pCfgHost->szName, pCfgGuest->szName));
 #ifdef DEBUG
-    DrvAudioStreamCfgPrint(pCfg);
+    DrvAudioStreamCfgPrint(pCfgHost);
+    DrvAudioStreamCfgPrint(pCfgGuest);
 #endif
 
@@ -1486 +1489 @@
     do
     {
-        if (!DrvAudioStreamCfgIsValid(pCfg))
+        if (   !DrvAudioStreamCfgIsValid(pCfgHost)
+            || !DrvAudioStreamCfgIsValid(pCfgGuest))
+        {
+            RC_BREAK(VERR_INVALID_PARAMETER);
+        }
+
+        /* Make sure that both configurations actually intend the same thing. */
+        if (pCfgHost->enmDir != pCfgGuest->enmDir)
             RC_BREAK(VERR_INVALID_PARAMETER);
 
@@ -1492 +1502 @@
          *       which the host backend will need. */
         size_t cbHstStrm;
-        if (pCfg->enmDir == PDMAUDIODIR_IN)
+        if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
             if (!pThis->cStreamsFreeIn)
@@ -1542 +1552 @@
 
         RTStrPrintf(pHstStrm->szName, RT_ELEMENTS(pHstStrm->szName), "%s (Host)",
-                    strlen(pCfg->szName) ? pCfg->szName : "<Untitled>");
+                    strlen(pCfgHost->szName) ? pCfgHost->szName : "<Untitled>");
 
         /* Note: Direction is always from child -> parent. */
         uint32_t cSamples = 0;
-        rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pHstStrm, pCfg, &cSamples);
+        rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pHstStrm, pCfgHost, &cSamples);
         if (RT_FAILURE(rc))
         {
@@ -1554 +1564 @@
 
         pHstStrm->enmCtx   = PDMAUDIOSTREAMCTX_HOST;
-        pHstStrm->enmDir   = pCfg->enmDir;
+        pHstStrm->enmDir   = pCfgHost->enmDir;
         pHstStrm->fStatus |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
         pHstStrm->pPair    = pGstStrm;
 
-        rc = DrvAudioStreamCfgToProps(pCfg, &pHstStrm->Props);
+        rc = DrvAudioStreamCfgToProps(pCfgHost, &pHstStrm->Props);
         AssertRCBreak(rc);
 
@@ -1569 +1579 @@
 
         RTStrPrintf(pGstStrm->szName, RT_ELEMENTS(pGstStrm->szName), "%s (Guest)",
-                    strlen(pCfg->szName) ? pCfg->szName : "<Untitled>");
-
-        rc = DrvAudioStreamCfgToProps(pCfg, &pGstStrm->Props);
+                    strlen(pCfgGuest->szName) ? pCfgGuest->szName : "<Untitled>");
+
+        rc = DrvAudioStreamCfgToProps(pCfgGuest, &pGstStrm->Props);
         AssertRCBreak(rc);
 
@@ -1577 +1587 @@
         if (RT_SUCCESS(rc))
         {
-            if (pCfg->enmDir == PDMAUDIODIR_IN)
+            if (pCfgGuest->enmDir == PDMAUDIODIR_IN)
             {
                 rc = AudioMixBufLinkTo(&pHstStrm->MixBuf, &pGstStrm->MixBuf);
@@ -1588 +1598 @@
 
         pGstStrm->enmCtx   = PDMAUDIOSTREAMCTX_GUEST;
-        pGstStrm->enmDir   = pCfg->enmDir;
+        pGstStrm->enmDir   = pCfgGuest->enmDir;
         pGstStrm->fStatus |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
         pGstStrm->pPair    = pHstStrm;
@@ -1628 +1638 @@
         pHstStrm->cRefs = 1;
 
-        if (pCfg->enmDir == PDMAUDIODIR_IN)
+        if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
             Assert(pThis->cStreamsFreeIn);

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

@@ -111 +111 @@
     ( (PDRVAUDIO)((uintptr_t)pInterface - RT_OFFSETOF(DRVAUDIO, IAudioConnector)) )
 
+
+bool DrvAudioAudFmtIsSigned(PDMAUDIOFMT enmFmt);
+uint8_t DrvAudioAudFmtToBits(PDMAUDIOFMT enmFmt);
 const char *DrvAudioAudFmtToStr(PDMAUDIOFMT enmFmt);
 void DrvAudioClearBuf(PPDMPCMPROPS pPCMInfo, void *pvBuf, size_t cbBuf, uint32_t cSamples);
-bool DrvAudioPCMPropsAreEqual(PPDMPCMPROPS pProps1, PPDMPCMPROPS pProps2);
-bool DrvAudioPCMPropsAreEqual(PPDMPCMPROPS pPCMInfo, PPDMAUDIOSTREAMCFG pCfg);
+bool DrvAudioPCMPropsAreEqual(PPDMPCMPROPS pPCMProps1, PPDMPCMPROPS pPCMProps2);
+bool DrvAudioPCMPropsAreEqual(PPDMPCMPROPS pPCMProps, PPDMAUDIOSTREAMCFG pCfg);
+int DrvAudioPCMPropsToStreamCfg(PPDMPCMPROPS pPCMProps, PPDMAUDIOSTREAMCFG pCfg);
 const char *DrvAudRecSrcToStr(PDMAUDIORECSOURCE enmRecSource);
 void DrvAudioStreamCfgPrint(PPDMAUDIOSTREAMCFG pCfg);

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

@@ -61 +61 @@
 #include "AudioMixBuffer.h"
 
+
+/**
+ * Retrieves the matching PDMAUDIOFMT for given bits + signing flag.
+ *
+ * @return  IPRT status code.
+ * @return  PDMAUDIOFMT         Resulting audio format or PDMAUDIOFMT_INVALID if invalid.
+ * @param   cBits               Bits to retrieve audio format for.
+ * @param   fSigned             Signed flag for bits to retrieve audio format for.
+ */
+PDMAUDIOFMT DrvAudioAudFmtBitsToAudFmt(uint8_t cBits, bool fSigned)
+{
+    if (fSigned)
+    {
+        switch (cBits)
+        {
+            case 8:  return PDMAUDIOFMT_S8;
+            case 16: return PDMAUDIOFMT_S16;
+            case 32: return PDMAUDIOFMT_S32;
+            default: break;
+        }
+    }
+    else
+    {
+        switch (cBits)
+        {
+            case 8:  return PDMAUDIOFMT_U8;
+            case 16: return PDMAUDIOFMT_U16;
+            case 32: return PDMAUDIOFMT_U32;
+            default: break;
+        }
+    }
+
+    AssertMsgFailed(("Bogus audio bits %RU8\n", cBits));
+    return PDMAUDIOFMT_INVALID;
+}
+
 /**
  * Clears a sample buffer by the given amount of audio samples.
@@ -150 +186 @@
     AssertMsgFailed(("Invalid recording source %ld\n", enmRecSrc));
     return "Unknown";
+}
+
+/**
+ * Returns wether the given audio format has signed bits or not.
+ *
+ * @return  IPRT status code.
+ * @return  bool                @true for signed bits, @false for unsigned.
+ * @param   enmFmt              Audio format to retrieve value for.
+ */
+bool DrvAudioAudFmtIsSigned(PDMAUDIOFMT enmFmt)
+{
+    switch (enmFmt)
+    {
+        case PDMAUDIOFMT_S8:
+        case PDMAUDIOFMT_S16:
+        case PDMAUDIOFMT_S32:
+            return true;
+
+        case PDMAUDIOFMT_U8:
+        case PDMAUDIOFMT_U16:
+        case PDMAUDIOFMT_U32:
+            return false;
+
+        default:
+            break;
+    }
+
+    AssertMsgFailed(("Bogus audio format %ld\n", enmFmt));
+    return false;
+}
+
+/**
+ * Returns the bits of a given audio format.
+ *
+ * @return  IPRT status code.
+ * @return  uint8_t             Bits of audio format.
+ * @param   enmFmt              Audio format to retrieve value for.
+ */
+uint8_t DrvAudioAudFmtToBits(PDMAUDIOFMT enmFmt)
+{
+    switch (enmFmt)
+    {
+        case PDMAUDIOFMT_S8:
+        case PDMAUDIOFMT_U8:
+            return 8;
+
+        case PDMAUDIOFMT_U16:
+        case PDMAUDIOFMT_S16:
+            return 16;
+
+        case PDMAUDIOFMT_U32:
+        case PDMAUDIOFMT_S32:
+            return 32;
+
+        default:
+            break;
+    }
+
+    AssertMsgFailed(("Bogus audio format %ld\n", enmFmt));
+    return 0;
 }
 
@@ -253 +349 @@
            && pProps1->cBits       == pProps2->cBits
            && pProps1->fSwapEndian == pProps2->fSwapEndian;
+}
+
+/**
+ * Converts PCM properties to a audio stream configuration.
+ *
+ * @return  IPRT status code.
+ * @param   pPCMProps           Pointer to PCM properties to convert.
+ * @param   pCfg                Pointer to audio stream configuration to store result into.
+ */
+int DrvAudioPCMPropsToStreamCfg(PPDMPCMPROPS pPCMProps, PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pPCMProps, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,      VERR_INVALID_POINTER);
+
+    pCfg->uHz           = pPCMProps->uHz;
+    pCfg->cChannels     = pPCMProps->cChannels;
+    pCfg->enmFormat     = DrvAudioAudFmtBitsToAudFmt(pPCMProps->cBits, pPCMProps->fSigned);
+
+    /** @todo We assume little endian is the default for now. */
+    pCfg->enmEndianness = pPCMProps->fSwapEndian == false ? PDMAUDIOENDIANNESS_LITTLE : PDMAUDIOENDIANNESS_BIG;
+    return VINF_SUCCESS;
 }