Changeset 88412 in vbox

Timestamp:

Apr 8, 2021 12:00:08 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Made PPDMAUDIOBACKENDSTREAM a typedef instead of a weird #define void-pointer. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (25 diffs)
• src/VBox/Devices/Audio/DrvHostAudioDSound.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -994 +994 @@
 
 
-/** @todo r=bird: What is this exactly? */
-#define PPDMAUDIOBACKENDSTREAM void *
-
-
 /** Pointer to a audio connector interface. */
 typedef struct PDMIAUDIOCONNECTOR *PPDMIAUDIOCONNECTOR;
@@ -1203 +1199 @@
 #define PDMIAUDIOCONNECTOR_IID                  "122511ca-deb3-4630-ad31-ade9f3177df4"
 
+
+/** Opque pointer host audio specific stream data.
+ * @todo r=bird: should extend this to a public part that at least includes a
+ *       PPDMAUDIOSTREAM member. */
+typedef struct PDMAUDIOBACKENDSTREAM *PPDMAUDIOBACKENDSTREAM;
 
 /** Pointer to a host audio interface. */

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

@@ -98 +98 @@
      *
      *  That way the backends do not have access to the audio connector's data. */
-    void               *pvBackend;
+    PPDMAUDIOBACKENDSTREAM pBackend;
 
     /** For output streams this indicates whether the stream has reached
@@ -779 +779 @@
         {
             if (fEnabled)
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_ENABLE);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_ENABLE);
             break;
         }
@@ -785 +785 @@
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
-            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_DISABLE);
+            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_DISABLE);
             break;
         }
@@ -792 +792 @@
         {
             if (fEnabled) /* Needed, as resume below also is being checked for. */
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_PAUSE);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_PAUSE);
             break;
         }
@@ -799 +799 @@
         {
             if (fEnabled)
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_RESUME);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_RESUME);
             break;
         }
@@ -805 +805 @@
         case PDMAUDIOSTREAMCMD_DRAIN:
         {
-            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_DRAIN);
+            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_DRAIN);
             break;
         }
@@ -811 +811 @@
         case PDMAUDIOSTREAMCMD_DROP:
         {
-            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pvBackend, PDMAUDIOSTREAMCMD_DROP);
+            rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pStreamEx->pBackend, PDMAUDIOSTREAMCMD_DROP);
             break;
         }
@@ -849 +849 @@
 
         pStreamEx->Core.uMagic    = ~PDMAUDIOSTREAM_MAGIC;
-        pStreamEx->pvBackend = NULL;
+        pStreamEx->pBackend       = NULL;
         pStreamEx->uMagic         = DRVAUDIOSTREAM_MAGIC_DEAD;
 
@@ -1046 +1046 @@
         if (   !pThis->Out.fEnabled         /* (see @bugref{9882}) */
             || pThis->pHostDrvAudio == NULL /* (we used to work this condition differently) */
-            || !PDMAudioStrmStatusCanWrite(pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStreamEx->pvBackend)))
+            || !PDMAudioStrmStatusCanWrite(pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStreamEx->pBackend)))
         {
             Log3Func(("[%s] Backend stream %s, discarding the data\n", pStreamEx->Core.szName,
@@ -1357 +1357 @@
                 if (pThis->pHostDrvAudio->pfnStreamGetPending) /* Optional to implement. */
                 {
-                    const uint32_t cxPending = pThis->pHostDrvAudio->pfnStreamGetPending(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+                    const uint32_t cxPending = pThis->pHostDrvAudio->pfnStreamGetPending(pThis->pHostDrvAudio, pStreamEx->pBackend);
                     Log3Func(("[%s] cxPending=%RU32\n", pStreamEx->Core.szName, cxPending));
 
@@ -1472 +1472 @@
         uint32_t cFramesPlayed = 0;
         uint32_t cbPlayed      = 0;
-        rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pStreamEx->pvBackend, abChunk, cbRead, &cbPlayed);
+        rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pStreamEx->pBackend, abChunk, cbRead, &cbPlayed);
         if (RT_SUCCESS(rc))
         {
@@ -1549 +1549 @@
            some heuristics based on number of writable bytes now compared to when
            prebuffering ended the first time around. */
-        uint32_t cbBuffered = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+        uint32_t cbBuffered = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pBackend);
         if (cbBuffered < pStreamEx->Out.cbBackendMaxWritable)
             cbBuffered = pStreamEx->Out.cbBackendMaxWritable - cbBuffered;
@@ -1580 +1580 @@
     {
         /* not-prebuffering, likely after a while at least */
-        cbWritable = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+        cbWritable = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pBackend);
     }
     else
@@ -1618 +1618 @@
 
         /* Hack alert! This is for the underrun detection.  */
-        cbWritable = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+        cbWritable = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pBackend);
         if (cbWritable > pStreamEx->Out.cbBackendMaxWritable)
             pStreamEx->Out.cbBackendMaxWritable = cbWritable;
@@ -1648 +1648 @@
         pStreamEx->nsLastPlayedCaptured = RTTimeNanoTS();
         pStreamEx->Out.Stats.cbBackendWritableAfter = pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio,
-                                                                                                 pStreamEx->pvBackend);
+                                                                                                 pStreamEx->pBackend);
     }
     else
