Changeset 63529 in vbox for trunk/src

Timestamp:

Aug 16, 2016 9:37:04 AM (8 years ago)

Author:

vboxsync

Message:

Audio: Bugfixes.

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvAudio.cpp (modified) (6 diffs)
• Devices/Audio/DrvHostCoreAudio.cpp (modified) (9 diffs)
• Devices/Audio/DrvHostDSound.cpp (modified) (17 diffs)
• Devices/Audio/DrvHostDebugAudio.cpp (modified) (5 diffs)
• Devices/Audio/DrvHostNullAudio.cpp (modified) (6 diffs)
• Devices/Audio/DrvHostOSSAudio.cpp (modified) (8 diffs)
• Devices/Audio/DrvHostPulseAudio.cpp (modified) (3 diffs)
• Main/src-client/DrvAudioVRDE.cpp (modified) (14 diffs)

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

@@ -521 +521 @@
      */
 
-    /* Make the acquired host configuration the requested host configuration by default. */
-    PDMAUDIOSTREAMCFG CfgAcq;
-    memcpy(&CfgAcq, pCfgHost, sizeof(PDMAUDIOSTREAMCFG));
-
-    uint32_t cSamples = 0;
+    /* Make the acquired host configuration the requested host configuration initially,
+     * in case the backend does not report back an acquired configuration. */
+    PDMAUDIOSTREAMCFG CfgHostAcq;
+    memcpy(&CfgHostAcq, pCfgHost, sizeof(PDMAUDIOSTREAMCFG));
+
     int rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pHstStream,
-                                                   pCfgHost /* pCfgReq */, &CfgAcq /* pCfgAcq */);
+                                                   pCfgHost /* pCfgReq */, &CfgHostAcq /* pCfgAcq */);
     if (RT_SUCCESS(rc))
     {
@@ -538 +538 @@
         LogFlowFunc(("[%s] Initializing stream in host backend failed with rc=%Rrc\n", pStream->szName, rc));
 
-    int rc2 = DrvAudioHlpStreamCfgToProps(pCfgHost, &pHstStream->Props);
+    PDMAUDIOPCMPROPS PCMProps;
+    int rc2 = DrvAudioHlpStreamCfgToProps(&CfgHostAcq, &PCMProps);
     AssertRC(rc2);
 
@@ -544 +545 @@
     AudioMixBufDestroy(&pHstStream->MixBuf);
 
-    if (cSamples)
-    {
-        cSamples = cSamples * 4;
-
-        LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, cSamples));
-
-        rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &pHstStream->Props, cSamples);
+    if (CfgHostAcq.cSamples)
+    {
+        LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSamples * 4));
+
+        rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSamples * 4);
         AssertRC(rc2);
     }
@@ -561 +560 @@
      */
 
-    rc2 = DrvAudioHlpStreamCfgToProps(pCfgGuest, &pGstStream->Props);
+    RT_ZERO(PCMProps);
+    rc2 = DrvAudioHlpStreamCfgToProps(pCfgGuest, &PCMProps);
     AssertRC(rc2);
 
@@ -567 +567 @@
     AudioMixBufDestroy(&pGstStream->MixBuf);
 
-    if (cSamples)
-    {
-        cSamples = cSamples * 2;
-
-        LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, cSamples));
-
-        rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &pGstStream->Props, cSamples);
+    if (CfgHostAcq.cSamples)
+    {
+        LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSamples * 2));
+
+        rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSamples * 2);
         AssertRC(rc2);
     }
@@ -581 +579 @@
 #endif
 
-    if (cSamples)
+    if (CfgHostAcq.cSamples)
     {
         if (pCfgGuest->enmDir == PDMAUDIODIR_IN)

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

@@ -123 +123 @@
     pASBD->mBytesPerFrame    = pASBD->mChannelsPerFrame * (pASBD->mBitsPerChannel / 8);
     pASBD->mBytesPerPacket   = pASBD->mFramesPerPacket * pASBD->mBytesPerFrame;
+}
+
+static int coreAudioStreamCfgToASBD(PPDMAUDIOSTREAMCFG pCfg, AudioStreamBasicDescription *pASBD)
+{
+    AssertPtrReturn(pCfg,  VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pASBD, VERR_INVALID_PARAMETER);
+
+    PDMAUDIOPCMPROPS Props;
+    int rc = DrvAudioHlpStreamCfgToProps(pCfg, &Props);
+    if (RT_SUCCESS(rc))
+        coreAudioPCMPropsToASBD(&Props, pASBD);
+
+    return rc;
 }
 
@@ -1141 +1154 @@
                            PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgAcq, VERR_INVALID_POINTER);
+    RT_NOREF(pThis);
 
     int rc = VINF_SUCCESS;
@@ -1152 +1162 @@
 
     OSStatus err = noErr;
+    UInt32 uSize = 0;
+
     AudioDeviceID deviceID = pStreamIn->deviceID;
-
-    UInt32 uSize = 0;
     if (deviceID == kAudioDeviceUnknown)
     {
@@ -1341 +1351 @@
         /* Create an AudioStreamBasicDescription based on our required audio settings. */
         RT_ZERO(pStreamIn->streamFormat);
-        coreAudioPCMPropsToASBD(&pStreamIn->Stream.Props, &pStreamIn->streamFormat);
+        coreAudioStreamCfgToASBD(pCfgReq, &pStreamIn->streamFormat);
 
         coreAudioPrintASBD("Recording device", &pStreamIn->deviceFormat);
@@ -1512 +1522 @@
         }
 
-        if (RT_SUCCESS(rc))
-            rc = RTCircBufCreate(&pStreamIn->pCircBuf, cSamples << pStreamIn->Stream.Props.cShift);
+        PDMAUDIOPCMPROPS PCMProps;
+        int rc2 = DrvAudioHlpStreamCfgToProps(pCfgAcq, &PCMProps);
+        AssertRC(rc2);
+
+        rc = RTCircBufCreate(&pStreamIn->pCircBuf, cSamples << PCMProps.cShift);
+        if (RT_FAILURE(rc))
+            break;
 
         /* Init the converter callback context. */
-        if (RT_SUCCESS(rc))
-            rc = coreAudioInitConvCbCtx(&pStreamIn->convCbCtx,
-                                        &pStreamIn->deviceFormat /* Source */, &pStreamIn->streamFormat /* Dest */);
+        rc = coreAudioInitConvCbCtx(&pStreamIn->convCbCtx,
+                                    &pStreamIn->deviceFormat /* Source */, &pStreamIn->streamFormat /* Dest */);
 
         if (RT_SUCCESS(rc))
@@ -1573 +1587 @@
                             PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgAcq, VERR_INVALID_POINTER);
+    RT_NOREF(pThis);
 
     int rc = VINF_SUCCESS;
@@ -1584 +1595 @@
 
     OSStatus err = noErr;
+    UInt32 uSize = 0;
+
     AudioDeviceID deviceID = pStreamOut->deviceID;
-
-    UInt32 uSize = 0;
-    if (pStreamOut->deviceID == kAudioDeviceUnknown)
+    if (deviceID == kAudioDeviceUnknown)
     {
         /* Fetch the default audio recording device currently in use. */
         AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice,
                                                kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-        uSize = sizeof(pStreamOut->deviceID);
-        err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize, &pStreamOut->deviceID);
+        uSize = sizeof(deviceID);
+        err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize, &deviceID);
         if (err != noErr)
         {
@@ -1753 +1764 @@
 
         /* Create an AudioStreamBasicDescription based on our required audio settings. */
-        coreAudioPCMPropsToASBD(&pStreamOut->Stream.Props, &pStreamOut->streamFormat);
+        coreAudioStreamCfgToASBD(pCfgReq, &pStreamOut->streamFormat);
 
         coreAudioPrintASBD("Playback device", &pStreamOut->deviceFormat);
@@ -1834 +1845 @@
         }
 
-        /* Create the internal ring buffer. */
-        rc = RTCircBufCreate(&pStreamOut->pCircBuf, cSamples << pStream->Props.cShift);
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Register callbacks.
-             */
+        PDMAUDIOPCMPROPS PCMProps;
+        int rc2 = DrvAudioHlpStreamCfgToProps(pCfgAcq, &PCMProps);
+        AssertRC(rc2);
+
+        rc = RTCircBufCreate(&pStreamOut->pCircBuf, cSamples << PCMProps.cShift);
+        if (RT_FAILURE(rc))
+            break;
+
+        /*
+         * Register callbacks.
+         */
 #ifdef DEBUG