@@ -1727 +1727 @@
      */
     AssertPtr(pThis->pHostDrvAudio->pfnStreamGetReadable);
-    uint32_t cbReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+    uint32_t cbReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStreamEx->pBackend);
     if (!cbReadable)
         Log2Func(("[%s] No readable data available\n", pStreamEx->Core.szName));
@@ -1747 +1747 @@
         uint8_t  abChunk[_4K];
         uint32_t cbCaptured;
-        rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pStreamEx->pvBackend,
+        rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pStreamEx->pBackend,
                                                     abChunk, RT_MIN(cbReadable, (uint32_t)sizeof(abChunk)), &cbCaptured);
         if (RT_FAILURE(rc))
@@ -1829 +1829 @@
      */
     /* Note: Raw means *audio frames*, not bytes! */
-    uint32_t cfReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+    uint32_t cfReadable = pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStreamEx->pBackend);
     if (!cfReadable)
         Log2Func(("[%s] No readable data available\n", pStreamEx->Core.szName));
@@ -1855 +1855 @@
 
         uint32_t cfCaptured;
-        rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pStreamEx->pvBackend,
+        rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pStreamEx->pBackend,
                                                     paFrames, cfWritable, &cfCaptured);
         if (RT_FAILURE(rc))
@@ -2409 +2409 @@
     AssertPtr(pThis->pHostDrvAudio);
     if (pThis->pHostDrvAudio)
-        rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pStreamEx->pvBackend, pCfgReq, pCfgAcq);
+        rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pStreamEx->pBackend, pCfgReq, pCfgAcq);
     else
         rc = VERR_PDM_NO_ATTACHED_DRIVER;
@@ -2798 +2798 @@
             pStreamEx->Core.cbBackend = (uint32_t)cbHstStrm;
             if (cbHstStrm)
-                pStreamEx->pvBackend = pStreamEx + 1;
+                pStreamEx->pBackend   = (PPDMAUDIOBACKENDSTREAM)(pStreamEx + 1);
             pStreamEx->fNoMixBufs     = RT_BOOL(fFlags & PDMAUDIOSTREAM_CREATE_F_NO_MIXBUF);
             pStreamEx->uMagic         = DRVAUDIOSTREAM_MAGIC;
@@ -3038 +3038 @@
     {
         if (pStreamEx->fNoMixBufs)
-            cbReadable = pThis->pHostDrvAudio ? pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStream) : 0;
+            cbReadable = pThis->pHostDrvAudio
+                       ? pThis->pHostDrvAudio->pfnStreamGetReadable(pThis->pHostDrvAudio, pStreamEx->pBackend) : 0;
         else
         {
@@ -3057 +3058 @@
             PDMAUDIOSTREAMSTS fStatus = PDMAUDIOSTREAMSTS_FLAGS_NONE;
             if (pThis->pHostDrvAudio->pfnStreamGetStatus)
-                fStatus = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+                fStatus = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStreamEx->pBackend);
             if (   !PDMAudioStrmStatusCanRead(fStatus)
                 || fDisabled)
@@ -3112 +3113 @@
     {
         if (pStreamEx->fNoMixBufs)
-            cbWritable = pThis->pHostDrvAudio ? pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStream) : 0;
+            cbWritable = pThis->pHostDrvAudio
+                       ? pThis->pHostDrvAudio->pfnStreamGetWritable(pThis->pHostDrvAudio, pStreamEx->pBackend) : 0;
         else
             cbWritable = AudioMixBufFreeBytes(&pStreamEx->Host.MixBuf);
@@ -3204 +3206 @@
     if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED)
     {
-        AssertPtr(pStreamEx->pvBackend);
+        AssertPtr(pStreamEx->pBackend);
 
         /* Check if the pointer to  the host audio driver is still valid.
          * It can be NULL if we were called in drvAudioDestruct, for example. */
         if (pThis->pHostDrvAudio)
-            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStreamEx->pvBackend);
+            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStreamEx->pBackend);
 
         pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;

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

@@ -2065 +2065 @@
 }
 
-static int dsoundDestroyStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream;
-
+static int dsoundDestroyStreamOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
     LogFlowFuncEnter();