-            propAdr.mSelector = kAudioDeviceProcessorOverload;
-            propAdr.mScope    = kAudioUnitScope_Global;
-            err = AudioObjectAddPropertyListener(pStreamOut->deviceID, &propAdr,
-                                                 coreAudioPlaybackAudioDevicePropertyChanged, (void *)pStreamOut);
-            if (err != noErr)
-                LogRel(("CoreAudio: Failed to register processor overload listener for output stream (%RI32)\n", err));
+        propAdr.mSelector = kAudioDeviceProcessorOverload;
+        propAdr.mScope    = kAudioUnitScope_Global;
+        err = AudioObjectAddPropertyListener(pStreamOut->deviceID, &propAdr,
+                                             coreAudioPlaybackAudioDevicePropertyChanged, (void *)pStreamOut);
+        if (err != noErr)
+            LogRel(("CoreAudio: Failed to register processor overload listener for output stream (%RI32)\n", err));
 #endif /* DEBUG */
 
-            propAdr.mSelector = kAudioDevicePropertyNominalSampleRate;
-            propAdr.mScope    = kAudioUnitScope_Global;
-            err = AudioObjectAddPropertyListener(pStreamOut->deviceID, &propAdr,
-                                                 coreAudioPlaybackAudioDevicePropertyChanged, (void *)pStreamOut);
-            /* Not fatal. */
-            if (err != noErr)
-                LogRel(("CoreAudio: Failed to register sample rate changed listener for output stream (%RI32)\n", err));
-        }
+        propAdr.mSelector = kAudioDevicePropertyNominalSampleRate;
+        propAdr.mScope    = kAudioUnitScope_Global;
+        err = AudioObjectAddPropertyListener(pStreamOut->deviceID, &propAdr,
+                                             coreAudioPlaybackAudioDevicePropertyChanged, (void *)pStreamOut);
+        /* Not fatal. */
+        if (err != noErr)
+            LogRel(("CoreAudio: Failed to register sample rate changed listener for output stream (%RI32)\n", err));
 
     } while (0);

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

@@ -107 +107 @@
 typedef struct DSOUNDSTREAMOUT
 {
-    /** Associated host output stream.
-     *  Note: Always must come first! */
+    /** Note: Always must come first! */
     PDMAUDIOSTREAM       Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS     Props;
     LPDIRECTSOUND8       pDS;     /** @todo Move this out of this structure! Not required per-stream (e.g. for multi-channel). */
     LPDIRECTSOUNDBUFFER8 pDSB;
@@ -121 +122 @@
 typedef struct DSOUNDSTREAMIN
 {
-    /** Associated host input stream.
-     *  Note: Always must come first! */
+    /** Associated host input stream. */
     PDMAUDIOSTREAM              Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS            Props;
     LPDIRECTSOUNDCAPTURE8       pDSC;
     LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB;
@@ -557 +559 @@
 static HRESULT directSoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
 {
-    AssertPtrReturn(pThis, E_POINTER);
+    AssertPtrReturn(pThis,         E_POINTER);
     AssertPtrReturn(pDSoundStream, E_POINTER);
 
@@ -563 +565 @@
            pDSoundStream,
            pThis->cfg.cbBufferOut,
-           pDSoundStream->Stream.Props.uHz,
-           pDSoundStream->Stream.Props.cChannels,
-           pDSoundStream->Stream.Props.cBits,
-           pDSoundStream->Stream.Props.fSigned));
+           pDSoundStream->Props.uHz,
+           pDSoundStream->Props.cChannels,
+           pDSoundStream->Props.cBits,
+           pDSoundStream->Props.fSigned));
 
     if (pDSoundStream->pDSB != NULL)
@@ -666 +668 @@
                wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStream->Stream.Props.uAlign)
+        if (bc.dwBufferBytes & pDSoundStream->Props.uAlign)
             DSLOGREL(("DSound: Playback capabilities returned misaligned buffer: size %RU32, alignment %RU32\n",
-                      bc.dwBufferBytes, pDSoundStream->Stream.Props.uAlign + 1));
+                      bc.dwBufferBytes, pDSoundStream->Props.uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferOut)
@@ -679 +681 @@
          * playback buffer position.
          */
-        pDSoundStream->cMaxSamplesInBuffer = bc.dwBufferBytes >> pDSoundStream->Stream.Props.cShift;
+        pDSoundStream->cMaxSamplesInBuffer = bc.dwBufferBytes >> pDSoundStream->Props.cShift;
         DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pDSoundStream->cMaxSamplesInBuffer));
 
@@ -1038 +1040 @@
            pDSoundStream,
            pThis->cfg.cbBufferIn,
-           pDSoundStream->Stream.Props.uHz,
-           pDSoundStream->Stream.Props.cChannels,
-           pDSoundStream->Stream.Props.cBits,
-           pDSoundStream->Stream.Props.fSigned));
+           pDSoundStream->Props.uHz,
+           pDSoundStream->Props.cChannels,
+           pDSoundStream->Props.cBits,
+           pDSoundStream->Props.fSigned));
 
     if (pDSoundStream->pDSCB != NULL)
@@ -1137 +1139 @@
                wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStream->Stream.Props.uAlign)
+        if (bc.dwBufferBytes & pDSoundStream->Props.uAlign)
             DSLOGREL(("DSound: Capture GetCaps returned misaligned buffer: size %RU32, alignment %RU32\n",
-                      bc.dwBufferBytes, pDSoundStream->Stream.Props.uAlign + 1));
+                      bc.dwBufferBytes, pDSoundStream->Props.uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferIn)
@@ -1146 +1148 @@
 
         /* Initial state: reading at the initial capture position, no error. */
-        pDSoundStream->idxSampleCaptureReadPos    = offByteReadPos >> pDSoundStream->Stream.Props.cShift;
-        pDSoundStream->cMaxSamplesInBuffer = bc.dwBufferBytes >> pDSoundStream->Stream.Props.cShift;
-        pDSoundStream->hrLastCapture       = S_OK;
+        pDSoundStream->idxSampleCaptureReadPos = offByteReadPos >> pDSoundStream->Props.cShift;
+        pDSoundStream->cMaxSamplesInBuffer     = bc.dwBufferBytes >> pDSoundStream->Props.cShift;
+        pDSoundStream->hrLastCapture           = S_OK;
 
         DSLOG(("DSound: idxSampleCaptureReadPos=%RU32, cMaxSamplesInBuffer=%RU32\n",
@@ -1450 +1452 @@
     pDSoundStream->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
 
-    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pDSoundStream->Stream.Props);
+    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pDSoundStream->Props);
     if (RT_SUCCESS(rc))
     {
@@ -1460 +1462 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = pThis->cfg.cbBufferOut >> pStream->Props.cShift; /** @todo Get rid of using Props! */
+            pCfgAcq->cSamples = pThis->cfg.cbBufferOut >> pDSoundStream->Props.cShift;
 
         /* Try to open playback in case the device is already there. */
@@ -1567 +1569 @@
         /* Do not write more than available space in the DirectSound playback buffer. */
         cbLive = RT_MIN(cbFree, cbLive);
-        cbLive &= ~pStream->Props.uAlign;
+        cbLive &= ~pDSoundStream->Props.uAlign;
         if (cbLive == 0 || cbLive > cbBuffer)
         {
@@ -1580 +1582 @@
         PVOID pv1, pv2;
         DWORD cb1, cb2;
-        HRESULT hr = directSoundPlayLock(pThis, pDSB, &pStream->Props, pDSoundStream->offPlayWritePos, cbLive,
+        HRESULT hr = directSoundPlayLock(pThis, pDSB, &pDSoundStream->Props, pDSoundStream->offPlayWritePos, cbLive,
                                          &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (FAILED(hr))
@@ -1700 +1702 @@
 
     /** @todo caller should already init Props? */
-    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pStream->Props); /** @todo Get rid of using Props! */
+    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pDSoundStream->Props);
     if (RT_SUCCESS(rc))
     {
@@ -1712 +1714 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = pThis->cfg.cbBufferIn >> pStream->Props.cShift; /** @todo Get rid of using Props! */
+            pCfgAcq->cSamples = pThis->cfg.cbBufferIn >> pDSoundStream->Props.cShift;
 
         /* Try to open capture in case the device is already there. */
@@ -1819 +1821 @@
         pDSoundStream->hrLastCapture = hr;
 
-        if (offByteReadPos & pStream->Props.uAlign)
-            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", offByteReadPos, pStream->Props.uAlign));
+        if (offByteReadPos & pDSoundStream->Props.uAlign)
+            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", offByteReadPos, pDSoundStream->Props.uAlign));
 
         /* Capture position in samples. */
-        DWORD idxSampleReadPos = offByteReadPos >> pStream->Props.cShift;
+        DWORD idxSampleReadPos = offByteReadPos >> pDSoundStream->Props.cShift;
 
         /* Number of samples available in the DirectSound capture buffer. */
@@ -1848 +1850 @@
         PVOID pv1, pv2;
         DWORD cb1, cb2;
-        hr = directSoundCaptureLock(pDSCB, &pStream->Props,
+        hr = directSoundCaptureLock(pDSCB, &pDSoundStream->Props,
                                     AUDIOMIXBUF_S2B(&pStream->MixBuf, pDSoundStream->idxSampleCaptureReadPos), /* dwOffset */
                                     AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesToCapture),                      /* dwBytes */

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

@@ -133 +133 @@
 
     /* Just adopt the wanted stream configuration. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStream->Props);
+    PDMAUDIOPCMPROPS Props;
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
     if (RT_SUCCESS(rc))
     {
@@ -157 +158 @@
     if (RT_SUCCESS(rc))
     {
-        pDbgStream->Out.tsLastPlayed  = 0;
+        pDbgStream->Out.tsLastPlayed            = 0;
         pDbgStream->Out.cMaxSamplesInPlayBuffer = _1K;
-        pDbgStream->Out.pu8PlayBuffer = (uint8_t *)RTMemAlloc(pDbgStream->Out.cMaxSamplesInPlayBuffer << Props.cShift);
+        pDbgStream->Out.pu8PlayBuffer           = (uint8_t *)RTMemAlloc(pDbgStream->Out.cMaxSamplesInPlayBuffer << Props.cShift);
         if (!pDbgStream->Out.pu8PlayBuffer)
             rc = VERR_NO_MEMORY;
@@ -193 +194 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostDebugAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostDebugAudioStreamCreate(PPDMIHOSTAUDIO pInterface,
+                                                       PPDMAUDIOSTREAM pStream,
+                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -213 +216 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostDebugAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvHostDebugAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
+                                                     PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                     uint32_t *pcbWritten)
 {
     RT_NOREF(pvBuf, cbBuf);
@@ -284 +289 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostDebugAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvHostDebugAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
+                                                        PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface, pStream, pvBuf, cbBuf);

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

@@ -62 +62 @@
 typedef struct NULLAUDIOSTREAMOUT
 {
+    /** @note Always must come first! */
     PDMAUDIOSTREAM      Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS    Props;
     uint64_t            u64TicksLast;
     uint64_t            cMaxSamplesInPlayBuffer;
@@ -73 +76 @@
     /** @note Always must come first! */
     PDMAUDIOSTREAM      Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS    Props;
 } NULLAUDIOSTREAMIN;
 typedef NULLAUDIOSTREAMIN *PNULLAUDIOSTREAMIN;
@@ -150 +155 @@
 static DECLCALLBACK(int) drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+
     RT_NOREF2(pvBuf, cbBuf);
 
@@ -169 +177 @@
      * If rounding is not taken into account then the playback rate will be consistently lower that expected.
      */
-    uint64_t cSamplesPlayed = (2 * u64TicksElapsed * pStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
+    uint64_t cSamplesPlayed = (2 * u64TicksElapsed * pNullStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
 
     /* Don't play more than available. */
@@ -206 +214 @@
 static int nullCreateStreamIn(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
+    PNULLAUDIOSTREAMIN pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMIN, Stream);
+
     /* Just adopt the wanted stream configuration. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStream->Props);
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pNullStream->Props);
     if (RT_SUCCESS(rc))
     {
@@ -221 +231 @@
 static int nullCreateStreamOut(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
+    PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
+
     /* Just adopt the wanted stream configuration. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStream->Props);
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pNullStream->Props);
     if (RT_SUCCESS(rc))
     {
-        PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
-
         pNullStream->u64TicksLast  = 0;
         pNullStream->cMaxSamplesInPlayBuffer = _1K;
 
-        pNullStream->pbPlayBuffer = (uint8_t *)RTMemAlloc(_1K << pStream->Props.cShift);
+        pNullStream->pbPlayBuffer = (uint8_t *)RTMemAlloc(_1K << pNullStream->Props.cShift);
         if (pNullStream->pbPlayBuffer)
         {

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

@@ -84 +84 @@
     /** Note: Always must come first! */
     PDMAUDIOSTREAM     pStreamIn;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS   Props;
     int                hFile;
     int                cFragments;
@@ -98 +100 @@
     /** Note: Always must come first! */
     PDMAUDIOSTREAM      pStreamOut;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS    Props;
     int                 hFile;
     int                 cFragments;
@@ -363 +367 @@
         case PDMAUDIOSTREAMCMD_RESUME:
         {
-            DrvAudioHlpClearBuf(&pStream->Props, /** @todo Get rid of using Props! */
+            DrvAudioHlpClearBuf(&pStreamOut->Props,
                                 pStreamOut->pvBuf, pStreamOut->cbBuf, AudioMixBufSize(&pStream->MixBuf));
 
@@ -675 +679 @@
             pCfgAcq->enmEndianness = obtStream.enmENDIANNESS;
 
-            PDMAUDIOPCMPROPS Props;
-            rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
+            rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStrm->Props);
             if (RT_SUCCESS(rc))
             {
-                if (obtStream.cFragments * obtStream.cbFragmentSize & Props.uAlign)
+                if (obtStream.cFragments * obtStream.cbFragmentSize & pStrm->Props.uAlign)
                 {
                     LogRel(("OSS: Warning: Misaligned capturing buffer: Size = %zu, Alignment = %u\n",
-                            obtStream.cFragments * obtStream.cbFragmentSize, Props.uAlign + 1));
+                            obtStream.cFragments * obtStream.cbFragmentSize, pStrm->Props.uAlign + 1));
                 }
 
-                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) >> Props.cShift;
+                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) >> pStrm->Props.cShift;
                 if (!cSamples)
                     rc = VERR_INVALID_PARAMETER;
@@ -692 +695 @@
             if (RT_SUCCESS(rc))
             {
-                size_t cbSample = (1 << Props.cShift);
+                size_t cbSample = (1 << pStrm->Props.cShift);
 
                 size_t cbBuf = cSamples * cbSample;
@@ -740 +743 @@
         reqStream.cbFragmentSize = s_OSSConf.fragsize;
 
-        PDMAUDIOPCMPROPS Props;
-        RT_ZERO(Props);
-
         rc = ossStreamOpen(s_OSSConf.devpath_out, O_WRONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile);
         if (RT_SUCCESS(rc))
@@ -751 +751 @@
             pCfgAcq->enmEndianness = obtStream.enmENDIANNESS;
 
-            rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
+            rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStrm->Props);
             if (RT_SUCCESS(rc))
             {
-                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) >> Props.cShift;
-
-                if (obtStream.cFragments * obtStream.cbFragmentSize & Props.uAlign)
+                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) >> pStrm->Props.cShift;
+
+                if (obtStream.cFragments * obtStream.cbFragmentSize & pStrm->Props.uAlign)
                 {
                     LogRel(("OSS: Warning: Misaligned playback buffer: Size = %zu, Alignment = %u\n",
-                            obtStream.cFragments * obtStream.cbFragmentSize, Props.uAlign + 1));
+                            obtStream.cFragments * obtStream.cbFragmentSize, pStrm->Props.uAlign + 1));
                 }
             }
@@ -768 +768 @@
             pStrm->fMemMapped = false;
 
-            size_t cbSamples =  cSamples << Props.cShift;
+            size_t cbSamples =  cSamples << pStrm->Props.cShift;
             Assert(cbSamples);
 

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

@@ -670 +670 @@
     pCfgAcq->cChannels = pStrm->SampleSpec.channels;
 
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStream->Props);
+    PDMAUDIOPCMPROPS Props;
+    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
     if (RT_SUCCESS(rc))
     {
@@ -681 +682 @@
             {
                 pStrm->cbPCMBuf = cbBuf;
-
-                pCfgAcq->cSamples = cbBuf >> pStream->Props.cShift; /** @todo Get rid of using Props! */
-
-                /* Save pointer to driver instance. */
-                pStrm->pDrv = pThis;
+                pStrm->pDrv     = pThis;
+
+                pCfgAcq->cSamples = cbBuf >> Props.cShift;
             }
             else
@@ -702 +701 @@
                             PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
-
-    pStrm->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
-    pStrm->SampleSpec.rate     = pCfgReq->uHz;
-    pStrm->SampleSpec.channels = pCfgReq->cChannels;
-
-    /* XXX check these values */
-    pStrm->BufAttr.fragsize    = (pa_bytes_per_second(&pStrm->SampleSpec)
-                                   * s_pulseCfg.buffer_msecs_in) / 1000;
-    pStrm->BufAttr.maxlength   = (pStrm->BufAttr.fragsize * 3) / 2;
+    PDRVHOSTPULSEAUDIO pThis   = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pPAStrm = (PPULSEAUDIOSTREAM)pStream;
+
+    pPAStrm->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
+    pPAStrm->SampleSpec.rate     = pCfgReq->uHz;
+    pPAStrm->SampleSpec.channels = pCfgReq->cChannels;
+
+    /** @todo Check these values! */
+    pPAStrm->BufAttr.fragsize    = (pa_bytes_per_second(&pPAStrm->SampleSpec) * s_pulseCfg.buffer_msecs_in) / 1000;
+    pPAStrm->BufAttr.maxlength   = (pPAStrm->BufAttr.fragsize * 3) / 2;
 
     /* Note: Other members of BufAttr are ignored for record streams. */
-    int rc = paStreamOpen(pThis, true /* fIn */, "PulseAudio (In)", &pStrm->SampleSpec, &pStrm->BufAttr,
-                          &pStrm->pPAStream);
+    int rc = paStreamOpen(pThis, true /* fIn */, "PulseAudio (In)", &pPAStrm->SampleSpec, &pPAStrm->BufAttr,
+                          &pPAStrm->pPAStream);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = paPulseToFmt(pStrm->SampleSpec.format, &pCfgAcq->enmFormat,
+    rc = paPulseToFmt(pPAStrm->SampleSpec.format, &pCfgAcq->enmFormat,
                       &pCfgAcq->enmEndianness);
     if (RT_FAILURE(rc))
     {
-        LogRel(("PulseAudio: Cannot find audio capture format %ld\n", pStrm->SampleSpec.format));
+        LogRel(("PulseAudio: Cannot find audio capture format %ld\n", pPAStrm->SampleSpec.format));
         return rc;
     }
 
-    pCfgAcq->uHz       = pStrm->SampleSpec.rate;
-    pCfgAcq->cChannels = pStrm->SampleSpec.channels;
-
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStream->Props);
+    PDMAUDIOPCMPROPS Props;
+    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
     if (RT_SUCCESS(rc))
     {
-        pCfgAcq->cSamples = RT_MIN(pStrm->BufAttr.fragsize * 10, pStrm->BufAttr.maxlength)
-                            >> pStream->Props.cShift; /** @todo Get rid of using Props! */
-
-        /* Save pointer to driver instance. */
-        pStrm->pDrv       = pThis;
-        pStrm->pu8PeekBuf = NULL;
+        pPAStrm->pDrv       = pThis;
+        pPAStrm->pu8PeekBuf = NULL;
+
+        pCfgAcq->uHz       = pPAStrm->SampleSpec.rate;
+        pCfgAcq->cChannels = pPAStrm->SampleSpec.channels;
+        pCfgAcq->cSamples  = RT_MIN(pPAStrm->BufAttr.fragsize * 10, pPAStrm->BufAttr.maxlength) >> Props.cShift;
     }
 

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -52 +52 @@
     /** Pointer to audio VRDE object. */
     AudioVRDE           *pAudioVRDE;
+    /** Pointer to the driver instance structure. */
     PPDMDRVINS           pDrvIns;
-    /** Pointer to the driver instance structure. */
+    /** Pointer to host audio interface. */
     PDMIHOSTAUDIO        IHostAudio;
     /** Pointer to the VRDP's console object. */
@@ -59 +60 @@
     /** Pointer to the DrvAudio port interface that is above us. */
     PPDMIAUDIOCONNECTOR  pDrvAudio;
-    /** Whether this driver is enabled or not. */
-    bool                 fEnabled;
 } DRVAUDIOVRDE, *PDRVAUDIOVRDE;
 
 typedef struct VRDESTREAMIN
 {
-    /** Associated host input stream.
-     *  Note: Always must come first! */
+    /** Note: Always must come first! */
     PDMAUDIOSTREAM       Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS     Props;
     /** Number of samples captured asynchronously in the
      *  onVRDEInputXXX callbacks. */
@@ -77 +77 @@
 typedef struct VRDESTREAMOUT
 {
-    /** Associated host output stream.
-     *  Note: Always must come first! */
+    /** Note: Always must come first! */
     PDMAUDIOSTREAM       Stream;
+    /** The PCM properties of this stream. */
+    PDMAUDIOPCMPROPS     Props;
     uint64_t             old_ticks;
     uint64_t             cSamplesSentPerSec;
@@ -94 +95 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
-    if (pCfgAcq)
-        pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+    PVRDESTREAMIN pVRDEStrmIn = (PVRDESTREAMIN)pStream;
+    AssertPtrReturn(pVRDEStrmIn, VERR_INVALID_POINTER);
+
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pVRDEStrmIn->Props);
+    if (RT_SUCCESS(rc))
+    {
+        if (pCfgAcq)
+            pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+    }
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -110 +118 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
-    if (pCfgAcq)
-        pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+    PVRDESTREAMOUT pVRDEStrmOut = (PVRDESTREAMOUT)pStream;
+    AssertPtrReturn(pVRDEStrmOut, VERR_INVALID_POINTER);
+
+    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pVRDEStrmOut->Props);
+    if (RT_SUCCESS(rc))
+    {
+        if (pCfgAcq)
+            pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+    }
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -157 +172 @@
     {
         rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, AudioMixBufSize(&pStream->MixBuf),
-                                                           pStream->Props.uHz,
-                                                           pStream->Props.cChannels, pStream->Props.cBits);
+                                                           pVRDEStrmIn->Props.uHz,
+                                                           pVRDEStrmIn->Props.cChannels, pVRDEStrmIn->Props.cBits);
         if (rc == VERR_NOT_SUPPORTED)
         {
@@ -192 +207 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface,
+                                                   PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF2(pvBuf, cbBuf);
@@ -232 +248 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvAudioVRDEStreamPlay(PPDMIHOSTAUDIO pInterface,
+                                                PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     RT_NOREF2(pvBuf, cbBuf);
@@ -250 +267 @@
 
     /* Minimize the rounding error: samples = int((ticks * freq) / ticks_per_second + 0.5). */
-    uint32_t cSamplesPlayed = (int)((2 * ticks * pStream->Props.uHz + ticks_per_second) / ticks_per_second / 2);
+    uint32_t cSamplesPlayed = (int)((2 * ticks * pVRDEStrmOut->Props.uHz + ticks_per_second) / ticks_per_second / 2);
 
     /* Don't play more than available. */
@@ -259 +276 @@
     pVRDEStrmOut->old_ticks = now;
 
-    VRDEAUDIOFORMAT format = VRDE_AUDIO_FMT_MAKE(pStream->Props.uHz,
-                                                 pStream->Props.cChannels,
-                                                 pStream->Props.cBits,
-                                                 pStream->Props.fSigned);
+    VRDEAUDIOFORMAT format = VRDE_AUDIO_FMT_MAKE(pVRDEStrmOut->Props.uHz,
+                                                 pVRDEStrmOut->Props.cChannels,
+                                                 pVRDEStrmOut->Props.cBits,
+                                                 pVRDEStrmOut->Props.fSigned);
 
     int cSamplesToSend = cSamplesPlayed;
 
     LogFlowFunc(("uFreq=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool, enmFormat=%ld, cSamplesToSend=%RU32\n",
-                 pStream->Props.uHz, pStream->Props.cChannels,
-                 pStream->Props.cBits, pStream->Props.fSigned,
+                 pVRDEStrmOut->Props.uHz,   pVRDEStrmOut->Props.cChannels,
+                 pVRDEStrmOut->Props.cBits, pVRDEStrmOut->Props.fSigned,
                  format, cSamplesToSend));
 
@@ -381 +398 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface,
+                                                  PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -419 +437 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                   PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -497 +516 @@
 int AudioVRDE::onVRDEControl(bool fEnable, uint32_t uFlags)
 {
-    RT_NOREF(uFlags);
+    RT_NOREF(fEnable, uFlags);
     LogFlowThisFunc(("fEnable=%RTbool, uFlags=0x%x\n", fEnable, uFlags));
 
     if (mpDrv == NULL)
         return VERR_INVALID_STATE;
-
-    mpDrv->fEnabled = fEnable;
 
     return VINF_SUCCESS; /* Never veto. */
@@ -607 +624 @@
     /* IHostAudio */
     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvAudioVRDE);
-
-    /* Init defaults. */
-    pThis->fEnabled = false;
 
     /*