Changeset 65624 in vbox

Timestamp:

Feb 6, 2017 2:13:36 PM (8 years ago)

Author:

vboxsync

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

113296

Message:

Audio: More abstraction for the backends: Now the backend stream's data is completely separate from the audio connector interface. That way the backends cannot mess with the audio connector's data (e.g. mixing buffers and friends) anymore, and those are forced to use the audio connector API as meant now. Needs more testing, partly work in progress.

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (13 diffs)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/DevHDA.cpp (modified) (15 diffs)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (6 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (7 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (26 diffs)
• src/VBox/Devices/Audio/DrvAudio.h (modified) (3 diffs)
• src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (10 diffs)
• src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (41 diffs)
• src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (25 diffs)
• src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (92 diffs)
• src/VBox/Devices/Audio/DrvHostDebugAudio.cpp (modified) (21 diffs)
• src/VBox/Devices/Audio/DrvHostNullAudio.cpp (modified) (15 diffs)
• src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (40 diffs)
• src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (32 diffs)
• src/VBox/Devices/Audio/DrvHostValidationKit.cpp (modified) (15 diffs)
• src/VBox/Devices/Audio/HDACodec.cpp (modified) (15 diffs)
• src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp (modified) (16 diffs)
• src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (19 diffs)
• src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (21 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -337 +337 @@
 
 /**
+ * Properties of audio streams for host/guest
+ * for in or out directions.
+ */
+typedef struct PDMAUDIOPCMPROPS
+{
+    /** Sample width. Bits per sample. */
+    uint8_t     cBits;
+    /** Signed or unsigned sample. */
+    bool        fSigned;
+    /** Shift count used for faster calculation of various
+     *  values, such as the alignment, bytes to samples and so on.
+     *  Depends on number of stream channels and the stream format
+     *  being used.
+     *
+     ** @todo Use some RTAsmXXX functions instead?
+     */
+    uint8_t     cShift;
+    /** Number of audio channels. */
+    uint8_t     cChannels;
+    /** Sample frequency in Hertz (Hz). */
+    uint32_t    uHz;
+    /** Whether the endianness is swapped or not. */
+    bool        fSwapEndian;
+} PDMAUDIOPCMPROPS, *PPDMAUDIOPCMPROPS;
+
+/** Calculates the cShift value of given samples bits and audio channels.
+ *  Note: Does only support mono/stereo channels for now. */
+#define PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(cBits, cChannels)     ((cChannels == 2) + cBits / 16)
+/** Calculates the cShift value of a PDMAUDIOPCMPROPS structure.
+ *  Note: Does only support mono/stereo channels for now. */
+#define PDMAUDIOPCMPROPS_MAKE_SHIFT(pProps)                     PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS((pProps)->cChannels == 2) + (pProps)->cBits / 16)
+/** Converts (audio) samples to bytes.
+ *  Needs the cShift value set correctly, using PDMAUDIOPCMPROPS_MAKE_SHIFT. */
+#define PDMAUDIOPCMPROPS_S2B(pProps, samples)                   ((samples) << (pProps)->cShift)
+/** Converts bytes to (audio) samples.
+ *  Needs the cShift value set correctly, using PDMAUDIOPCMPROPS_MAKE_SHIFT. */
+#define PDMAUDIOPCMPROPS_B2S(pProps, cb)                        (cb >> (pProps)->cShift)
+
+/**
  * Structure for keeping an audio stream configuration.
  */
@@ -347 +386 @@
     /** Destination / source indicator, depending on enmDir. */
     PDMAUDIODESTSOURCE       DestSource;
-    /** Frequency in Hertz (Hz). */
-    uint32_t                 uHz;
-    /** Number of audio channels (2 for stereo, 1 for mono). */
-    uint8_t                  cChannels;
-    /** Audio format. */
-    PDMAUDIOFMT              enmFormat;
-    /** @todo Use RT_LE2H_*? */
-    PDMAUDIOENDIANNESS       enmEndianness;
+    /** The stream's PCM properties. */
+    PDMAUDIOPCMPROPS         Props;
     /** Hint about the optimal sample buffer size (in audio samples).
      *  0 if no hint is given. */
-    uint32_t                 cSampleBufferSize;
+    uint32_t                 cSampleBufferHint;
 } PDMAUDIOSTREAMCFG, *PPDMAUDIOSTREAMCFG;
+
+/** Converts (audio) samples to bytes. */
+#define PDMAUDIOSTREAMCFG_S2B(pCfg, samples) ((samples) << (pCfg->Props).cShift)
+/** Converts bytes to (audio) samples. */
+#define PDMAUDIOSTREAMCFG_B2S(pCfg, cb)  (cb >> (pCfg->Props).cShift)
 
 #if defined(RT_LITTLE_ENDIAN)
@@ -410 +448 @@
     PDMAUDIOSTREAMCMD_32BIT_HACK = 0x7fffffff
 } PDMAUDIOSTREAMCMD;
-
-/**
- * Properties of audio streams for host/guest
- * for in or out directions.
- */
-typedef struct PDMAUDIOPCMPROPS
-{
-    /** Sample width. Bits per sample. */
-    uint8_t     cBits;
-    /** Signed or unsigned sample. */
-    bool        fSigned;
-    /** Shift count used for faster calculation of various
-     *  values, such as the alignment, bytes to samples and so on.
-     *  Depends on number of stream channels and the stream format
-     *  being used.
-     *
-     ** @todo Use some RTAsmXXX functions instead?
-     */
-    uint8_t     cShift;
-    /** Number of audio channels. */
-    uint8_t     cChannels;
-    /** Alignment mask. */
-    uint32_t    uAlign;
-    /** Sample frequency in Hertz (Hz). */
-    uint32_t    uHz;
-    /** Bitrate (in bytes/s). */
-    uint32_t    cbBitrate;
-    /** Whether the endianness is swapped or not. */
-    bool        fSwapEndian;
-} PDMAUDIOPCMPROPS, *PPDMAUDIOPCMPROPS;
-
-/** Converts (audio) samples to bytes. */
-#define PDMAUDIOPCMPROPS_S2B(pProps, samples) ((samples) << (pProps)->cShift)
-/** Converts bytes to (audio) samples. */
-#define PDMAUDIOPCMPROPS_B2S(pProps, cb)  (cb >> (pProps)->cShift)
 
 /**
@@ -786 +789 @@
         PDMAUDIOSTREAMOUT  Out;
     };
+    /** Data to backend-specific stream data.
+     *  This data block will be casted by the backend to access its backend-dependent data.
+     *
+     *  That way the backends do not have access to the audio connector's data. */
+    void                  *pvBackend;
+    /** Size (in bytes) of the backend-specific stream data. */
+    size_t                 cbBackend;
 } PDMAUDIOSTREAM, *PPDMAUDIOSTREAM;
 
@@ -867 +877 @@
 } PDMAUDIOCALLBACK, *PPDMAUDIOCALLBACK;
 #endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
+
+#define PPDMAUDIOBACKENDSTREAM void *
 
 /**
@@ -1128 +1140 @@
      * @param   pCfgAcq             Pointer to acquired stream configuration.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq));
+    DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq));
 
     /**
@@ -1137 +1149 @@
      * @param   pStream             Pointer to audio stream.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamDestroy, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
+    DECLR3CALLBACKMEMBER(int, pfnStreamDestroy, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
 
     /**
@@ -1147 +1159 @@
      * @param   enmStreamCmd        The stream command to issue.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamControl, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd));
+    DECLR3CALLBACKMEMBER(int, pfnStreamControl, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd));
 
     /**
@@ -1156 +1168 @@
      * @param   pStream             Pointer to audio stream.
      */
-    DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
+    DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
 
     /**
@@ -1165 +1177 @@
      * @param   pStream             Pointer to audio stream.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamIterate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
+    DECLR3CALLBACKMEMBER(int, pfnStreamIterate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
 
     /**
@@ -1177 +1189 @@
      * @param   pcbWritten          Returns number of bytes written.  Optional.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamPlay, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten));
+    DECLR3CALLBACKMEMBER(int, pfnStreamPlay, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten));
 
     /**
@@ -1189 +1201 @@
      * @param   pcbRead             Returns number of bytes read.  Optional.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStreamCapture, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead));
+    DECLR3CALLBACKMEMBER(int, pfnStreamCapture, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead));
 
 } PDMIHOSTAUDIO;
 
 /** PDMIHOSTAUDIO interface ID. */
-#define PDMIHOSTAUDIO_IID                           "C45550DE-03C0-4A45-9A96-C5EB956F806D"
+#define PDMIHOSTAUDIO_IID                           "1F1C3DEB-AEA3-4E32-8405-EC7E7661E888"
 
 /** @} */

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

@@ -30 +30 @@
 
 /*
- * Copyright (C) 2014-2016 Oracle Corporation
+ * Copyright (C) 2014-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -600 +600 @@
         return rc;
 
-    LogFlowFunc(("[%s]: fFlags=0x%x (enmDir=%d, %s, %RU8 channels, %RU32Hz)\n",
-                 pSink->pszName, fFlags, pCfg->enmDir, DrvAudioHlpAudFmtToStr(pCfg->enmFormat), pCfg->cChannels, pCfg->uHz));
+    LogFlowFunc(("[%s]: fFlags=0x%x (enmDir=%ld, %RU8 bits, %RU8 channels, %RU32Hz)\n",
+                 pSink->pszName, fFlags, pCfg->enmDir, pCfg->Props.cBits, pCfg->Props.cChannels, pCfg->Props.uHz));
 
     /*
@@ -839 +839 @@
     uint64_t tsDeltaMS  = RTTimeMilliTS() - pSink->tsLastUpdatedMS;
 
-    cbReadable = (pSink->PCMProps.cbBitrate / 1000 /* s to ms */) * tsDeltaMS;
+    cbReadable = ((DrvAudioHlpCalcBitrate(&pSink->PCMProps) / 8) / 1000 /* s to ms */) * tsDeltaMS;
 
     Log3Func(("[%s] Bitrate is %RU32 bytes/s -> %RU64ms / %RU32 bytes elapsed\n",
-              pSink->pszName, pSink->PCMProps.cbBitrate, tsDeltaMS, cbReadable));
+              pSink->pszName, DrvAudioHlpCalcBitrate(&pSink->PCMProps) / 8, tsDeltaMS, cbReadable));
 #endif
 
@@ -890 +890 @@
         uint64_t tsDeltaMS  = RTTimeMilliTS() - pSink->tsLastUpdatedMS;
 
-        cbWritable = (pSink->PCMProps.cbBitrate / 1000 /* s to ms */) * tsDeltaMS;
+        cbWritable = ((DrvAudioHlpCalcBitrate(&pSink->PCMProps) / 8) / 1000 /* s to ms */) * tsDeltaMS;
 
         Log3Func(("[%s] Bitrate is %RU32 bytes/s -> %RU64ms / %RU32 bytes elapsed\n",
-                  pSink->pszName, pSink->PCMProps.cbBitrate, tsDeltaMS, cbWritable));
+                  pSink->pszName, DrvAudioHlpCalcBitrate(&pSink->PCMProps) / 8, tsDeltaMS, cbWritable));
 #endif
     }

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

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2647 +2647 @@
     }
 
-    PDMAUDIOFMT enmFmt;
+    uint8_t cBits = 0;
     switch (EXTRACT_VALUE(u32SDFMT, HDA_SDFMT_BITS_MASK, HDA_SDFMT_BITS_SHIFT))
     {
         case 0:
-            enmFmt = PDMAUDIOFMT_S8;
+            cBits = 8;
             break;
         case 1:
-            enmFmt = PDMAUDIOFMT_S16;
+            cBits = 16;
             break;
         case 4:
-            enmFmt = PDMAUDIOFMT_S32;
+            cBits = 32;
             break;
         default:
             AssertMsgFailed(("Unsupported bits per sample %x\n",
                              EXTRACT_VALUE(u32SDFMT, HDA_SDFMT_BITS_MASK, HDA_SDFMT_BITS_SHIFT)));
-            enmFmt = PDMAUDIOFMT_INVALID;
             rc = VERR_NOT_SUPPORTED;
             break;
@@ -2669 +2668 @@
     if (RT_SUCCESS(rc))
     {
-        pStrmCfg->uHz           = u32Hz * u32HzMult / u32HzDiv;
-        pStrmCfg->cChannels     = (u32SDFMT & 0xf) + 1;
-        pStrmCfg->enmFormat     = enmFmt;
-        pStrmCfg->enmEndianness = PDMAUDIOHOSTENDIANNESS;
+        RT_ZERO(pStrmCfg->Props);
+
+        pStrmCfg->Props.uHz       = u32Hz * u32HzMult / u32HzDiv;
+        pStrmCfg->Props.cChannels = (u32SDFMT & 0xf) + 1;
+        pStrmCfg->Props.cBits     = cBits;
+        pStrmCfg->Props.fSigned   = true;
     }
 
@@ -2740 +2741 @@
 #else /* !VBOX_WITH_AUDIO_HDA_51_SURROUND */
     /* Only support mono or stereo channels. */
-    if (   pCfg->cChannels != 1 /* Mono */
-        && pCfg->cChannels != 2 /* Stereo */)
+    if (   pCfg->Props.cChannels != 1 /* Mono */
+        && pCfg->Props.cChannels != 2 /* Stereo */)
     {
         rc = VERR_NOT_SUPPORTED;
@@ -2749 +2750 @@
     if (rc == VERR_NOT_SUPPORTED)
     {
-        LogRel(("HDA: Unsupported channel count (%RU8), falling back to stereo channels\n", pCfg->cChannels));
-        pCfg->cChannels = 2;
+        LogRel(("HDA: Unsupported channel count (%RU8), falling back to stereo channels\n", pCfg->Props.cChannels));
+        pCfg->Props.cChannels = 2;
 
         rc = VINF_SUCCESS;
@@ -2764 +2765 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Front");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-            pCfg->cChannels       = 2;
+            pCfg->Props.cChannels = 2;
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_FRONT);
@@ -2777 +2778 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Center/LFE");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_CENTER_LFE;
-            pCfg->cChannels       = (fUseCenter && fUseLFE) ? 2 : 1;
+            pCfg->Props.cChannels = (fUseCenter && fUseLFE) ? 2 : 1;
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_CENTER_LFE);
@@ -2789 +2790 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Rear");
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_REAR;
-            pCfg->cChannels       = 2;
+            pCfg->Props.cChannels = 2;
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_REAR);
@@ -2860 +2861 @@
     }
 
-    LogFunc(("[SD%RU8]: Hz=%RU32, Channels=%RU8, enmFmt=%RU32\n",
-             pStream->u8SD, strmCfg.uHz, strmCfg.cChannels, strmCfg.enmFormat));
+    LogFunc(("[SD%RU8]: Hz=%RU32, Channels=%RU8, cBits=%RU8\n",
+             pStream->u8SD, strmCfg.Props.uHz, strmCfg.Props.cChannels, strmCfg.Props.cBits));
 
     /* Set audio direction. */
@@ -3297 +3298 @@
     AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
-    AssertReturn(pCfg->cChannels, VERR_INVALID_PARAMETER);
+    AssertReturn(pCfg->Props.cChannels, VERR_INVALID_PARAMETER);
 
     hdaStreamMapReset(pMapping);
 
-    pMapping->paChannels = (PPDMAUDIOSTREAMCHANNEL)RTMemAlloc(sizeof(PDMAUDIOSTREAMCHANNEL) * pCfg->cChannels);
+    pMapping->paChannels = (PPDMAUDIOSTREAMCHANNEL)RTMemAlloc(sizeof(PDMAUDIOSTREAMCHANNEL) * pCfg->Props.cChannels);
     if (!pMapping->paChannels)
         return VERR_NO_MEMORY;
 
-    PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfg, &Props);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    Assert(RT_IS_POWER_OF_TWO(Props.cBits));
+    if (!DrvAudioHlpStreamCfgIsValid(pCfg))
+        return VERR_INVALID_PARAMETER;
+
+    int rc = VINF_SUCCESS;
+
+    Assert(RT_IS_POWER_OF_TWO(pCfg->Props.cBits));
 
     /** @todo We assume all channels in a stream have the same format. */
     PPDMAUDIOSTREAMCHANNEL pChan = pMapping->paChannels;
-    for (uint8_t i = 0; i < pCfg->cChannels; i++)
+    for (uint8_t i = 0; i < pCfg->Props.cChannels; i++)
     {
         pChan->uChannel = i;
-        pChan->cbStep   = (Props.cBits / 2);
-        pChan->cbFrame  = pChan->cbStep * pCfg->cChannels;
+        pChan->cbStep   = (pCfg->Props.cBits / 2);
+        pChan->cbFrame  = pChan->cbStep * pCfg->Props.cChannels;
         pChan->cbFirst  = i * pChan->cbStep;
         pChan->cbOff    = pChan->cbFirst;
@@ -3341 +3342 @@
     if (RT_SUCCESS(rc))
     {
-        pMapping->cChannels = pCfg->cChannels;
+        pMapping->cChannels = pCfg->Props.cChannels;
 #ifdef VBOX_WITH_HDA_AUDIO_INTERLEAVING_STREAMS_SUPPORT
         pMapping->enmLayout = PDMAUDIOSTREAMLAYOUT_INTERLEAVED;
@@ -3527 +3528 @@
     LogFunc(("Sink=%s, Stream=%s\n", pSink->pMixSink->pszName, pCfg->szName));
 
-    /* Update the sink's format. */
-    PDMAUDIOPCMPROPS PCMProps;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfg, &PCMProps);
-    if (RT_SUCCESS(rc))
-        rc = AudioMixerSinkSetFormat(pSink->pMixSink, &PCMProps);
-
+    if (!DrvAudioHlpStreamCfgIsValid(pCfg))
+        return VERR_INVALID_PARAMETER;
+
+    int rc = AudioMixerSinkSetFormat(pSink->pMixSink, &pCfg->Props);
     if (RT_FAILURE(rc))
         return rc;
@@ -3542 +3541 @@
         PHDADRIVERSTREAM pDrvStream = NULL;
 
-        PPDMAUDIOSTREAMCFG pStreamCfg = (PPDMAUDIOSTREAMCFG)RTMemDup(pCfg, sizeof(PDMAUDIOSTREAMCFG));
+        PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
         if (!pStreamCfg)
         {
@@ -4698 +4697 @@
             }
 
-#ifdef DEBUG_andy
             AssertMsg(cbDMALeft == 0, ("%RU32 bytes of DMA data left, CircBuf=%zu/%zu\n",
                                        cbDMALeft, RTCircBufUsed(pCircBuf), RTCircBufSize(pCircBuf)));
-#endif
+
             /*
              * Process backends.
@@ -4782 +4780 @@
             AssertFailed();
 
-        if (++cTransfers > 32) /* Failsafe counter. */
+        if (++cTransfers == UINT8_MAX) /* Failsafe counter. */
             fDone = true;
 
     } /* while !fDone */
+
+#ifdef VBOX_STRICT
+    AssertMsg(cTransfers < UINT8_MAX, ("HDA: Update for SD#%RU8 ran for too long\n", pStream->u8SD));
+#endif
 
     Log2Func(("[SD%RU8] End\n", pStream->u8SD));

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

@@ -1475 +1475 @@
     AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
-    /* Update the sink's format. */
-    PDMAUDIOPCMPROPS PCMProps;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfg, &PCMProps);
-    if (RT_SUCCESS(rc))
-        rc = AudioMixerSinkSetFormat(pMixSink, &PCMProps);
-
+    if (!DrvAudioHlpStreamCfgIsValid(pCfg))
+        return VERR_INVALID_PARAMETER;
+
+    int rc = AudioMixerSinkSetFormat(pMixSink, &pCfg->Props);
     if (RT_FAILURE(rc))
         return rc;
@@ -1487 +1485 @@
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
-        PPDMAUDIOSTREAMCFG pStreamCfg = (PPDMAUDIOSTREAMCFG)RTMemDup(pCfg, sizeof(PDMAUDIOSTREAMCFG));
+        PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
         if (!pStreamCfg)
         {
@@ -1593 +1591 @@
         case AC97SOUNDSOURCE_PI_INDEX:
         {
-            streamCfg.uHz               = ichac97MixerGet(pThis, AC97_PCM_LR_ADC_Rate);
+            streamCfg.Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_LR_ADC_Rate);
             streamCfg.enmDir            = PDMAUDIODIR_IN;
             streamCfg.DestSource.Source = PDMAUDIORECSOURCE_LINE;
@@ -1605 +1603 @@
         case AC97SOUNDSOURCE_MC_INDEX:
         {
-            streamCfg.uHz               = ichac97MixerGet(pThis, AC97_MIC_ADC_Rate);
+            streamCfg.Props.uHz         = ichac97MixerGet(pThis, AC97_MIC_ADC_Rate);
             streamCfg.enmDir            = PDMAUDIODIR_IN;
             streamCfg.DestSource.Source = PDMAUDIORECSOURCE_MIC;
@@ -1617 +1615 @@
         case AC97SOUNDSOURCE_PO_INDEX:
         {
-            streamCfg.uHz               = ichac97MixerGet(pThis, AC97_PCM_Front_DAC_Rate);
+            streamCfg.Props.uHz         = ichac97MixerGet(pThis, AC97_PCM_Front_DAC_Rate);
             streamCfg.enmDir            = PDMAUDIODIR_OUT;
             streamCfg.DestSource.Dest   = PDMAUDIOPLAYBACKDEST_FRONT;
@@ -1636 +1634 @@
         ichac97MixerRemoveDrvStreams(pThis, pMixSink, streamCfg.enmDir, streamCfg.DestSource);
 
-        if (streamCfg.uHz)
+        if (streamCfg.Props.uHz)
         {
             Assert(streamCfg.enmDir != PDMAUDIODIR_UNKNOWN);
 
-            streamCfg.cChannels     = 2;
-            streamCfg.enmFormat     = PDMAUDIOFMT_S16;
-            streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
+            streamCfg.Props.cChannels = 2;
+            streamCfg.Props.cBits     = 16;
+            streamCfg.Props.fSigned   = true;
 
             rc = ichac97MixerAddDrvStreams(pThis, pMixSink, &streamCfg);

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

@@ -492 +492 @@
         PDMAUDIOSTREAMCFG streamCfg;
         RT_ZERO(streamCfg);
+
         streamCfg.enmDir          = PDMAUDIODIR_OUT;
         streamCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-        streamCfg.uHz             = pThis->freq;
-        streamCfg.cChannels       = 1 << pThis->fmt_stereo;
-        streamCfg.enmFormat       = pThis->fmt;
-        streamCfg.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
+
+        streamCfg.Props.uHz             = pThis->freq;
+        streamCfg.Props.cChannels       = 1 << pThis->fmt_stereo;
+        streamCfg.Props.cBits           = pThis->fmt_bits;
+        streamCfg.Props.fSigned         = RT_BOOL(pThis->fmt_signed);
 
         int rc = sb16OpenOut(pThis, &streamCfg);
@@ -630 +632 @@
         PDMAUDIOSTREAMCFG streamCfg;
         RT_ZERO(streamCfg);
+
         streamCfg.enmDir          = PDMAUDIODIR_OUT;
         streamCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-        streamCfg.uHz             = pThis->freq;
-        streamCfg.cChannels       = 1 << pThis->fmt_stereo;
-        streamCfg.enmFormat       = pThis->fmt;
-        streamCfg.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
+
+        streamCfg.Props.uHz       = pThis->freq;
+        streamCfg.Props.cChannels = 1 << pThis->fmt_stereo;
+        streamCfg.Props.cBits     = pThis->fmt_bits;
+        streamCfg.Props.fSigned   = RT_BOOL(pThis->fmt_signed);
 
         int rc = sb16OpenOut(pThis, &streamCfg);
@@ -1163 +1167 @@
     PDMAUDIOSTREAMCFG streamCfg;
     RT_ZERO(streamCfg);
+
     streamCfg.enmDir          = PDMAUDIODIR_OUT;
     streamCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-    streamCfg.uHz             = pThis->freq;
-    streamCfg.cChannels       = 1; /* Mono */
-    streamCfg.enmFormat       = PDMAUDIOFMT_U8;
-    streamCfg.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
+
+    streamCfg.Props.uHz       = pThis->freq;
+    streamCfg.Props.cChannels = 1; /* Mono */
+    streamCfg.Props.cBits     = 8;
+    streamCfg.Props.fSigned   = false;
 
     int rc2 = sb16OpenOut(pThis, &streamCfg);
@@ -1826 +1832 @@
              * so check if all streams have the same configuration.
              */
-            AssertMsg(pStream->Cfg.uHz       == pStreamPrev->Cfg.uHz,
-                      ("%RU32Hz vs. %RU32Hz\n", pStream->Cfg.uHz, pStreamPrev->Cfg.uHz));
-            AssertMsg(pStream->Cfg.cChannels == pStreamPrev->Cfg.cChannels,
-                      ("%RU8 vs. %RU8 channels\n", pStream->Cfg.cChannels, pStreamPrev->Cfg.cChannels));
-            AssertMsg(pStream->Cfg.enmFormat == pStreamPrev->Cfg.enmFormat,
-                      ("%d vs. %d format\n", pStream->Cfg.enmFormat, pStreamPrev->Cfg.enmFormat));
+            AssertMsg(pStream->Cfg.Props.uHz       == pStreamPrev->Cfg.Props.uHz,
+                      ("%RU32Hz vs. %RU32Hz\n", pStream->Cfg.Props.uHz, pStreamPrev->Cfg.Props.uHz));
+            AssertMsg(pStream->Cfg.Props.cChannels == pStreamPrev->Cfg.Props.cChannels,
+                      ("%RU8 vs. %RU8 channels\n", pStream->Cfg.Props.cChannels, pStreamPrev->Cfg.Props.cChannels));
+            AssertMsg(pStream->Cfg.Props.cBits     == pStreamPrev->Cfg.Props.cBits,
+                      ("%d vs. %d bits\n", pStream->Cfg.Props.cBits, pStreamPrev->Cfg.Props.cBits));
+            AssertMsg(pStream->Cfg.Props.fSigned   == pStreamPrev->Cfg.Props.fSigned,
+                      ("%RTbool vs. %RTbool signed\n", pStream->Cfg.Props.fSigned, pStreamPrev->Cfg.Props.fSigned));
         }
 #endif
@@ -2016 +2024 @@
             PDMAUDIOSTREAMCFG streamCfg;
             RT_ZERO(streamCfg);
+
             streamCfg.enmDir          = PDMAUDIODIR_OUT;
             streamCfg.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-            streamCfg.uHz             = pThis->freq;
-            streamCfg.cChannels       = 1 << pThis->fmt_stereo;
-            streamCfg.enmFormat       = pThis->fmt;
-            streamCfg.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
+
+            streamCfg.Props.uHz             = pThis->freq;
+            streamCfg.Props.cChannels       = 1 << pThis->fmt_stereo;
+            streamCfg.Props.cBits           = pThis->fmt_bits;
+            streamCfg.Props.fSigned         = RT_BOOL(pThis->fmt_signed);
 
             int rc = sb16OpenOut(pThis, &streamCfg);
@@ -2117 +2127 @@
     /* Set a default audio format for the host. */
     PDMAUDIOSTREAMCFG CfgHost;
+    RT_ZERO(CfgHost);
+
     CfgHost.enmDir          = PDMAUDIODIR_OUT;
     CfgHost.DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
-    CfgHost.uHz             = pCfg->uHz;
-    CfgHost.cChannels       = pCfg->cChannels;
-    CfgHost.enmFormat       = PDMAUDIOFMT_S16;
-    CfgHost.enmEndianness   = PDMAUDIOHOSTENDIANNESS;
+
+    CfgHost.Props.uHz       = pCfg->Props.uHz;
+    CfgHost.Props.cChannels = pCfg->Props.cChannels;
+    CfgHost.Props.cBits     = pCfg->Props.cBits;
+    CfgHost.Props.fSigned   = pCfg->Props.fSigned;
 
     RTStrPrintf(CfgHost.szName, sizeof(CfgHost.szName), "sb16.po");
@@ -2134 +2147 @@
     {
         if (!RTStrPrintf(pCfg->szName, sizeof(pCfg->szName), "[LUN#%RU8] %s (%RU32Hz, %RU8 %s)",
-                         pDrv->uLUN, CfgHost.szName, pCfg->uHz, pCfg->cChannels, pCfg->cChannels > 1 ? "Channels" : "Channel"))
+                         pDrv->uLUN, CfgHost.szName,
+                         pCfg->Props.uHz, pCfg->Props.cChannels, pCfg->Props.cChannels > 1 ? "Channels" : "Channel"))
         {
             rc = VERR_BUFFER_OVERFLOW;

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -50 +50 @@
 static int drvAudioStreamCreateInternalBackend(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
 static int drvAudioStreamDestroyInternalBackend(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream);
+static void drvAudioStreamFree(PPDMAUDIOSTREAM pStream);
 static int drvAudioStreamUninitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
 static int drvAudioStreamInitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest);
@@ -499 +500 @@
             {
                 LogRel2(("Audio: Enabling stream '%s'\n", pHstStream->szName));
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream, PDMAUDIOSTREAMCMD_ENABLE);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                            PDMAUDIOSTREAMCMD_ENABLE);
                 if (RT_SUCCESS(rc))
                 {
@@ -515 +517 @@
             {
                 LogRel2(("Audio: Disabling stream '%s'\n", pHstStream->szName));
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                            PDMAUDIOSTREAMCMD_DISABLE);
                 if (RT_SUCCESS(rc))
                 {
@@ -537 +540 @@
             {
                 LogRel2(("Audio: Pausing stream '%s'\n", pHstStream->szName));
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream, PDMAUDIOSTREAMCMD_PAUSE);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                            PDMAUDIOSTREAMCMD_PAUSE);
                 if (RT_SUCCESS(rc))
                 {
@@ -557 +561 @@
             {
                 LogRel2(("Audio: Resuming stream '%s'\n", pHstStream->szName));
-                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream, PDMAUDIOSTREAMCMD_RESUME);
+                rc = pThis->pHostDrvAudio->pfnStreamControl(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                            PDMAUDIOSTREAMCMD_RESUME);
                 if (RT_SUCCESS(rc))
                 {
@@ -632 +637 @@
 
     /* No sample buffer size hint given by the backend? Default to some sane value. */
-    if (!CfgHostAcq.cSampleBufferSize)
-    {
-        CfgHostAcq.cSampleBufferSize = _1K; /** @todo Make this configurable? */
-    }
-
-    PDMAUDIOPCMPROPS PCMProps;
-    int rc2 = DrvAudioHlpStreamCfgToProps(&CfgHostAcq, &PCMProps);
-    AssertRC(rc2);
+    if (!CfgHostAcq.cSampleBufferHint)
+    {
+        CfgHostAcq.cSampleBufferHint = _1K; /** @todo Make this configurable? */
+    }
 
     /* Destroy any former mixing buffer. */
     AudioMixBufDestroy(&pHstStream->MixBuf);
 
-    CfgHostAcq.cSampleBufferSize *= 10; /** @todo Make this configurable. */
-
-    LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSampleBufferSize));
-
-    rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize);
+    /* Make sure to (re-)set the host buffer's shift size. */
+    CfgHostAcq.Props.cShift = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(CfgHostAcq.Props.cBits, CfgHostAcq.Props.cChannels);
+
+    /* Set set host buffer size multiplicator. */
+    const unsigned cSampleBufferHostFactor = 10; /** @todo Make this configurable. */
+
+    LogFlowFunc(("[%s] cSamples=%RU32 (x %u)\n", pHstStream->szName, CfgHostAcq.cSampleBufferHint, cSampleBufferHostFactor));
+
+    int rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &CfgHostAcq.Props,
+                              CfgHostAcq.cSampleBufferHint * cSampleBufferHostFactor);
     AssertRC(rc2);
 
-    /* Make a copy of the host stream configuration. */
-    memcpy(&pHstStream->Cfg, pCfgHost, sizeof(PDMAUDIOSTREAMCFG));
+    /* Make a copy of the acquired host stream configuration. */
+    rc2 = DrvAudioHlpStreamCfgCopy(&pHstStream->Cfg, pCfgHost);
+    AssertRC(rc2);
 
     /*
@@ -658 +665 @@
      */
 
-    RT_ZERO(PCMProps);
-    rc2 = DrvAudioHlpStreamCfgToProps(pCfgGuest, &PCMProps);
-    AssertRC(rc2);
-
     /* Destroy any former mixing buffer. */
     AudioMixBufDestroy(&pGstStream->MixBuf);
 
-    CfgHostAcq.cSampleBufferSize *= 20; /** @todo Make this configurable. */
-
-    LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSampleBufferSize));
-
-    rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize);
+    /* Make sure to (re-)set the guest buffer's shift size. */
+    pCfgGuest->Props.cShift = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgGuest->Props.cBits, pCfgGuest->Props.cChannels);
+
+    /* Set set guest buffer size multiplicator. */
+    const unsigned cSampleBufferGuestFactor = 10; /** @todo Make this configurable. */
+
+    LogFlowFunc(("[%s] cSamples=%RU32 (x %u)\n", pGstStream->szName, CfgHostAcq.cSampleBufferHint));
+
+    rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &pCfgGuest->Props,
+                          CfgHostAcq.cSampleBufferHint * cSampleBufferGuestFactor);
     AssertRC(rc2);
 
@@ -685 +693 @@
     }
 
-    /* Make a copy of the host stream configuration. */
-    memcpy(&pGstStream->Cfg, pCfgGuest, sizeof(PDMAUDIOSTREAMCFG));
+    /* Make a copy of the guest stream configuration. */
+    rc2 = DrvAudioHlpStreamCfgCopy(&pGstStream->Cfg, pCfgGuest);
+    AssertRC(rc2);
 
     if (RT_FAILURE(rc))
@@ -693 +702 @@
     LogFlowFunc(("[%s] Returning %Rrc\n", pStream->szName, rc));
     return rc;
+}
+
+/**
+ * Frees an audio stream and its allocated resources.
+ *
+ * @param   pStream             Audio stream to free.
+ *                              After this call the pointer will not be valid anymore.
+ */
+static void drvAudioStreamFree(PPDMAUDIOSTREAM pStream)
+{
+    if (!pStream)
+        return;
+
+    if (pStream->pvBackend)
+    {
+        Assert(pStream->cbBackend);
+        RTMemFree(pStream->pvBackend);
+        pStream->pvBackend = NULL;
+    }
+
+    RTMemFree(pStream);
+    pStream = NULL;
 }
 
@@ -1108 +1139 @@
         uint32_t csMixed = 0;
 
-        rc = pThis->pHostDrvAudio->pfnStreamIterate(pThis->pHostDrvAudio, pHstStream);
+        rc = pThis->pHostDrvAudio->pfnStreamIterate(pThis->pHostDrvAudio, pHstStream->pvBackend);
         if (RT_FAILURE(rc))
             break;
@@ -1262 +1293 @@
         uint32_t csLive = AudioMixBufUsed(&pHstStream->MixBuf);
 
-        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
+        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
 
 #ifdef LOG_ENABLED
@@ -1274 +1305 @@
             && (stsBackend & PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE))
         {
-            uint8_t u8Buf[_1K];
+            uint8_t u8Buf[_4K]; /** @todo Get rid of this here. */
 
             uint32_t cRead = 0;
@@ -1284 +1315 @@
 
             AssertPtr(pThis->pHostDrvAudio->pfnStreamPlay);
-            rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream, u8Buf, cbBuf, &cbPlayed);
+            rc = pThis->pHostDrvAudio->pfnStreamPlay(pThis->pHostDrvAudio, pHstStream->pvBackend, u8Buf, cbBuf, &cbPlayed);
             if (RT_SUCCESS(rc))
             {
+                AssertMsg(cbPlayed % 2 == 0,
+                          ("Backend for stream '%s' returned uneven played bytes count (%RU32)\n", pHstStream->szName, cbPlayed));
+
                 csPlayed = AUDIOMIXBUF_B2S(&pHstStream->MixBuf, cbPlayed);
 
@@ -1377 +1411 @@
 
         AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
-        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
+        PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
 
         uint32_t csLive = AudioMixBufLive(&pGstStream->MixBuf);
@@ -1388 +1422 @@
                 uint32_t cbCaptured;
 
-                rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pHstStream, auBuf, sizeof(auBuf), &cbCaptured);
+                rc = pThis->pHostDrvAudio->pfnStreamCapture(pThis->pHostDrvAudio, pHstStream->pvBackend,
+                                                            auBuf, sizeof(auBuf), &cbCaptured);
                 if (RT_FAILURE(rc))
                 {
@@ -1963 +1998 @@
         }
 
-        /* Note: cbHstStrm will contain sizeof(PDMAUDIOSTREAM) + additional data
-         *       which the host backend will need. */
-        size_t cbHstStrm;
+        /* Note: cbHstStrm will contain the size of the data the backend needs to operate on. */
+        size_t cbHstStrm = 0;
         if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
@@ -1971 +2005 @@
                 LogFunc(("Warning: No more input streams free to use\n"));
 
-            /* Validate backend configuration. */
-            if (!pThis->BackendCfg.cbStreamIn)
-            {
-                LogFunc(("Backend input configuration not valid, bailing out\n"));
-                RC_BREAK(VERR_INVALID_PARAMETER);
-            }
-
             cbHstStrm = pThis->BackendCfg.cbStreamIn;
         }
@@ -1988 +2015 @@
             }
 
-            /* Validate backend configuration. */
-            if (!pThis->BackendCfg.cbStreamOut)
-            {
-                LogFlowFunc(("Backend output configuration invalid, bailing out\n"));
-                RC_BREAK(VERR_INVALID_PARAMETER);
-            }
-
             cbHstStrm = pThis->BackendCfg.cbStreamOut;
         }
 
-        pHstStrm = (PPDMAUDIOSTREAM)RTMemAllocZ(cbHstStrm);
+        pHstStrm = (PPDMAUDIOSTREAM)RTMemAllocZ(sizeof(PDMAUDIOSTREAM));
         AssertPtrBreakStmt(pHstStrm, rc = VERR_NO_MEMORY);
+
+        if (cbHstStrm) /* High unlikely that backends do not have an own space for data, but better check. */
+        {
+            pHstStrm->pvBackend = RTMemAllocZ(cbHstStrm);
+            AssertPtrBreakStmt(pHstStrm->pvBackend, rc = VERR_NO_MEMORY);
+
+            pHstStrm->cbBackend = cbHstStrm;
+        }
 
         pHstStrm->enmCtx = PDMAUDIOSTREAMCTX_HOST;
@@ -2093 +2121 @@
             if (RT_SUCCESS(rc2))
             {
-                RTMemFree(pHstStrm);
+                drvAudioStreamFree(pHstStrm);
                 pHstStrm = NULL;
             }
@@ -2381 +2409 @@
                 RTListNodeRemove(&pHstStream->Node);
 
-                RTMemFree(pHstStream);
+                drvAudioStreamFree(pHstStream);
                 pHstStream = NULL;
             }
@@ -2463 +2491 @@
               ("Stream '%s' already initialized in backend\n", pHstStream->szName));
 
-    PDMAUDIOSTREAMCFG CfgAcq;
-
     /* Make the acquired host configuration the requested host configuration initially,
      * in case the backend does not report back an acquired configuration. */
-    memcpy(&CfgAcq, pCfgReq, sizeof(PDMAUDIOSTREAMCFG));
-
-    int rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pHstStream, pCfgReq, &CfgAcq);
+    PDMAUDIOSTREAMCFG CfgAcq;
+    int rc = DrvAudioHlpStreamCfgCopy(&CfgAcq, pCfgReq);
+    if (RT_FAILURE(rc))
+    {
+        LogRel2(("Audio: Creating stream '%s' with an invalid backend configuration not possible, skipping\n",
+                 pHstStream->szName));
+        return rc;
+    }
+
+    rc = pThis->pHostDrvAudio->pfnStreamCreate(pThis->pHostDrvAudio, pHstStream->pvBackend, pCfgReq, &CfgAcq);
     if (RT_FAILURE(rc))
     {
@@ -2479 +2512 @@
     if (!DrvAudioHlpStreamCfgIsValid(&CfgAcq))
     {
-        LogRel2(("Audio: Creating stream '%s' has an invalid configuration, skipping\n", pHstStream->szName));
+        LogRel2(("Audio: Creating stream '%s' returned an invalid backend configuration, skipping\n", pHstStream->szName));
         return VERR_INVALID_PARAMETER;
     }
@@ -2489 +2522 @@
 
     if (pCfgAcq)
-        memcpy(pCfgAcq, &CfgAcq, sizeof(PDMAUDIOSTREAMCFG));
+    {
+        int rc2 = DrvAudioHlpStreamCfgCopy(pCfgAcq, &CfgAcq);
+        AssertRC(rc2);
+    }
 
     return VINF_SUCCESS;
@@ -2522 +2558 @@
          * It can be NULL if we were called in drvAudioDestruct, for example. */
         if (pThis->pHostDrvAudio)
-            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pHstStream);
+            rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pHstStream->pvBackend);
         if (RT_SUCCESS(rc))
         {
@@ -2783 +2819 @@
             RTListNodeRemove(&pStream->Node);
 
-            RTMemFree(pStream);
+            drvAudioStreamFree(pStream);
             pStream = NULL;
         }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -155 +155 @@
 void DrvAudioHlpClearBuf(PPDMAUDIOPCMPROPS pPCMInfo, void *pvBuf, size_t cbBuf, uint32_t cSamples);
 uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels);
-uint32_t DrvAudioHlpCalcBitrate(PPDMAUDIOSTREAMCFG pCfg);
+uint32_t DrvAudioHlpCalcBitrate(PPDMAUDIOPCMPROPS pProps);
 bool DrvAudioHlpPCMPropsAreEqual(PPDMAUDIOPCMPROPS pPCMProps1, PPDMAUDIOPCMPROPS pPCMProps2);
 bool DrvAudioHlpPCMPropsAreEqual(PPDMAUDIOPCMPROPS pPCMProps, PPDMAUDIOSTREAMCFG pCfg);
@@ -161 +161 @@
 const char *DrvAudioHlpRecSrcToStr(PDMAUDIORECSOURCE enmRecSource);
 void DrvAudioHlpStreamCfgPrint(PPDMAUDIOSTREAMCFG pCfg);
-bool DrvAudioHlpStreamCfgIsValid(PPDMAUDIOSTREAMCFG pCfg);
-int DrvAudioHlpStreamCfgToProps(PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOPCMPROPS pProps);
+bool DrvAudioHlpStreamCfgIsValid(const PPDMAUDIOSTREAMCFG pCfg);
+int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, const PPDMAUDIOSTREAMCFG pSrcCfg);
+PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(const PPDMAUDIOSTREAMCFG pCfg);
+void DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg);
 const char *DrvAudioHlpStreamCmdToStr(PDMAUDIOSTREAMCMD enmCmd);
 PDMAUDIOFMT DrvAudioHlpStrToAudFmt(const char *pszFmt);

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

@@ -156 +156 @@
         cbToClear = cbBuf;
 
-    Log2Func(("pPCMInfo=%p, pvBuf=%p, cSamples=%RU32, fSigned=%RTbool, cBits=%RU8, cShift=%RU8\n",
-              pPCMProps, pvBuf, cSamples, pPCMProps->fSigned, pPCMProps->cBits, pPCMProps->cShift));
+    Log2Func(("pPCMProps=%p, pvBuf=%p, cSamples=%RU32, fSigned=%RTbool, cBits=%RU8\n",
+              pPCMProps, pvBuf, cSamples, pPCMProps->fSigned, pPCMProps->cBits));
 
     if (pPCMProps->fSigned)
@@ -761 +761 @@
 
 /**
+ * Checks whether two given PCM properties are equal.
+ *
+ * @returns @c true if equal, @c false if not.
+ * @param   pProps1             First properties to compare.
+ * @param   pProps2             Second properties to compare.
+ */
+bool DrvAudioHlpPCMPropsAreEqual(PPDMAUDIOPCMPROPS pProps1, PPDMAUDIOPCMPROPS pProps2)
+{
+    AssertPtrReturn(pProps1, false);
+    AssertPtrReturn(pProps2, false);
+
+    if (pProps1 == pProps2) /* If the pointers match, take a shortcut. */
+        return true;
+
+    return    pProps1->uHz         == pProps2->uHz
+           && pProps1->cChannels   == pProps2->cChannels
+           && pProps1->cBits       == pProps2->cBits
+           && pProps1->fSigned     == pProps2->fSigned
+           && pProps1->fSwapEndian == pProps2->fSwapEndian;
+}
+
+/**
  * Checks whether the given PCM properties are equal with the given
  * stream configuration.
@@ -773 +795 @@
     AssertPtrReturn(pCfg,   false);
 
-    int cBits = 8;
-    bool fSigned = false;
-
-    switch (pCfg->enmFormat)
-    {
-        case PDMAUDIOFMT_S8:
-            fSigned = true;
-        case PDMAUDIOFMT_U8:
-            break;
-
-        case PDMAUDIOFMT_S16:
-            fSigned = true;
-        case PDMAUDIOFMT_U16:
-            cBits = 16;
-            break;
-
-        case PDMAUDIOFMT_S32:
-            fSigned = true;
-        case PDMAUDIOFMT_U32:
-            cBits = 32;
-            break;
-
-        default:
-            AssertMsgFailed(("Unknown format %ld\n", pCfg->enmFormat));
-            break;
-    }
-
-    bool fEqual =    pProps->uHz         == pCfg->uHz
-                  && pProps->cChannels   == pCfg->cChannels
-                  && pProps->fSigned     == fSigned
-                  && pProps->cBits       == cBits
-                  && pProps->fSwapEndian == !(pCfg->enmEndianness == PDMAUDIOHOSTENDIANNESS);
-    return fEqual;
-}
-
-/**
- * Checks whether two given PCM properties are equal.
- *
- * @returns @c true if equal, @c false if not.
- * @param   pProps1             First properties to compare.
- * @param   pProps2             Second properties to compare.
- */
-bool DrvAudioHlpPCMPropsAreEqual(PPDMAUDIOPCMPROPS pProps1, PPDMAUDIOPCMPROPS pProps2)
-{
-    AssertPtrReturn(pProps1, false);
-    AssertPtrReturn(pProps2, false);
-
-    if (pProps1 == pProps2) /* If the pointers match, take a shortcut. */
-        return true;
-
-    return    pProps1->uHz         == pProps2->uHz
-           && pProps1->cChannels   == pProps2->cChannels
-           && pProps1->fSigned     == pProps2->fSigned
-           && pProps1->cBits       == pProps2->cBits
-           && pProps1->fSwapEndian == pProps2->fSwapEndian;
+    return DrvAudioHlpPCMPropsAreEqual(pProps, &pCfg->Props);
 }
 
@@ -842 +810 @@
     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;
+    memcpy(&pCfg->Props, pPCMProps, sizeof(PDMAUDIOPCMPROPS));
     return VINF_SUCCESS;
 }
@@ -856 +819 @@
  * Returns @c true if configuration is valid, @c false if not.
  * @param   pCfg                Stream configuration to check.
- */
-bool DrvAudioHlpStreamCfgIsValid(PPDMAUDIOSTREAMCFG pCfg)
-{
-    bool fValid = (   pCfg->cChannels == 1
-                   || pCfg->cChannels == 2); /* Either stereo (2) or mono (1), per stream. */
-
-    fValid |= (   pCfg->enmEndianness == PDMAUDIOENDIANNESS_LITTLE
-               || pCfg->enmEndianness == PDMAUDIOENDIANNESS_BIG);
+ *
+ * @remarks Does *not* support surround (> 2 channels) yet! This is intentional, as
+ *          we consider surround support as experimental / not enabled by default for now.
+ */
+bool DrvAudioHlpStreamCfgIsValid(const PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pCfg, false);
+
+    bool fValid = (   pCfg->Props.cChannels == 1
+                   || pCfg->Props.cChannels == 2); /* Either stereo (2) or mono (1), per stream. */
 
     fValid |= (   pCfg->enmDir == PDMAUDIODIR_IN
@@ -870 +835 @@
     if (fValid)
     {
-        switch (pCfg->enmFormat)
-        {
-            case PDMAUDIOFMT_S8:
-            case PDMAUDIOFMT_U8:
-            case PDMAUDIOFMT_S16:
-            case PDMAUDIOFMT_U16:
-            case PDMAUDIOFMT_S32:
-            case PDMAUDIOFMT_U32:
+        switch (pCfg->Props.cBits)
+        {
+            case 8:
+            case 16:
+            /** @todo Do we need support for 24-bit samples? */
+            case 32:
                 break;
             default:
@@ -885 +848 @@
     }
 
-    fValid |= pCfg->uHz > 0;
-    /** @todo Check for defined frequencies supported. */
+    if (!fValid)
+        return false;
+
+    fValid |= pCfg->Props.uHz > 0;
+    fValid |= pCfg->Props.cShift == PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
+
+    fValid |= pCfg->Props.fSwapEndian == false; /** @todo Handling Big Endian audio data is not supported yet. */
 
     return fValid;
@@ -892 +860 @@
 
 /**
- * Converts an audio stream configuration to matching PCM properties.
- *
- * @return  IPRT status code.
- * @param   pCfg                    Audio stream configuration to convert.
- * @param   pProps                  PCM properties to save result to.
- */
-int DrvAudioHlpStreamCfgToProps(PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOPCMPROPS pProps)
-{
-    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pProps, VERR_INVALID_POINTER);
-
-    int rc = VINF_SUCCESS;
-
-    int cBits = 8, cShift = 0;
-    bool fSigned = false;
-
-    switch (pCfg->enmFormat)
-    {
-        case PDMAUDIOFMT_S8:
-            fSigned = true;
-        case PDMAUDIOFMT_U8:
-            break;
-
-        case PDMAUDIOFMT_S16:
-            fSigned = true;
-        case PDMAUDIOFMT_U16:
-            cBits = 16;
-            cShift = 1;
-            break;
-
-        case PDMAUDIOFMT_S32:
-            fSigned = true;
-        case PDMAUDIOFMT_U32:
-            cBits = 32;
-            cShift = 2;
-            break;
-
-        default:
-            AssertMsgFailed(("Unknown format %ld\n", pCfg->enmFormat));
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        pProps->uHz         = pCfg->uHz;
-        pProps->cBits       = cBits;
-        pProps->fSigned     = fSigned;
-        pProps->cShift      = (pCfg->cChannels == 2) + cShift;
-        pProps->cChannels   = pCfg->cChannels;
-        pProps->cbBitrate   = DrvAudioHlpCalcBitrate(pProps->cBits, pProps->uHz, pProps->cChannels) / 8 /* Convert to bytes */;
-        pProps->uAlign      = (1 << pProps->cShift) - 1;
-        pProps->fSwapEndian = pCfg->enmEndianness != PDMAUDIOHOSTENDIANNESS;
-    }
-
-    return rc;
+ * Frees an allocated audio stream configuration.
+ *
+ * @param   pCfg                Audio stream configuration to free.
+ */
+void DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg)
+{
+    if (pCfg)
+    {
+        RTMemFree(pCfg);
+        pCfg = NULL;
+    }
+}
+
+/**
+ * Copies a source stream configuration to a destination stream configuration.
+ *
+ * @returns IPRT status code.
+ * @param   pDstCfg             Destination stream configuration to copy source to.
+ * @param   pSrcCfg             Source stream configuration to copy to destination.
+ */
+int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, const PPDMAUDIOSTREAMCFG pSrcCfg)
+{
+    AssertPtrReturn(pDstCfg, VERR_INVALID_POINTER);
+    AssertPtrReturn(pSrcCfg, VERR_INVALID_POINTER);
+
+#ifdef VBOX_STRICT
+    if (!DrvAudioHlpStreamCfgIsValid(pSrcCfg))
+    {
+        AssertMsgFailed(("Stream config '%s' (%p) is invalid\n", pSrcCfg->szName, pSrcCfg));
+        return VERR_INVALID_PARAMETER;
+    }
+#endif
+
+    memcpy(pDstCfg, pSrcCfg, sizeof(PDMAUDIOSTREAMCFG));
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Duplicates an audio stream configuration.
+ * Must be free'd with DrvAudioHlpStreamCfgFree().
+ *
+ * @return  Duplicates audio stream configuration on success, or NULL on failure.
+ * @param   pCfg                    Audio stream configuration to duplicate.
+ */
+PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(const PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pCfg, NULL);
+
+    PPDMAUDIOSTREAMCFG pDst = (PPDMAUDIOSTREAMCFG)RTMemAllocZ(sizeof(PDMAUDIOSTREAMCFG));
+    if (!pDst)
+        return NULL;
+
+    int rc2 = DrvAudioHlpStreamCfgCopy(pDst, pCfg);
+    if (RT_FAILURE(rc2))
+    {
+        DrvAudioHlpStreamCfgFree(pDst);
+        pDst = NULL;
+    }
+
+    return pDst;
 }
 
@@ -959 +932 @@
     AssertPtrReturnVoid(pCfg);
 
-    LogFlowFunc(("uHz=%RU32, cChannels=%RU8, enmFormat=", pCfg->uHz, pCfg->cChannels));
-
-    switch (pCfg->enmFormat)
-    {
-        case PDMAUDIOFMT_S8:
-            LogFlow(("S8"));
-            break;
-        case PDMAUDIOFMT_U8:
-            LogFlow(("U8"));
-            break;
-        case PDMAUDIOFMT_S16:
-            LogFlow(("S16"));
-            break;
-        case PDMAUDIOFMT_U16:
-            LogFlow(("U16"));
-            break;
-        case PDMAUDIOFMT_S32:
-            LogFlow(("S32"));
-            break;
-        case PDMAUDIOFMT_U32:
-            LogFlow(("U32"));
-            break;
-        default:
-            LogFlow(("invalid(%d)", pCfg->enmFormat));
-            break;
-    }
-
-    LogFlow((", endianness="));
-    switch (pCfg->enmEndianness)
-    {
-        case PDMAUDIOENDIANNESS_LITTLE:
-            LogFlow(("little\n"));
-            break;
-        case PDMAUDIOENDIANNESS_BIG:
-            LogFlow(("big\n"));
-            break;
-        default:
-            LogFlow(("invalid\n"));
-            break;
-    }
+    LogFlowFunc(("uHz=%RU32, cChannels=%RU8, cBits=%RU8%s",
+                 pCfg->Props.uHz, pCfg->Props.cChannels, pCfg->Props.cBits, pCfg->Props.fSigned ? "S" : "U"));
 }
 
@@ -1045 +980 @@
  *
  * @returns The calculated bit rate.
- * @param   pCfg                Audio stream configuration to calculate bit rate for.
+ * @param   pProps              PCM properties to calculate bitrate for.
  *
  * @remark
  */
-uint32_t DrvAudioHlpCalcBitrate(PPDMAUDIOSTREAMCFG pCfg)
-{
-    return DrvAudioHlpCalcBitrate(DrvAudioHlpAudFmtToBits(pCfg->enmFormat), pCfg->uHz, pCfg->cChannels);
+uint32_t DrvAudioHlpCalcBitrate(PPDMAUDIOPCMPROPS pProps)
+{
+    return DrvAudioHlpCalcBitrate(pProps->cBits, pProps->uHz, pProps->cChannels);
 }
 

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

@@ -76 +76 @@
 *********************************************************************************************************************************/
 
-typedef struct ALSAAUDIOSTREAMIN
-{
-    /** Associated host input stream.
-     *  Note: Always must come first! */
-    PDMAUDIOSTREAM      Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS    Props;
+typedef struct ALSAAUDIOSTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
+    union
+    {
+        struct
+        {
+
+        } In;
+        struct
+        {
+            /** Minimum samples required for ALSA to play data. */
+            uint32_t    cSamplesMin;
+        } Out;
+    };
     snd_pcm_t          *phPCM;
     void               *pvBuf;
     size_t              cbBuf;
-} ALSAAUDIOSTREAMIN, *PALSAAUDIOSTREAMIN;
-
-typedef struct ALSAAUDIOSTREAMOUT
-{
-    /** Associated host output stream.
-     *  Note: Always must come first! */
-    PDMAUDIOSTREAM      Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS    Props;
-    snd_pcm_t          *phPCM;
-    void               *pvBuf;
-    size_t              cbBuf;
-    /** Minimum samples required for ALSA to play data. */
-    uint32_t            cSamplesMin;
-} ALSAAUDIOSTREAMOUT, *PALSAAUDIOSTREAMOUT;
+} ALSAAUDIOSTREAM, *PALSAAUDIOSTREAM;
 
 /* latency = period_size * periods / (rate * bytes_per_frame) */
@@ -192 +187 @@
 
 
-static snd_pcm_format_t alsaAudioFmtToALSA(PDMAUDIOFMT fmt)
+static snd_pcm_format_t alsaAudioPropsToALSA(PPDMAUDIOPCMPROPS pProps)
+{
+    switch (pProps->cBits)
+    {
+        case 8:
+            return pProps->fSigned ? SND_PCM_FORMAT_S8 : SND_PCM_FORMAT_U8;
+
+        case 16:
+            return pProps->fSigned ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_U16_LE;
+
+        case 32:
+            return pProps->fSigned ? SND_PCM_FORMAT_S32_LE : SND_PCM_FORMAT_U32_LE;
+
+        default:
+            break;
+    }
+
+    AssertMsgFailed(("%RU8 bits not supported\n", pProps->cBits));
+    return SND_PCM_FORMAT_U8;
+}
+
+
+static int alsaALSAToAudioProps(snd_pcm_format_t fmt, PPDMAUDIOPCMPROPS pProps)
 {
     switch (fmt)
     {
-        case PDMAUDIOFMT_S8:
-            return SND_PCM_FORMAT_S8;
-
-        case PDMAUDIOFMT_U8:
-            return SND_PCM_FORMAT_U8;
-
-        case PDMAUDIOFMT_S16:
-            return SND_PCM_FORMAT_S16_LE;
-
-        case PDMAUDIOFMT_U16:
-            return SND_PCM_FORMAT_U16_LE;
-
-        case PDMAUDIOFMT_S32:
-            return SND_PCM_FORMAT_S32_LE;
-
-        case PDMAUDIOFMT_U32:
-            return SND_PCM_FORMAT_U32_LE;
-
-        default:
-            break;
-    }
-
-    AssertMsgFailed(("Format %ld not supported\n", fmt));
-    return SND_PCM_FORMAT_U8;
-}
-
-
-static int alsaALSAToAudioFmt(snd_pcm_format_t fmt,
-                              PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pEndianness)
-{
-    AssertPtrReturn(pFmt, VERR_INVALID_POINTER);
-    /* pEndianness is optional. */
-
-    switch (fmt)
-    {
         case SND_PCM_FORMAT_S8:
-            *pFmt = PDMAUDIOFMT_S8;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 8;
+            pProps->fSigned = true;
             break;
 
         case SND_PCM_FORMAT_U8:
-            *pFmt = PDMAUDIOFMT_U8;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 8;
+            pProps->fSigned = false;
             break;
 
         case SND_PCM_FORMAT_S16_LE:
-            *pFmt = PDMAUDIOFMT_S16;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 16;
+            pProps->fSigned = true;
             break;
 
         case SND_PCM_FORMAT_U16_LE:
-            *pFmt = PDMAUDIOFMT_U16;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 16;
+            pProps->fSigned = false;
             break;
 
         case SND_PCM_FORMAT_S16_BE:
-            *pFmt = PDMAUDIOFMT_S16;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits       = 16;
+            pProps->fSigned     = true;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
         case SND_PCM_FORMAT_U16_BE:
-            *pFmt = PDMAUDIOFMT_U16;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits       = 16;
+            pProps->fSigned     = false;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
         case SND_PCM_FORMAT_S32_LE:
-            *pFmt = PDMAUDIOFMT_S32;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 32;
+            pProps->fSigned = true;
             break;
 
         case SND_PCM_FORMAT_U32_LE:
-            *pFmt = PDMAUDIOFMT_U32;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits       = 32;
+            pProps->fSigned     = false;
             break;
 
         case SND_PCM_FORMAT_S32_BE:
-            *pFmt = PDMAUDIOFMT_S32;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits       = 32;
+            pProps->fSigned     = true;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
         case SND_PCM_FORMAT_U32_BE:
-            *pFmt = PDMAUDIOFMT_U32;
-            if (pEndianness)
-                *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits       = 32;
+            pProps->fSigned     = false;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
@@ -295 +279 @@
             return VERR_NOT_SUPPORTED;
     }
+
+    Assert(pProps->cChannels);
+    pProps->cShift = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pProps->cBits, pProps->cChannels);
 
     return VINF_SUCCESS;
@@ -912 +899 @@
     int rc;
 
-    snd_pcm_sframes_t framesAvail;
-    framesAvail = snd_pcm_avail_update(phPCM);
+    snd_pcm_sframes_t framesAvail = snd_pcm_avail_update(phPCM);
     if (framesAvail < 0)
     {
@@ -996 +982 @@
 static DECLCALLBACK(int) drvHostALSAAudioInit(PPDMIHOSTAUDIO pInterface)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
 
     LogFlowFuncEnter();
@@ -1018 +1004 @@
  */
 static DECLCALLBACK(int) drvHostALSAAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                       PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1026 +1012 @@
     /* pcbRead is optional. */
 
-    PALSAAUDIOSTREAMIN pStreamALSA = (PALSAAUDIOSTREAMIN)pStream;
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
 
     snd_pcm_sframes_t cAvail;
@@ -1036 +1022 @@
     }
 
+    PPDMAUDIOSTREAMCFG pCfg = pStreamALSA->pCfg;
+    AssertPtr(pCfg);
+
     if (!cAvail) /* No data yet? */
     {
@@ -1042 +1031 @@
         {
             case SND_PCM_STATE_PREPARED:
-                cAvail = PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbBuf);
+                cAvail = PDMAUDIOSTREAMCFG_B2S(pCfg, cbBuf);
                 break;
 
@@ -1072 +1061 @@
      * the mixer buffer.
      */
-    size_t cbToRead = RT_MIN((size_t)PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cAvail), cbBuf);
+    size_t cbToRead = RT_MIN((size_t)PDMAUDIOSTREAMCFG_S2B(pCfg, cAvail), cbBuf);
 
     LogFlowFunc(("cbToRead=%zu, cAvail=%RI32\n", cbToRead, cAvail));
@@ -1084 +1073 @@
            && RT_SUCCESS(rc))
     {
-        cToRead = RT_MIN(PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbToRead),
-                         PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, pStreamALSA->cbBuf));
+        cToRead = RT_MIN(PDMAUDIOSTREAMCFG_B2S(pCfg, cbToRead),
+                         PDMAUDIOSTREAMCFG_B2S(pCfg, pStreamALSA->cbBuf));
         AssertBreakStmt(cToRead, rc = VERR_NO_DATA);
         cRead = snd_pcm_readi(pStreamALSA->phPCM, pStreamALSA->pvBuf, cToRead);
@@ -1135 +1124 @@
              * capture device for example).
              */
-            uint32_t cbRead = PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cRead);
+            uint32_t cbRead = PDMAUDIOSTREAMCFG_S2B(pCfg, cRead);
 
             memcpy(pvBuf, pStreamALSA->pvBuf, cbRead);
@@ -1158 +1147 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                     const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
@@ -1167 +1156 @@
     /* pcbWritten is optional. */
 
-    PALSAAUDIOSTREAMOUT pStreamALSA = (PALSAAUDIOSTREAMOUT)pStream;
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -1175 +1164 @@
     do
     {
-        snd_pcm_sframes_t cAvail;
-        rc = alsaStreamGetAvail(pStreamALSA->phPCM, &cAvail);
+        snd_pcm_sframes_t csAvail;
+        rc = alsaStreamGetAvail(pStreamALSA->phPCM, &csAvail);
         if (RT_FAILURE(rc))
         {
@@ -1183 +1172 @@
         }
 
-        size_t cbToRead = RT_MIN((unsigned)PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, cAvail), cbBuf);
-        if (!cbToRead)
-            break;
-
-        memcpy(pStreamALSA->pvBuf, pvBuf, cbToRead);
-
-        snd_pcm_sframes_t cWritten = 0;
+        if (!csAvail)
+            break;
+
+        PPDMAUDIOSTREAMCFG pCfg = pStreamALSA->pCfg;
+        AssertPtr(pCfg);
+
+        size_t cbToWrite = RT_MIN((unsigned)PDMAUDIOSTREAMCFG_S2B(pCfg, csAvail), RT_MIN(pStreamALSA->cbBuf, cbBuf));
+        if (!cbToWrite)
+            break;
+
+        memcpy(pStreamALSA->pvBuf, pvBuf, cbToWrite);
+
+        snd_pcm_sframes_t csWritten = 0;
 
         /* Don't try infinitely on recoverable errors. */
@@ -1195 +1190 @@
         for (iTry = 0; iTry < ALSA_RECOVERY_TRIES_MAX; iTry++)
         {
-            cWritten = snd_pcm_writei(pStreamALSA->phPCM, pStreamALSA->pvBuf,
-                                      PDMAUDIOPCMPROPS_B2S(&pStreamALSA->Props, cbToRead));
-            if (cWritten <= 0)
+            csWritten = snd_pcm_writei(pStreamALSA->phPCM, pStreamALSA->pvBuf,
+                                       PDMAUDIOSTREAMCFG_B2S(pCfg, cbToWrite));
+            if (csWritten <= 0)
             {
-                switch (cWritten)
+                switch (csWritten)
                 {
                     case 0:
                     {
-                        LogFunc(("Failed to write %zu bytes\n", cbToRead));
+                        LogFunc(("Failed to write %zu bytes\n", cbToWrite));
                         rc = VERR_ACCESS_DENIED;
                         break;
@@ -1233 +1228 @@
 
                     default:
-                        LogFlowFunc(("Failed to write %RU32 bytes, error unknown\n", cbToRead));
+                        LogFlowFunc(("Failed to write %RU32 bytes, error unknown\n", cbToWrite));
                         rc = VERR_GENERAL_FAILURE; /** @todo */
                         break;
@@ -1243 +1238 @@
 
         if (   iTry == ALSA_RECOVERY_TRIES_MAX
-            && cWritten <= 0)
+            && csWritten <= 0)
             rc = VERR_BROKEN_PIPE;
 
@@ -1249 +1244 @@
             break;
 
-        cbWrittenTotal = cbToRead;
+        cbWrittenTotal += cbToWrite;
 
     } while (0);
@@ -1264 +1259 @@
 
 
-static int alsaDestroyStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PALSAAUDIOSTREAMIN pThisStream = (PALSAAUDIOSTREAMIN)pStream;
-
-    alsaStreamClose(&pThisStream->phPCM);
-
-    if (pThisStream->pvBuf)
-    {
-        RTMemFree(pThisStream->pvBuf);
-        pThisStream->pvBuf = NULL;
+static int alsaDestroyStreamIn(PALSAAUDIOSTREAM pStreamALSA)
+{
+    alsaStreamClose(&pStreamALSA->phPCM);
+
+    if (pStreamALSA->pvBuf)
+    {
+        RTMemFree(pStreamALSA->pvBuf);
+        pStreamALSA->pvBuf = NULL;
     }
 
@@ -1283 +1273 @@
 
 
-static int alsaDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PALSAAUDIOSTREAMOUT pThisStream = (PALSAAUDIOSTREAMOUT)pStream;
-
-    alsaStreamClose(&pThisStream->phPCM);
-
-    if (pThisStream->pvBuf)
-    {
-        RTMemFree(pThisStream->pvBuf);
-        pThisStream->pvBuf = NULL;
+static int alsaDestroyStreamOut(PALSAAUDIOSTREAM pStreamALSA)
+{
+    alsaStreamClose(&pStreamALSA->phPCM);
+
+    if (pStreamALSA->pvBuf)
+    {
+        RTMemFree(pStreamALSA->pvBuf);
+        pStreamALSA->pvBuf = NULL;
     }
 
@@ -1302 +1287 @@
 
 
-static int alsaCreateStreamOut(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    PALSAAUDIOSTREAMOUT pStreamALSA = (PALSAAUDIOSTREAMOUT)pStream;
-
+static int alsaCreateStreamOut(PALSAAUDIOSTREAM pStreamALSA, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
     snd_pcm_t *phPCM = NULL;
 
@@ -1313 +1296 @@
     {
         ALSAAUDIOSTREAMCFG req;
-        req.fmt         = alsaAudioFmtToALSA(pCfgReq->enmFormat);
-        req.freq        = pCfgReq->uHz;
-        req.nchannels   = pCfgReq->cChannels;
-        req.period_size = s_ALSAConf.period_size_out;
-        req.buffer_size = s_ALSAConf.buffer_size_out;
+        req.fmt         = alsaAudioPropsToALSA(&pCfgReq->Props);
+        req.freq        = pCfgReq->Props.uHz;
+        req.nchannels   = pCfgReq->Props.cChannels;
+        req.period_size = s_ALSAConf.period_size_out; /** @todo Make this configurable. */
+        req.buffer_size = s_ALSAConf.buffer_size_out; /** @todo Make this configurable. */
 
         ALSAAUDIOSTREAMCFG obt;
@@ -1324 +1307 @@
             break;
 
-        PDMAUDIOFMT enmFormat;
-        PDMAUDIOENDIANNESS enmEnd;
-        rc = alsaALSAToAudioFmt(obt.fmt, &enmFormat, &enmEnd);
+        pCfgAcq->Props.uHz       = obt.freq;
+        pCfgAcq->Props.cChannels = obt.nchannels;
+
+        rc = alsaALSAToAudioProps(obt.fmt, &pCfgAcq->Props);
         if (RT_FAILURE(rc))
             break;
 
-        pCfgAcq->uHz               = obt.freq;
-        pCfgAcq->cChannels         = obt.nchannels;
-        pCfgAcq->enmFormat         = enmFormat;
-        pCfgAcq->enmEndianness     = enmEnd;
-        pCfgAcq->cSampleBufferSize = obt.samples * 4;
-
-        rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamALSA->Props);
-        if (RT_FAILURE(rc))
-            break;
+        pCfgAcq->cSampleBufferHint = obt.samples * 4;
 
         AssertBreakStmt(obt.samples, rc = VERR_INVALID_PARAMETER);
 
-        size_t cbBuf = obt.samples * PDMAUDIOPCMPROPS_S2B(&pStreamALSA->Props, 1);
+        size_t cbBuf = obt.samples * PDMAUDIOSTREAMCFG_S2B(pCfgAcq, 1);
         AssertBreakStmt(cbBuf, rc = VERR_INVALID_PARAMETER);
 
@@ -1366 +1342 @@
 
 
-static int alsaCreateStreamIn(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static int alsaCreateStreamIn(PALSAAUDIOSTREAM pStreamALSA, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     int rc;
 
-    PALSAAUDIOSTREAMIN pThisStream = (PALSAAUDIOSTREAMIN)pStream;
     snd_pcm_t *phPCM = NULL;
 
@@ -1376 +1351 @@
     {
         ALSAAUDIOSTREAMCFG req;
-        req.fmt         = alsaAudioFmtToALSA(pCfgReq->enmFormat);
-        req.freq        = pCfgReq->uHz;
-        req.nchannels   = pCfgReq->cChannels;
-        req.period_size = s_ALSAConf.period_size_in;
-        req.buffer_size = s_ALSAConf.buffer_size_in;
+        req.fmt         = alsaAudioPropsToALSA(&pCfgReq->Props);
+        req.freq        = pCfgReq->Props.uHz;
+        req.nchannels   = pCfgReq->Props.cChannels;
+        req.period_size = s_ALSAConf.period_size_in; /** @todo Make this configurable. */
+        req.buffer_size = s_ALSAConf.buffer_size_in; /** @todo Make this configurable. */
 
         ALSAAUDIOSTREAMCFG obt;
@@ -1387 +1362 @@
             break;
 
-        PDMAUDIOFMT enmFormat;
-        PDMAUDIOENDIANNESS enmEnd;
-        rc = alsaALSAToAudioFmt(obt.fmt, &enmFormat, &enmEnd);
+        pCfgAcq->Props.uHz       = obt.freq;
+        pCfgAcq->Props.cChannels = obt.nchannels;
+
+        rc = alsaALSAToAudioProps(obt.fmt, &pCfgAcq->Props);
         if (RT_FAILURE(rc))
             break;
 
-        pCfgAcq->uHz               = obt.freq;
-        pCfgAcq->cChannels         = obt.nchannels;
-        pCfgAcq->enmFormat         = enmFormat;
-        pCfgAcq->enmEndianness     = enmEnd;
-        pCfgAcq->cSampleBufferSize = obt.samples;
-
-        PDMAUDIOPCMPROPS Props;
-        rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &Props);
-        if (RT_FAILURE(rc))
-            break;
+        pCfgAcq->cSampleBufferHint = obt.samples;
 
         AssertBreakStmt(obt.samples, rc = VERR_INVALID_PARAMETER);
-        size_t cbBuf = obt.samples * (1 << Props.cShift); /** @todo Get rid of using Props! */
+
+        size_t cbBuf = obt.samples * PDMAUDIOSTREAMCFG_S2B(pCfgAcq, 1);
         AssertBreakStmt(cbBuf, rc = VERR_INVALID_PARAMETER);
-        pThisStream->pvBuf = RTMemAlloc(cbBuf);
-        if (!pThisStream->pvBuf)
-        {
-            LogRel(("ALSA: Not enough memory for input ADC buffer (%RU32 samples, each %d bytes)\n",
-                    obt.samples, 1 << Props.cShift));
+
+        pStreamALSA->pvBuf = RTMemAlloc(cbBuf);
+        if (!pStreamALSA->pvBuf)
+        {
+            LogRel(("ALSA: Not enough memory for input ADC buffer (%RU32 samples, %zu bytes)\n", obt.samples, cbBuf));
             rc = VERR_NO_MEMORY;
             break;
         }
 
-        pThisStream->cbBuf = cbBuf;
-        pThisStream->phPCM = phPCM;
+        pStreamALSA->cbBuf = cbBuf;
+        pStreamALSA->phPCM = phPCM;
     }
     while (0);
@@ -1429 +1397 @@
 
 
-static int alsaControlStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
-                               PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    NOREF(pInterface);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    PALSAAUDIOSTREAMIN pThisStream = (PALSAAUDIOSTREAMIN)pStream;
-
-    LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
-
+static int alsaControlStreamIn(PALSAAUDIOSTREAM pStreamALSA, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
     int rc;
     switch (enmStreamCmd)
@@ -1443 +1404 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         case PDMAUDIOSTREAMCMD_RESUME:
-            rc = drvHostALSAAudioStreamCtl(pThisStream->phPCM, false /* fStop */);
+            rc = drvHostALSAAudioStreamCtl(pStreamALSA->phPCM, false /* fStop */);
             break;
 
         case PDMAUDIOSTREAMCMD_DISABLE:
         case PDMAUDIOSTREAMCMD_PAUSE:
-            rc = drvHostALSAAudioStreamCtl(pThisStream->phPCM, true /* fStop */);
+            rc = drvHostALSAAudioStreamCtl(pStreamALSA->phPCM, true /* fStop */);
             break;
 
@@ -1461 +1422 @@
 
 
-static int alsaControlStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
-                                PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    NOREF(pInterface);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    PALSAAUDIOSTREAMOUT pThisStream = (PALSAAUDIOSTREAMOUT)pStream;
-
-    LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
-
+static int alsaControlStreamOut(PALSAAUDIOSTREAM pStreamALSA, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
     int rc;
     switch (enmStreamCmd)
@@ -1475 +1429 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         case PDMAUDIOSTREAMCMD_RESUME:
-            rc = drvHostALSAAudioStreamCtl(pThisStream->phPCM, false /* fStop */);
+            rc = drvHostALSAAudioStreamCtl(pStreamALSA->phPCM, false /* fStop */);
             break;
 
         case PDMAUDIOSTREAMCMD_DISABLE:
         case PDMAUDIOSTREAMCMD_PAUSE:
-            rc = drvHostALSAAudioStreamCtl(pThisStream->phPCM, true /* fStop */);
+            rc = drvHostALSAAudioStreamCtl(pStreamALSA->phPCM, true /* fStop */);
             break;
 
@@ -1498 +1452 @@
 static DECLCALLBACK(int) drvHostALSAAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    pBackendCfg->cbStreamIn  = sizeof(ALSAAUDIOSTREAMIN);
-    pBackendCfg->cbStreamOut = sizeof(ALSAAUDIOSTREAMOUT);
+    pBackendCfg->cbStreamIn  = sizeof(ALSAAUDIOSTREAM);
+    pBackendCfg->cbStreamOut = sizeof(ALSAAUDIOSTREAM);
 
     /* Enumerate sound devices. */
@@ -1571 +1525 @@
 static DECLCALLBACK(void) drvHostALSAAudioShutdown(PPDMIHOSTAUDIO pInterface)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
 }
 
@@ -1590 +1544 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostALSAAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                      PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1597 +1552 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
+
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = alsaCreateStreamIn(pStream, pCfgReq, pCfgAcq);
+        rc = alsaCreateStreamIn (pStreamALSA, pCfgReq, pCfgAcq);
     else
-        rc = alsaCreateStreamOut(pStream, pCfgReq, pCfgAcq);
-
-    LogFlowFunc(("%s: rc=%Rrc\n", pStream->szName, rc));
+        rc = alsaCreateStreamOut(pStreamALSA, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamALSA->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamALSA->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
+
     return rc;
 }
@@ -1611 +1574 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostALSAAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
+
+    if (!pStreamALSA->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = alsaDestroyStreamIn(pInterface,  pStream);
+    if (pStreamALSA->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = alsaDestroyStreamIn(pStreamALSA);
     else
-        rc = alsaDestroyStreamOut(pInterface, pStream);
+        rc = alsaDestroyStreamOut(pStreamALSA);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamALSA->pCfg);
+        pStreamALSA->pCfg = NULL;
+    }
 
     return rc;
@@ -1629 +1603 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHostALSAAudioStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                       PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
+
+    if (!pStreamALSA->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = alsaControlStreamIn(pInterface,  pStream, enmStreamCmd);
+    if (pStreamALSA->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = alsaControlStreamIn (pStreamALSA, enmStreamCmd);
     else
-        rc = alsaControlStreamOut(pInterface, pStream, enmStreamCmd);
+        rc = alsaControlStreamOut(pStreamALSA, enmStreamCmd);
 
     return rc;
@@ -1649 +1627 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    NOREF(pStream);
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface);
+
+    PALSAAUDIOSTREAM pStreamALSA = (PALSAAUDIOSTREAM)pStream;
 
     PDMAUDIOSTRMSTS strmSts =   PDMAUDIOSTRMSTS_FLAG_INITIALIZED
                               | PDMAUDIOSTRMSTS_FLAG_ENABLED;
 
-    snd_pcm_t         *phPCM       = NULL;
-    snd_pcm_sframes_t  cSamplesMin;
-
-    /** @todo Get rid of this once we have a unified ALSA stream. */
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-    {
-        PALSAAUDIOSTREAMIN pStreamIn = (PALSAAUDIOSTREAMIN)pStream;
-        phPCM       = pStreamIn->phPCM;
-        cSamplesMin = 0;
-    }
-    else if (pStream->enmDir == PDMAUDIODIR_OUT)
-    {
-        PALSAAUDIOSTREAMOUT pStreamOut = (PALSAAUDIOSTREAMOUT)pStream;
-        phPCM       = pStreamOut->phPCM;
-        cSamplesMin = pStreamOut->cSamplesMin;
-    }
-    else
-        AssertFailed();
+    snd_pcm_t         *phPCM       = pStreamALSA->phPCM;
+    snd_pcm_sframes_t  cSamplesMin = 0;
+
+    if (pStreamALSA->pCfg->enmDir == PDMAUDIODIR_OUT)
+        cSamplesMin = pStreamALSA->Out.cSamplesMin;
 
     if (phPCM)
@@ -1684 +1650 @@
             Log3Func(("cAvail=%ld \n", cSamplesAvail));
             if (cSamplesAvail >= cSamplesMin)
-                strmSts |= pStream->enmDir == PDMAUDIODIR_IN
+                strmSts |= pStreamALSA->pCfg->enmDir == PDMAUDIODIR_IN
                          ? PDMAUDIOSTRMSTS_FLAG_DATA_READABLE
                          : PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE;
@@ -1697 +1663 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostALSAAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostALSAAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

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

@@ -209 +209 @@
     AssertPtrReturn(pCfg,  VERR_INVALID_PARAMETER);
 
-    pCfg->cChannels     = pASBD->mChannelsPerFrame;
-    pCfg->uHz           = (uint32_t)pASBD->mSampleRate;
-    pCfg->enmEndianness = PDMAUDIOENDIANNESS_LITTLE;
-
-    int rc = VINF_SUCCESS;
-
-    if (pASBD->mFormatFlags & kAudioFormatFlagIsSignedInteger)
-    {
-        switch (pASBD->mBitsPerChannel)
-        {
-            case 8:  pCfg->enmFormat = PDMAUDIOFMT_S8;  break;
-            case 16: pCfg->enmFormat = PDMAUDIOFMT_S16; break;
-            case 32: pCfg->enmFormat = PDMAUDIOFMT_S32; break;
-            default: rc = VERR_NOT_SUPPORTED;           break;
-        }
-    }
-    else
-    {
-        switch (pASBD->mBitsPerChannel)
-        {
-            case 8:  pCfg->enmFormat = PDMAUDIOFMT_U8;  break;
-            case 16: pCfg->enmFormat = PDMAUDIOFMT_U16; break;
-            case 32: pCfg->enmFormat = PDMAUDIOFMT_U32; break;
-            default: rc = VERR_NOT_SUPPORTED;           break;
-        }
-    }
-
-    AssertRC(rc);
-    return rc;
+    pCfg->Props.cChannels = pASBD->mChannelsPerFrame;
+    pCfg->Props.uHz       = (uint32_t)pASBD->mSampleRate;
+    pCfg->Props.cBits     = pASBD->mBitsPerChannel;
+    pCfg->Props.fSigned   = RT_BOOL(pASBD->mFormatFlags & kAudioFormatFlagIsSignedInteger);
+    pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
+
+    return VINF_SUCCESS;
 }
 #endif /* !VBOX_WITH_AUDIO_CALLBACKS */
@@ -382 +360 @@
 typedef struct COREAUDIOSTREAM
 {
-    /** PDM audio stream data.
-     *  Note: Always must come first in this structure! */
-    PDMAUDIOSTREAM              Stream;
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG          pCfg;
     /** Stream-specific data, depending on the stream type. */
     union
@@ -395 +372 @@
     /** Pointer to driver instance this stream is bound to. */
     PDRVHOSTCOREAUDIO           pDrv;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS            Props;
-    /** The stream's direction. */
-    PDMAUDIODIR                 enmDir;
     /** The stream's thread handle for maintaining the audio queue. */
     RTTHREAD                    hThread;
@@ -1307 +1280 @@
     PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pvUser;
     AssertPtr(pCAStream);
+    AssertPtr(pCAStream->pCfg);
 
     LogFunc(("Starting pCAStream=%p\n", pCAStream));
+
+    const bool fIn = pCAStream->pCfg->enmDir == PDMAUDIODIR_IN;
 
     /*
@@ -1314 +1290 @@
      */
     OSStatus err;
-    if (pCAStream->enmDir == PDMAUDIODIR_IN)
+    if (fIn)
         err = AudioQueueNewInput(&pCAStream->asbdStream, coreAudioInputQueueCb, pCAStream /* pvData */,
                                  CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &pCAStream->audioQueue);
@@ -1356 +1332 @@
      * Enter the main loop.
      */
-    const bool fIn = pCAStream->enmDir == PDMAUDIODIR_IN;
-
     while (!ASMAtomicReadBool(&pCAStream->fShutdown))
     {
@@ -1563 +1537 @@
         AudioQueueBufferRef pBuf = pCAStream->audioBuffer[i];
 
-        if (pCAStream->enmDir == PDMAUDIODIR_IN)
+        if (pCAStream->pCfg->enmDir == PDMAUDIODIR_IN)
         {
             int rc2 = coreAudioInputQueueProcBuffer(pCAStream, pBuf);
@@ -1571 +1545 @@
             }
         }
-        else if (pCAStream->enmDir == PDMAUDIODIR_OUT)
+        else if (pCAStream->pCfg->enmDir == PDMAUDIODIR_OUT)
         {
             int rc2 = coreAudioOutputQueueProcBuffer(pCAStream, pBuf);
@@ -1608 +1582 @@
         return VERR_NOT_AVAILABLE;
 
-    pCAStream->enmDir = pCfgReq->enmDir;
-
-    const bool fIn = pCAStream->enmDir == PDMAUDIODIR_IN;
+    const bool fIn = pCfgReq->enmDir == PDMAUDIODIR_IN;
+
+    int rc = VINF_SUCCESS;
 
     /* Create the recording device's out format based on our required audio settings. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pCAStream->Props);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("CoreAudio: Failed to convert requested %s format to native format (%Rrc)\n", fIn ? "input" : "output", rc));
-        return rc;
-    }
-
-    coreAudioPCMPropsToASBD(&pCAStream->Props, &pCAStream->asbdStream);
+    Assert(pCAStream->pCfg == NULL);
+    pCAStream->pCfg = DrvAudioHlpStreamCfgDup(pCfgReq);
+    if (!pCAStream->pCfg)
+        rc = VERR_NO_MEMORY;
+
+    coreAudioPCMPropsToASBD(&pCfgReq->Props, &pCAStream->asbdStream);
+    /** @todo Do some validation? */
 
     coreAudioPrintASBD(  fIn
                        ? "Capturing queue format"
                        : "Playback queue format", &pCAStream->asbdStream);
+
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("CoreAudio: Failed to convert requested %s format to native format (%Rrc)\n", fIn ? "input" : "output", rc));
+        return rc;
+    }
 
     rc = RTCircBufCreate(&pCAStream->pCircBuf, 8096 << 1 /*pHstStrmIn->Props.cShift*/); /** @todo FIX THIS !!! */
@@ -1922 +1901 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostCoreAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostCoreAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                        void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
@@ -2024 +2003 @@
  */
 static DECLCALLBACK(int) drvHostCoreAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                    PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                    PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                     uint32_t *pcbWritten)
 {
@@ -2081 +2060 @@
         Assert(cbWrittenTotal + cbChunk <= cbBuf);
 
-        memcpy((uint8_t *)pvBuf + cbWrittenTotal, pvChunk, cbChunk);
+        memcpy(pvChunk, (uint8_t *)pvBuf + cbWrittenTotal, cbChunk);
 
         /* Release the ring buffer, so the read thread could start reading this data. */
@@ -2138 +2117 @@
     }
 
+    if (!pCAStream->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc = VINF_SUCCESS;
 
@@ -2146 +2128 @@
         {
             LogFunc(("Queue enable\n"));
-            if (pCAStream->enmDir == PDMAUDIODIR_IN)
+            if (pCAStream->pCfg->enmDir == PDMAUDIODIR_IN)
             {
                 rc = coreAudioStreamInvalidateQueue(pCAStream);
@@ -2155 +2137 @@
                 }
             }
-            if (pCAStream->enmDir == PDMAUDIODIR_OUT)
+            else if (pCAStream->pCfg->enmDir == PDMAUDIODIR_OUT)
             {
                 /* Touch the run flag to start the audio queue as soon as
@@ -2288 +2270 @@
 static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostCoreAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
-    RT_NOREF(enmDir);
+    RT_NOREF(pInterface, enmDir);
     AssertPtrReturn(pInterface, PDMAUDIOBACKENDSTS_UNKNOWN);
 
@@ -2298 +2280 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostCoreAudioStreamCreate(PPDMIHOSTAUDIO pInterface,
-                                                      PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostCoreAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                      PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -2306 +2288 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
-    PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
-
-    PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
+    PDRVHOSTCOREAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
+    PCOREAUDIOSTREAM  pCAStream = (PCOREAUDIOSTREAM)pStream;
 
     int rc = RTCritSectInit(&pCAStream->CritSect);
@@ -2344 +2323 @@
             if (RT_SUCCESS(rc))
             {
-                pCfgAcq->cSampleBufferSize = _4K; /** @todo FIX THIS !!! */
+                pCfgAcq->cSampleBufferHint = _4K; /** @todo FIX THIS !!! */
             }
             if (RT_SUCCESS(rc))
@@ -2372 +2351 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostCoreAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostCoreAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -2378 +2357 @@
 
     PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
 
     PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
@@ -2394 +2371 @@
     }
 
+    if (!pCAStream->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc = coreAudioStreamControl(pThis, pCAStream, PDMAUDIOSTREAMCMD_DISABLE);
     if (RT_SUCCESS(rc))
@@ -2420 +2400 @@
  */
 static DECLCALLBACK(int) drvHostCoreAudioStreamControl(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+                                                       PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
-
+    PDRVHOSTCOREAUDIO pThis    = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
     PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
 
@@ -2438 +2415 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
 
     PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE;
 
-    PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
+    if (!pCAStream->pCfg) /* Not (yet) configured? Skip. */
+        return strmSts;
 
     if (ASMAtomicReadU32(&pCAStream->enmStatus) == COREAUDIOSTATUS_INIT)
         strmSts |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED;
 
-    if (pStream->enmDir == PDMAUDIODIR_IN)
+    if (pCAStream->pCfg->enmDir == PDMAUDIODIR_IN)
     {
         if (strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
             strmSts |= PDMAUDIOSTRMSTS_FLAG_DATA_READABLE;
     }
-    else if (pStream->enmDir == PDMAUDIODIR_OUT)
+    else if (pCAStream->pCfg->enmDir == PDMAUDIODIR_OUT)
     {
         if (strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
@@ -2472 +2450 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostCoreAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostCoreAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+
+    RT_NOREF(pInterface, pStream);
 
     /* Nothing to do here for Core Audio. */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -104 +104 @@
 } DSOUNDHOSTCFG, *PDSOUNDHOSTCFG;
 
-typedef struct DSOUNDSTREAMOUT
-{
-    /** 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;
-    DWORD                offPlayWritePos;
-    DWORD                cbPlayBuf;
-    bool                 fEnabled;
-    bool                 fRestartPlayback;
-    PDMAUDIOSTREAMCFG    streamCfg;
-} DSOUNDSTREAMOUT, *PDSOUNDSTREAMOUT;
-
-typedef struct DSOUNDSTREAMIN
-{
-    /** Associated host input stream. */
-    PDMAUDIOSTREAM              Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS            Props;
-    LPDIRECTSOUNDCAPTURE8       pDSC;
-    LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB;
-    DWORD                       offCaptureBufRead;
-    DWORD                       cbCaptureBuf;
-    HRESULT                     hrLastCapture;
-    PDMAUDIORECSOURCE           enmRecSource;
-    bool                        fEnabled;
-    PDMAUDIOSTREAMCFG           streamCfg;
-} DSOUNDSTREAMIN, *PDSOUNDSTREAMIN;
+typedef struct DSOUNDSTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
+    /** Buffer alignment. */
+    uint8_t            uAlign;
+    union
+    {
+        struct
+        {
+            LPDIRECTSOUNDCAPTURE8       pDSC;
+            LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB;
+            DWORD                       offCaptureBufRead;
+            DWORD                       cbCaptureBuf;
+            HRESULT                     hrLastCapture;
+            bool                        fEnabled;
+        } In;
+        struct
+        {
+            LPDIRECTSOUND8              pDS;     /** @todo Move this out of this structure! Not required per-stream (e.g. for multi-channel). */
+            LPDIRECTSOUNDBUFFER8        pDSB;
+            DWORD                       offPlayWritePos;
+            DWORD                       cbPlayBuf;
+            bool                        fEnabled;
+            bool                        fRestartPlayback;
+        } Out;
+    };
+} DSOUNDSTREAM, *PDSOUNDSTREAM;
 
 typedef struct DRVHOSTDSOUND
@@ -166 +164 @@
     uint8_t             cEvents;
     /** Pointer to the input stream. */
-    PDSOUNDSTREAMIN     pDSStrmIn;
+    PDSOUNDSTREAM       pDSStrmIn;
     /** Pointer to the output stream. */
-    PDSOUNDSTREAMOUT    pDSStrmOut;
+    PDSOUNDSTREAM       pDSStrmOut;
 #endif
 } DRVHOSTDSOUND, *PDRVHOSTDSOUND;
@@ -226 +224 @@
 
     pFmt->wFormatTag      = WAVE_FORMAT_PCM;
-    pFmt->nChannels       = pCfg->cChannels;
-    pFmt->nSamplesPerSec  = pCfg->uHz;
-    pFmt->nAvgBytesPerSec = pCfg->uHz << (pCfg->cChannels == 2 ? 1: 0);
-    pFmt->nBlockAlign     = 1 << (pCfg->cChannels == 2 ? 1: 0);
+    pFmt->nChannels       = pCfg->Props.cChannels;
+    pFmt->nSamplesPerSec  = pCfg->Props.uHz;
+    pFmt->nAvgBytesPerSec = pCfg->Props.uHz << (pCfg->Props.cChannels == 2 ? 1: 0);
+    pFmt->nBlockAlign     = 1 << (pCfg->Props.cChannels == 2 ? 1 : 0);
     pFmt->cbSize          = 0; /* No extra data specified. */
 
-    switch (pCfg->enmFormat)
-    {
-        case PDMAUDIOFMT_S8:
-        case PDMAUDIOFMT_U8:
+    switch (pCfg->Props.cBits)
+    {
+        case 8:
             pFmt->wBitsPerSample = 8;
             break;
 
-        case PDMAUDIOFMT_S16:
-        case PDMAUDIOFMT_U16:
+        case 16:
             pFmt->wBitsPerSample = 16;
             pFmt->nAvgBytesPerSec <<= 1;
@@ -246 +242 @@
             break;
 
-        case PDMAUDIOFMT_S32:
-        case PDMAUDIOFMT_U32:
+        case 32:
             pFmt->wBitsPerSample = 32;
             pFmt->nAvgBytesPerSec <<= 2;
@@ -254 +249 @@
 
         default:
-            AssertMsgFailed(("Wave format %d not supported\n", pCfg->enmFormat));
+            AssertMsgFailed(("Wave format for %RU8 bits not supported\n", pCfg->Props.cBits));
             return VERR_NOT_SUPPORTED;
     }
@@ -262 +257 @@
 
 
-static int dsoundGetPosOut(PDRVHOSTDSOUND   pThis,
-                           PDSOUNDSTREAMOUT pDSoundStream, DWORD *pdwBuffer, DWORD *pdwFree, DWORD *pdwPlayPos)
+static int dsoundGetPosOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
+                           DWORD *pdwBuffer, DWORD *pdwFree, DWORD *pdwPlayPos)
 {
     AssertPtr(pThis);
-    AssertPtrReturn(pDSoundStream, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStreamDS, VERR_INVALID_POINTER);
     AssertPtrNull(pdwBuffer);
     AssertPtrNull(pdwFree);
     AssertPtrNull(pdwPlayPos);
 
-    LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStream->pDSB;
+    LPDIRECTSOUNDBUFFER8 pDSB = pStreamDS->Out.pDSB;
     if (!pDSB)
         return VERR_INVALID_POINTER;
@@ -283 +278 @@
         if (SUCCEEDED(hr))
         {
-            DWORD const cbBuffer = pDSoundStream->cbPlayBuf;
+            DWORD const cbBuffer = pStreamDS->Out.cbPlayBuf;
             if (pdwBuffer)
                 *pdwBuffer  = cbBuffer;
             if (pdwFree)
-                *pdwFree    = cbBuffer - dsoundRingDistance(pDSoundStream->offPlayWritePos, cbPlayPos, cbBuffer);
+                *pdwFree    = cbBuffer - dsoundRingDistance(pStreamDS->Out.offPlayWritePos, cbPlayPos, cbBuffer);
             if (pdwPlayPos)
                 *pdwPlayPos = cbPlayPos;
@@ -385 +380 @@
 
 
-static HRESULT directSoundPlayLock(PDRVHOSTDSOUND pThis,
-                                   LPDIRECTSOUNDBUFFER8 pDSB, PPDMAUDIOPCMPROPS pProps,
+static HRESULT directSoundPlayLock(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
                                    DWORD dwOffset, DWORD dwBytes,
                                    PVOID *ppv1, PVOID *ppv2,
@@ -398 +392 @@
         *ppv1 = *ppv2 = NULL;
         *pcb1 = *pcb2 = 0;
-        hr = IDirectSoundBuffer8_Lock(pDSB, dwOffset, dwBytes, ppv1, pcb1, ppv2, pcb2, dwFlags);
+        hr = IDirectSoundBuffer8_Lock(pStreamDS->Out.pDSB, dwOffset, dwBytes, ppv1, pcb1, ppv2, pcb2, dwFlags);
         if (SUCCEEDED(hr))
         {
-            if (   (!*ppv1 || !(*pcb1 & pProps->uAlign))
-                && (!*ppv2 || !(*pcb2 & pProps->uAlign)) )
+            if (   (!*ppv1 || !(*pcb1 & pStreamDS->uAlign))
+                && (!*ppv2 || !(*pcb2 & pStreamDS->uAlign)) )
                 return S_OK;
             DSLOGREL(("DSound: Locking playback buffer returned misaligned buffer: cb1=%#RX32, cb2=%#RX32 (alignment: %#RX32)\n",
-                      *pcb1, *pcb2, pProps->uAlign));
-            directSoundPlayUnlock(pThis, pDSB, *ppv1, *ppv2, *pcb1, *pcb2);
+                      *pcb1, *pcb2, pStreamDS->uAlign));
+            directSoundPlayUnlock(pThis, pStreamDS->uAlign, *ppv1, *ppv2, *pcb1, *pcb2);
             return E_FAIL;
         }
@@ -414 +408 @@
 
         LogFlowFunc(("Locking failed due to lost buffer, restoring ...\n"));
-        directSoundPlayRestore(pThis, pDSB);
+        directSoundPlayRestore(pThis, pStreamDS->Out.pDSB);
     }
 
@@ -422 +416 @@
 
 
-static HRESULT directSoundCaptureLock(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB, PPDMAUDIOPCMPROPS pProps,
+static HRESULT directSoundCaptureLock(PDSOUNDSTREAM pStreamDS,
                                       DWORD dwOffset, DWORD dwBytes,
                                       PVOID *ppv1, PVOID *ppv2,
@@ -433 +427 @@
     DWORD cb2 = 0;
 
-    HRESULT hr = IDirectSoundCaptureBuffer8_Lock(pDSCB, dwOffset, dwBytes,
+    HRESULT hr = IDirectSoundCaptureBuffer8_Lock(pStreamDS->In.pDSCB, dwOffset, dwBytes,
                                                  &pv1, &cb1, &pv2, &cb2, dwFlags);
     if (FAILED(hr))
@@ -441 +435 @@
     }
 
-    if (   (pv1 && (cb1 & pProps->uAlign))
-        || (pv2 && (cb2 & pProps->uAlign)))
+    if (   (pv1 && (cb1 & pStreamDS->uAlign))
+        || (pv2 && (cb2 & pStreamDS->uAlign)))
     {
         DSLOGREL(("DSound: Locking capture buffer returned misaligned buffer: cb1=%RI32, cb2=%RI32 (alignment: %RU32)\n",
-                  cb1, cb2, pProps->uAlign));
-        directSoundCaptureUnlock(pDSCB, pv1, pv2, cb1, cb2);
+                  cb1, cb2, pStreamDS->uAlign));
+        directSoundCaptureUnlock(pStreamDS->In.pDSCB, pv1, pv2, cb1, cb2);
         return E_FAIL;
     }
@@ -463 +457 @@
  */
 
-static void directSoundPlayInterfaceRelease(PDSOUNDSTREAMOUT pDSoundStream)
-{
-    if (pDSoundStream->pDS)
-    {
-        IDirectSound8_Release(pDSoundStream->pDS);
-        pDSoundStream->pDS = NULL;
-    }
-}
-
-
-static HRESULT directSoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
-{
-    if (pDSoundStream->pDS != NULL)
+static void directSoundPlayInterfaceRelease(PDSOUNDSTREAM pStreamDS)
+{
+    if (pStreamDS->Out.pDS)
+    {
+        IDirectSound8_Release(pStreamDS->Out.pDS);
+        pStreamDS->Out.pDS = NULL;
+    }
+}
+
+
+static HRESULT directSoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    if (pStreamDS->Out.pDS != NULL)
     {
         DSLOG(("DSound: DirectSound instance already exists\n"));
@@ -482 +476 @@
 
     HRESULT hr = CoCreateInstance(CLSID_DirectSound8, NULL, CLSCTX_ALL,
-                                  IID_IDirectSound8, (void **)&pDSoundStream->pDS);
+                                  IID_IDirectSound8, (void **)&pStreamDS->Out.pDS);
     if (FAILED(hr))
     {
@@ -489 +483 @@
     else
     {
-        hr = IDirectSound8_Initialize(pDSoundStream->pDS, pThis->cfg.pGuidPlay);
+        hr = IDirectSound8_Initialize(pStreamDS->Out.pDS, pThis->cfg.pGuidPlay);
         if (SUCCEEDED(hr))
         {
             HWND hWnd = GetDesktopWindow();
-            hr = IDirectSound8_SetCooperativeLevel(pDSoundStream->pDS, hWnd, DSSCL_PRIORITY);
+            hr = IDirectSound8_SetCooperativeLevel(pStreamDS->Out.pDS, hWnd, DSSCL_PRIORITY);
             if (FAILED(hr))
                 DSLOGREL(("DSound: Setting cooperative level for window %p failed with %Rhrc\n", hWnd, hr));
@@ -505 +499 @@
                 DSLOGREL(("DSound: DirectSound playback initialization failed with %Rhrc\n", hr));
 
-            directSoundPlayInterfaceRelease(pDSoundStream);
+            directSoundPlayInterfaceRelease(pStreamDS);
         }
     }
@@ -513 +507 @@
 
 
-static HRESULT directSoundPlayClose(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
+static HRESULT directSoundPlayClose(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
     AssertPtrReturn(pThis, E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
-
-    DSLOG(("DSound: Closing playback stream %p, buffer %p\n", pDSoundStream, pDSoundStream->pDSB));
+    AssertPtrReturn(pStreamDS, E_POINTER);
+
+    DSLOG(("DSound: Closing playback stream %p, buffer %p\n", pStreamDS, pStreamDS->Out.pDSB));
 
     HRESULT hr = S_OK;
 
-    if (pDSoundStream->pDSB)
-    {
-        hr = IDirectSoundBuffer8_Stop(pDSoundStream->pDSB);
+    if (pStreamDS->Out.pDSB)
+    {
+        hr = IDirectSoundBuffer8_Stop(pStreamDS->Out.pDSB);
         if (SUCCEEDED(hr))
         {
@@ -536 +530 @@
                     pThis->cEvents--;
 
-                pThis->pDSStream = NULL;
+                pThis->pDSStrmOut = NULL;
             }
 
@@ -542 +536 @@
             AssertRC(rc2);
 #endif
-            IDirectSoundBuffer8_Release(pDSoundStream->pDSB);
-            pDSoundStream->pDSB = NULL;
+            IDirectSoundBuffer8_Release(pStreamDS->Out.pDSB);
+            pStreamDS->Out.pDSB = NULL;
         }
         else
-            DSLOGREL(("DSound: Stop playback stream %p when closing %Rhrc\n", pDSoundStream, hr));
+            DSLOGREL(("DSound: Stop playback stream %p when closing %Rhrc\n", pStreamDS, hr));
     }
 
     if (SUCCEEDED(hr))
-        directSoundPlayInterfaceRelease(pDSoundStream);
+        directSoundPlayInterfaceRelease(pStreamDS);
 
     return hr;
@@ -556 +550 @@
 
 
-static HRESULT directSoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
-{
-    AssertPtrReturn(pThis,         E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
-
-    DSLOG(("DSound: pDSoundStream=%p, cbBufferOut=%RU32, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
-           pDSoundStream,
-           pThis->cfg.cbBufferOut,
-           pDSoundStream->Props.uHz,
-           pDSoundStream->Props.cChannels,
-           pDSoundStream->Props.cBits,
-           pDSoundStream->Props.fSigned));
-
-    if (pDSoundStream->pDSB != NULL)
+static HRESULT directSoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
+                                   PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+    AssertPtrReturn(pCfgReq,   E_POINTER);
+    AssertPtrReturn(pCfgAcq,   E_POINTER);
+
+    DSLOG(("DSound: pStreamDS=%p, cbBufferOut=%RU32, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
+           pStreamDS, pThis->cfg.cbBufferOut,
+           pCfgReq->Props.uHz,
+           pCfgReq->Props.cChannels,
+           pCfgReq->Props.cBits,
+           pCfgReq->Props.fSigned));
+
+    if (pStreamDS->Out.pDSB != NULL)
     {
         /* Should not happen but be forgiving. */
         DSLOGREL(("DSound: Playback buffer already exists\n"));
-        directSoundPlayClose(pThis, pDSoundStream);
+        directSoundPlayClose(pThis, pStreamDS);
     }
 
     WAVEFORMATEX wfx;
-    int rc = dsoundWaveFmtFromCfg(&pDSoundStream->streamCfg, &wfx);
+    int rc = dsoundWaveFmtFromCfg(pCfgReq, &wfx);
     if (RT_FAILURE(rc))
         return E_INVALIDARG;
 
-    HRESULT hr = directSoundPlayInterfaceCreate(pThis, pDSoundStream);
+    HRESULT hr = directSoundPlayInterfaceCreate(pThis, pStreamDS);
     if (FAILED(hr))
         return hr;
@@ -611 +607 @@
         bd.dwBufferBytes = pThis->cfg.cbBufferOut;
 
-        hr = IDirectSound8_CreateSoundBuffer(pDSoundStream->pDS, &bd, &pDSB, NULL);
+        hr = IDirectSound8_CreateSoundBuffer(pStreamDS->Out.pDS, &bd, &pDSB, NULL);
         if (FAILED(hr))
         {
@@ -619 +615 @@
 
         /* "Upgrade" to IDirectSoundBuffer8 interface. */
-        hr = IDirectSoundBuffer_QueryInterface(pDSB, IID_IDirectSoundBuffer8, (PVOID *)&pDSoundStream->pDSB);
+        hr = IDirectSoundBuffer_QueryInterface(pDSB, IID_IDirectSoundBuffer8, (PVOID *)&pStreamDS->Out.pDSB);
         IDirectSoundBuffer_Release(pDSB);
         if (FAILED(hr))
@@ -630 +626 @@
          * Query the actual parameters.
          */
-        hr = IDirectSoundBuffer8_GetFormat(pDSoundStream->pDSB, &wfx, sizeof(wfx), NULL);
+        hr = IDirectSoundBuffer8_GetFormat(pStreamDS->Out.pDSB, &wfx, sizeof(wfx), NULL);
         if (FAILED(hr))
         {
@@ -640 +636 @@
         RT_ZERO(bc);
         bc.dwSize = sizeof(bc);
-        hr = IDirectSoundBuffer8_GetCaps(pDSoundStream->pDSB, &bc);
+        hr = IDirectSoundBuffer8_GetCaps(pStreamDS->Out.pDSB, &bc);
         if (FAILED(hr))
         {
@@ -667 +663 @@
                wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStream->Props.uAlign)
+        if (bc.dwBufferBytes & pStreamDS->uAlign)
             DSLOGREL(("DSound: Playback capabilities returned misaligned buffer: size %RU32, alignment %RU32\n",
-                      bc.dwBufferBytes, pDSoundStream->Props.uAlign + 1));
+                      bc.dwBufferBytes, pStreamDS->uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferOut)
@@ -680 +676 @@
          * playback buffer position.
          */
-        pDSoundStream->cbPlayBuf = bc.dwBufferBytes;
-        DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pDSoundStream->cbPlayBuf));
+        pStreamDS->Out.cbPlayBuf = bc.dwBufferBytes;
+        DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pStreamDS->Out.cbPlayBuf));
 
 #ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
@@ -698 +694 @@
 
         LPDIRECTSOUNDNOTIFY8 pNotify;
-        hr = IDirectSoundNotify_QueryInterface(pDSoundStream->pDSB, IID_IDirectSoundNotify8, (PVOID *)&pNotify);
+        hr = IDirectSoundNotify_QueryInterface(pStreamDS->Out.pDSB, IID_IDirectSoundNotify8, (PVOID *)&pNotify);
         if (SUCCEEDED(hr))
         {
@@ -718 +714 @@
             break;
 
-        pThis->pDSStreamOut = pDSoundStream;
+        pThis->pDSStrmOut = pStreamDS;
 
         Assert(pThis->cEvents < VBOX_DSOUND_MAX_EVENTS);
@@ -727 +723 @@
 
         /* Trigger the just installed output notification. */
-        hr = IDirectSoundBuffer8_Play(pDSoundStream->pDSB, 0, 0, 0);
+        hr = IDirectSoundBuffer8_Play(pStreamDS->Out.pDSB, 0, 0, 0);
+        if (FAILED(hr))
+            break;
 
 #endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
 
+        pCfgAcq->cSampleBufferHint = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, pThis->cfg.cbBufferOut);
+
     } while (0);
 
     if (FAILED(hr))
-        directSoundPlayClose(pThis, pDSoundStream);
+        directSoundPlayClose(pThis, pStreamDS);
 
     return hr;
@@ -740 +740 @@
 
 
-static void dsoundPlayClearSamples(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
-{
-    AssertPtrReturnVoid(pDSoundStream);
+static void dsoundPlayClearSamples(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturnVoid(pStreamDS);
+
+    AssertPtr(pStreamDS->pCfg);
+    PPDMAUDIOPCMPROPS pProps = &pStreamDS->pCfg->Props;
 
     PVOID pv1, pv2;
     DWORD cb1, cb2;
-    HRESULT hr = directSoundPlayLock(pThis, pDSoundStream->pDSB, &pDSoundStream->Props,
-                                     0 /* dwOffset */, pDSoundStream->cbPlayBuf,
+    HRESULT hr = directSoundPlayLock(pThis, pStreamDS,
+                                     0 /* dwOffset */, pStreamDS->Out.cbPlayBuf,
                                      &pv1, &pv2, &cb1, &cb2, DSBLOCK_ENTIREBUFFER);
     if (SUCCEEDED(hr))
     {
-        DWORD len1 = PDMAUDIOPCMPROPS_B2S(&pDSoundStream->Props, cb1);
-        DWORD len2 = PDMAUDIOPCMPROPS_B2S(&pDSoundStream->Props, cb2);
+        DWORD len1 = PDMAUDIOPCMPROPS_B2S(pProps, cb1);
+        DWORD len2 = PDMAUDIOPCMPROPS_B2S(pProps, cb2);
 
         if (pv1 && len1)
-            DrvAudioHlpClearBuf(&pDSoundStream->Props, pv1, cb1, len1);
+            DrvAudioHlpClearBuf(pProps, pv1, cb1, len1);
 
         if (pv2 && len2)
-            DrvAudioHlpClearBuf(&pDSoundStream->Props, pv2, cb2, len2);
-
-        directSoundPlayUnlock(pThis, pDSoundStream->pDSB, pv1, pv2, cb1, cb2);
+            DrvAudioHlpClearBuf(pProps, pv2, cb2, len2);
+
+        directSoundPlayUnlock(pThis, pStreamDS->Out.pDSB, pv1, pv2, cb1, cb2);
     }
 }
@@ -799 +802 @@
 
 
-static HRESULT directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
-{
-    AssertPtrReturn(pThis,         E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
+static HRESULT directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
 
     HRESULT hr;
 
-    if (pDSoundStream->pDSB != NULL)
+    if (pStreamDS->Out.pDSB != NULL)
     {
         DSLOG(("DSound: Stopping playback\n"));
 
-        HRESULT hr2 = IDirectSoundBuffer8_Stop(pDSoundStream->pDSB);
+        HRESULT hr2 = IDirectSoundBuffer8_Stop(pStreamDS->Out.pDSB);
         if (FAILED(hr2))
         {
-            hr2 = directSoundPlayRestore(pThis, pDSoundStream->pDSB);
+            hr2 = directSoundPlayRestore(pThis, pStreamDS->Out.pDSB);
             if (FAILED(hr2))
-                hr2 = IDirectSoundBuffer8_Stop(pDSoundStream->pDSB);
+                hr2 = IDirectSoundBuffer8_Stop(pStreamDS->Out.pDSB);
         }
 
@@ -828 +831 @@
     if (SUCCEEDED(hr))
     {
-        dsoundPlayClearSamples(pThis, pDSoundStream);
-        pDSoundStream->fEnabled = false;
+        dsoundPlayClearSamples(pThis, pStreamDS);
+        pStreamDS->Out.fEnabled = false;
     }
     else
@@ -838 +841 @@
 
 
-static HRESULT directSoundPlayStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStream)
+static HRESULT directSoundPlayStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
     AssertPtrReturn(pThis,         E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
 
     HRESULT hr;
-    if (pDSoundStream->pDSB != NULL)
+    if (pStreamDS->Out.pDSB != NULL)
     {
         DWORD dwStatus;
-        hr = directSoundPlayGetStatus(pThis, pDSoundStream->pDSB, &dwStatus);
+        hr = directSoundPlayGetStatus(pThis, pStreamDS->Out.pDSB, &dwStatus);
         if (SUCCEEDED(hr))
         {
@@ -856 +859 @@
             else
             {
-                dsoundPlayClearSamples(pThis, pDSoundStream);
-
-                pDSoundStream->fRestartPlayback = true;
-                pDSoundStream->fEnabled         = true;
+                dsoundPlayClearSamples(pThis, pStreamDS);
+
+                pStreamDS->Out.fRestartPlayback = true;
+                pStreamDS->Out.fEnabled         = true;
 
                 DSLOG(("DSound: Playback started\n"));
@@ -883 +886 @@
  */
 
-static LPCGUID dsoundCaptureSelectDevice(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStream)
-{
-    AssertPtrReturn(pThis, NULL);
-    AssertPtrReturn(pDSoundStream, NULL);
+static LPCGUID dsoundCaptureSelectDevice(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturn(pThis,     NULL);
+    AssertPtrReturn(pStreamDS, NULL);
 
     int rc = VINF_SUCCESS;
@@ -895 +898 @@
         PDSOUNDDEV pDev = NULL;
 
-        switch (pDSoundStream->enmRecSource)
+        switch (pStreamDS->pCfg->DestSource.Source)
         {
             case PDMAUDIORECSOURCE_LINE:
@@ -909 +912 @@
                 RTListForEach(&pThis->lstDevInput, pDev, DSOUNDDEV, Node)
                 {
-                    if (RTStrIStr(pDev->pszName, "Mic")) /** @todo what is with non en_us windows versions? */
+                    if (RTStrIStr(pDev->pszName, "Mic")) /** @todo What is with non en_us windows versions? */
                         break;
                 }
@@ -928 +931 @@
         {
             DSLOG(("DSound: Guest source '%s' is using host recording device '%s'\n",
-                   DrvAudioHlpRecSrcToStr(pDSoundStream->enmRecSource), pDev->pszName));
+                   DrvAudioHlpRecSrcToStr(pStreamDS->pCfg->DestSource.Source), pDev->pszName));
 
             pGUID = &pDev->Guid;
@@ -944 +947 @@
     /* This always has to be in the release log. */
     LogRel(("DSound: Guest source '%s' is using host recording device with GUID '%s'\n",
-            DrvAudioHlpRecSrcToStr(pDSoundStream->enmRecSource), pszGUID ? pszGUID: "{?}"));
+            DrvAudioHlpRecSrcToStr(pStreamDS->pCfg->DestSource.Source), pszGUID ? pszGUID: "{?}"));
 
     if (pszGUID)
@@ -956 +959 @@
 
 
-static void directSoundCaptureInterfaceRelease(PDSOUNDSTREAMIN pDSoundStream)
-{
-    if (pDSoundStream->pDSC)
+static void directSoundCaptureInterfaceRelease(PDSOUNDSTREAM pStreamDS)
+{
+    if (pStreamDS->In.pDSC)
     {
         LogFlowFuncEnter();
-        IDirectSoundCapture_Release(pDSoundStream->pDSC);
-        pDSoundStream->pDSC = NULL;
-    }
-}
-
-
-static HRESULT directSoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStream)
-{
-    if (pDSoundStream->pDSC != NULL)
+        IDirectSoundCapture_Release(pStreamDS->In.pDSC);
+        pStreamDS->In.pDSC = NULL;
+    }
+}
+
+
+static HRESULT directSoundCaptureInterfaceCreate(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    if (pStreamDS->In.pDSC != NULL)
     {
         DSLOG(("DSound: DirectSoundCapture instance already exists\n"));
@@ -976 +979 @@
 
     HRESULT hr = CoCreateInstance(CLSID_DirectSoundCapture8, NULL, CLSCTX_ALL,
-                                  IID_IDirectSoundCapture8, (void **)&pDSoundStream->pDSC);
+                                  IID_IDirectSoundCapture8, (void **)&pStreamDS->In.pDSC);
     if (FAILED(hr))
     {
@@ -983 +986 @@
     else
     {
-        LPCGUID pGUID = dsoundCaptureSelectDevice(pThis, pDSoundStream);
-        hr = IDirectSoundCapture_Initialize(pDSoundStream->pDSC, pGUID);
+        LPCGUID pGUID = dsoundCaptureSelectDevice(pThis, pStreamDS);
+        hr = IDirectSoundCapture_Initialize(pStreamDS->In.pDSC, pGUID);
         if (FAILED(hr))
         {
@@ -992 +995 @@
                 DSLOGREL(("DSound: Initializing capturing device failed with %Rhrc\n", hr));
 
-            directSoundCaptureInterfaceRelease(pDSoundStream);
+            directSoundCaptureInterfaceRelease(pStreamDS);
         }
     }
@@ -1001 +1004 @@
 
 
-static HRESULT directSoundCaptureClose(PDSOUNDSTREAMIN pDSoundStream)
-{
-    AssertPtrReturn(pDSoundStream, E_POINTER);
-
-    DSLOG(("DSound: pDSoundStream=%p, pDSCB=%p\n", pDSoundStream, pDSoundStream->pDSCB));
+static HRESULT directSoundCaptureClose(PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturn(pStreamDS, E_POINTER);
+
+    DSLOG(("DSound: pStreamDS=%p, pDSCB=%p\n", pStreamDS, pStreamDS->In.pDSCB));
 
     HRESULT hr = S_OK;
 
-    if (pDSoundStream->pDSCB)
-    {
-        hr = IDirectSoundCaptureBuffer_Stop(pDSoundStream->pDSCB);
+    if (pStreamDS->In.pDSCB)
+    {
+        hr = IDirectSoundCaptureBuffer_Stop(pStreamDS->In.pDSCB);
         if (SUCCEEDED(hr))
         {
-            IDirectSoundCaptureBuffer8_Release(pDSoundStream->pDSCB);
-            pDSoundStream->pDSCB = NULL;
+            IDirectSoundCaptureBuffer8_Release(pStreamDS->In.pDSCB);
+            pStreamDS->In.pDSCB = NULL;
         }
         else
@@ -1022 +1025 @@
 
     if (SUCCEEDED(hr))
-        directSoundCaptureInterfaceRelease(pDSoundStream);
+        directSoundCaptureInterfaceRelease(pStreamDS);
 
     LogFlowFunc(("Returning %Rhrc\n", hr));
@@ -1029 +1032 @@
 
 
-static HRESULT directSoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStream)
-{
-    AssertPtrReturn(pThis, E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
-
-    DSLOG(("DSound: pDSoundStream=%p, cbBufferIn=%RU32, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
-           pDSoundStream,
+static HRESULT directSoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
+                                      PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+    AssertPtrReturn(pCfgReq,   E_POINTER);
+    AssertPtrReturn(pCfgAcq,   E_POINTER);
+
+    DSLOG(("DSound: pStreamDS=%p, cbBufferIn=%RU32, uHz=%RU32, cChannels=%RU8, cBits=%RU8, fSigned=%RTbool\n",
+           pStreamDS,
            pThis->cfg.cbBufferIn,
-           pDSoundStream->Props.uHz,
-           pDSoundStream->Props.cChannels,
-           pDSoundStream->Props.cBits,
-           pDSoundStream->Props.fSigned));
-
-    if (pDSoundStream->pDSCB != NULL)
+           pCfgReq->Props.uHz,
+           pCfgReq->Props.cChannels,
+           pCfgReq->Props.cBits,
+           pCfgReq->Props.fSigned));
+
+    if (pStreamDS->In.pDSCB != NULL)
     {
         /* Should not happen but be forgiving. */
         DSLOGREL(("DSound: DirectSoundCaptureBuffer already exists\n"));
-        directSoundCaptureClose(pDSoundStream);
+        directSoundCaptureClose(pStreamDS);
     }
 
     WAVEFORMATEX wfx;
-    int rc = dsoundWaveFmtFromCfg(&pDSoundStream->streamCfg, &wfx);
+    int rc = dsoundWaveFmtFromCfg(pCfgReq, &wfx);
     if (RT_FAILURE(rc))
         return E_INVALIDARG;
 
-    HRESULT hr = directSoundCaptureInterfaceCreate(pThis, pDSoundStream);
+    HRESULT hr = directSoundCaptureInterfaceCreate(pThis, pStreamDS);
     if (FAILED(hr))
         return hr;
@@ -1061 +1067 @@
     {
         LPDIRECTSOUNDCAPTUREBUFFER pDSCB = NULL;
+
         DSCBUFFERDESC bd;
         RT_ZERO(bd);
-        bd.dwSize = sizeof(bd);
-        bd.lpwfxFormat = &wfx;
+
+        bd.dwSize        = sizeof(bd);
+        bd.lpwfxFormat   = &wfx;
         bd.dwBufferBytes = pThis->cfg.cbBufferIn;
-        hr = IDirectSoundCapture_CreateCaptureBuffer(pDSoundStream->pDSC,
-                                                     &bd, &pDSCB, NULL);
+
+        hr = IDirectSoundCapture_CreateCaptureBuffer(pStreamDS->In.pDSC, &bd, &pDSCB, NULL);
         if (FAILED(hr))
         {
@@ -1079 +1087 @@
         }
 
-        hr = IDirectSoundCaptureBuffer_QueryInterface(pDSCB, IID_IDirectSoundCaptureBuffer8, (void **)&pDSoundStream->pDSCB);
+        hr = IDirectSoundCaptureBuffer_QueryInterface(pDSCB, IID_IDirectSoundCaptureBuffer8, (void **)&pStreamDS->In.pDSCB);
         IDirectSoundCaptureBuffer_Release(pDSCB);
         if (FAILED(hr))
@@ -1091 +1099 @@
          */
         DWORD offByteReadPos = 0;
-        hr = IDirectSoundCaptureBuffer8_GetCurrentPosition(pDSoundStream->pDSCB, NULL, &offByteReadPos);
+        hr = IDirectSoundCaptureBuffer8_GetCurrentPosition(pStreamDS->In.pDSCB, NULL, &offByteReadPos);
         if (FAILED(hr))
         {
@@ -1099 +1107 @@
 
         RT_ZERO(wfx);
-        hr = IDirectSoundCaptureBuffer8_GetFormat(pDSoundStream->pDSCB, &wfx, sizeof(wfx), NULL);
+        hr = IDirectSoundCaptureBuffer8_GetFormat(pStreamDS->In.pDSCB, &wfx, sizeof(wfx), NULL);
         if (FAILED(hr))
         {
@@ -1109 +1117 @@
         RT_ZERO(bc);
         bc.dwSize = sizeof(bc);
-        hr = IDirectSoundCaptureBuffer8_GetCaps(pDSoundStream->pDSCB, &bc);
+        hr = IDirectSoundCaptureBuffer8_GetCaps(pStreamDS->In.pDSCB, &bc);
         if (FAILED(hr))
         {
@@ -1136 +1144 @@
                wfx.cbSize));
 
-        if (bc.dwBufferBytes & pDSoundStream->Props.uAlign)
+        if (bc.dwBufferBytes & pStreamDS->uAlign)
             DSLOGREL(("DSound: Capture GetCaps returned misaligned buffer: size %RU32, alignment %RU32\n",
-                      bc.dwBufferBytes, pDSoundStream->Props.uAlign + 1));
+                      bc.dwBufferBytes, pStreamDS->uAlign + 1));
 
         if (bc.dwBufferBytes != pThis->cfg.cbBufferIn)
@@ -1145 +1153 @@
 
         /* Initial state: reading at the initial capture position, no error. */
-        pDSoundStream->offCaptureBufRead = offByteReadPos;
-        pDSoundStream->cbCaptureBuf      = bc.dwBufferBytes;
-
-        pDSoundStream->hrLastCapture     = S_OK;
+        pStreamDS->In.offCaptureBufRead = offByteReadPos;
+        pStreamDS->In.cbCaptureBuf      = bc.dwBufferBytes;
+
+        pStreamDS->In.hrLastCapture     = S_OK;
 
         DSLOG(("DSound: offCaptureBufRead=%RU32, cbCaptureBuf=%RU32\n",
-               pDSoundStream->offCaptureBufRead, pDSoundStream->cbCaptureBuf));
+               pStreamDS->In.offCaptureBufRead, pStreamDS->In.cbCaptureBuf));
+
+        pCfgAcq->cSampleBufferHint = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, pThis->cfg.cbBufferIn);
 
     } while (0);
 
     if (FAILED(hr))
-        directSoundCaptureClose(pDSoundStream);
+        directSoundCaptureClose(pStreamDS);
 
     LogFlowFunc(("Returning %Rhrc\n", hr));
@@ -1163 +1173 @@
 
 
-static HRESULT directSoundCaptureStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStream)
-{
-    AssertPtrReturn(pThis        , E_POINTER);
-    AssertPtrReturn(pDSoundStream, E_POINTER);
-
-    NOREF(pThis);
+static HRESULT directSoundCaptureStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+
+    RT_NOREF(pThis);
 
     HRESULT hr;
 
-    if (pDSoundStream->pDSCB)
+    if (pStreamDS->In.pDSCB)
     {
         DSLOG(("DSound: Stopping capture\n"));
 
-        hr = IDirectSoundCaptureBuffer_Stop(pDSoundStream->pDSCB);
+        hr = IDirectSoundCaptureBuffer_Stop(pStreamDS->In.pDSCB);
         if (FAILED(hr))
             DSLOGREL(("DSound: Stopping capture buffer failed with %Rhrc\n", hr));
@@ -1184 +1194 @@
 
     if (SUCCEEDED(hr))
-        pDSoundStream->fEnabled = false;
+        pStreamDS->In.fEnabled = false;
 
     LogFlowFunc(("Returning %Rhrc\n", hr));
@@ -1191 +1201 @@
 
 
-static HRESULT directSoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMIN pDSoundStream)
-{
-    AssertPtrReturn(pThis,         VERR_INVALID_POINTER);
-    AssertPtrReturn(pDSoundStream, VERR_INVALID_POINTER);
+static HRESULT directSoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
+{
+    AssertPtrReturn(pThis,     VERR_INVALID_POINTER);
+    AssertPtrReturn(pStreamDS, VERR_INVALID_POINTER);
 
     HRESULT hr;
-    if (pDSoundStream->pDSCB != NULL)
+    if (pStreamDS->In.pDSCB != NULL)
     {
         DWORD dwStatus;
-        hr = IDirectSoundCaptureBuffer8_GetStatus(pDSoundStream->pDSCB, &dwStatus);
+        hr = IDirectSoundCaptureBuffer8_GetStatus(pStreamDS->In.pDSCB, &dwStatus);
         if (FAILED(hr))
         {
@@ -1218 +1228 @@
 #endif
                 DSLOG(("DSound: Starting to capture\n"));
-                hr = IDirectSoundCaptureBuffer8_Start(pDSoundStream->pDSCB, fFlags);
+                hr = IDirectSoundCaptureBuffer8_Start(pStreamDS->In.pDSCB, fFlags);
                 if (FAILED(hr))
                     DSLOGREL(("DSound: Starting to capture failed with %Rhrc\n", hr));
@@ -1228 +1238 @@
 
     if (SUCCEEDED(hr))
-        pDSoundStream->fEnabled = true;
+        pStreamDS->In.fEnabled = true;
 
     LogFlowFunc(("Returning %Rhrc\n", hr));
@@ -1402 +1412 @@
     RT_ZERO(Cfg);
 
-    Cfg.cbStreamOut     = sizeof(DSOUNDSTREAMOUT);
-    Cfg.cbStreamIn      = sizeof(DSOUNDSTREAMIN);
+    Cfg.cbStreamOut = sizeof(DSOUNDSTREAM);
+    Cfg.cbStreamIn  = sizeof(DSOUNDSTREAM);
 
     DSOUNDENUMCBCTX cbCtx = { pThis, fEnum, 0, 0 };
@@ -1439 +1449 @@
 
 
-static int dsoundCreateStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAM pStream,
+static int dsoundCreateStreamOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
                                  PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    LogFlowFunc(("pStream=%p, pCfg=%p\n", pStream, pCfgReq));
-    PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
-
-    pDSoundStream->streamCfg = *pCfgReq;
-    pDSoundStream->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
-
-    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pDSoundStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        pDSoundStream->pDS = NULL;
-        pDSoundStream->pDSB = NULL;
-        pDSoundStream->offPlayWritePos = 0;
-        pDSoundStream->fRestartPlayback = true;
-        pDSoundStream->cbPlayBuf = 0;
-
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = pThis->cfg.cbBufferOut >> pDSoundStream->Props.cShift;
-
-        /* Try to open playback in case the device is already there. */
-        directSoundPlayOpen(pThis, pDSoundStream);
-    }
-    else
-        RT_ZERO(pDSoundStream->streamCfg);
+    LogFlowFunc(("pStreamDS=%p, pCfgReq=%p\n", pStreamDS, pCfgReq));
+
+    pStreamDS->Out.pDS = NULL;
+    pStreamDS->Out.pDSB = NULL;
+    pStreamDS->Out.offPlayWritePos = 0;
+    pStreamDS->Out.fRestartPlayback = true;
+    pStreamDS->Out.cbPlayBuf = 0;
+
+    int rc = VINF_SUCCESS;
+
+    /* Try to open playback in case the device is already there. */
+    HRESULT hr = directSoundPlayOpen(pThis, pStreamDS, pCfgReq, pCfgAcq);
+    if (FAILED(hr))
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
 
     LogFlowFuncLeaveRC(rc);
@@ -1470 +1471 @@
 }
 
-static int dsoundControlStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    LogFlowFunc(("pStream=%p, cmd=%d\n", pStream, enmStreamCmd));
-    PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
+static int dsoundControlStreamOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
+    LogFlowFunc(("pStreamDS=%p, cmd=%d\n", pStreamDS, enmStreamCmd));
 
     int rc = VINF_SUCCESS;
@@ -1485 +1485 @@
             DSLOG(("DSound: Playback PDMAUDIOSTREAMCMD_ENABLE\n"));
             /* Try to start playback. If it fails, then reopen and try again. */
-            hr = directSoundPlayStart(pThis, pDSoundStream);
+            hr = directSoundPlayStart(pThis, pStreamDS);
             if (FAILED(hr))
             {
-                hr = directSoundPlayClose(pThis, pDSoundStream);
+                hr = directSoundPlayClose(pThis, pStreamDS);
                 if (SUCCEEDED(hr))
-                    hr = directSoundPlayOpen(pThis, pDSoundStream);
+                {
+                    PDMAUDIOSTREAMCFG CfgAcq;
+                    hr = directSoundPlayOpen(pThis, pStreamDS, pStreamDS->pCfg /* pCfqReq */, &CfgAcq);
+                    if (SUCCEEDED(hr))
+                    {
+                        DrvAudioHlpStreamCfgFree(pStreamDS->pCfg);
+
+                        pStreamDS->pCfg = DrvAudioHlpStreamCfgDup(&CfgAcq);
+                        AssertPtr(pStreamDS->pCfg);
+
+                        /** @todo What to do if the format has changed? */
+                    }
+                }
                 if (SUCCEEDED(hr))
-                    hr = directSoundPlayStart(pThis, pDSoundStream);
+                    hr = directSoundPlayStart(pThis, pStreamDS);
             }
 
@@ -1504 +1516 @@
         {
             DSLOG(("DSound: Playback PDMAUDIOSTREAMCMD_DISABLE\n"));
-            hr = directSoundPlayStop(pThis, pDSoundStream);
+            hr = directSoundPlayStop(pThis, pStreamDS);
             if (FAILED(hr))
                 rc = VERR_NOT_SUPPORTED;
@@ -1527 +1539 @@
  */
 int drvHostDSoundStreamPlay(PPDMIHOSTAUDIO pInterface,
-                            PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+                            PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1535 +1547 @@
     /* pcbRead is optional. */
 
-    PDRVHOSTDSOUND   pThis         = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
-    PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -1548 +1560 @@
     do /* to use 'break' */
     {
+        AssertPtr(pStreamDS->pCfg);
+        PPDMAUDIOPCMPROPS pProps = &pStreamDS->pCfg->Props;
+
         DWORD cbBuffer, cbFree, cbPlayPos;
-        rc = dsoundGetPosOut(pThis, pDSoundStream, &cbBuffer, &cbFree, &cbPlayPos);
+        rc = dsoundGetPosOut(pThis, pStreamDS, &cbBuffer, &cbFree, &cbPlayPos);
         if (RT_FAILURE(rc))
             break;
@@ -1557 +1572 @@
          * i.e. always leave a free space for 1 audio sample.
          */
-        const DWORD cbSample = PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, 1);
+        const DWORD cbSample = PDMAUDIOPCMPROPS_S2B(pProps, 1);
         if (cbFree <= cbSample)
             break;
@@ -1566 +1581 @@
         /* Do not write more than available space in the DirectSound playback buffer. */
         cbLive = RT_MIN(cbFree, cbLive);
-        cbLive &= ~pDSoundStream->Props.uAlign;
+        cbLive &= ~pStreamDS->uAlign;
         if (cbLive == 0 || cbLive > cbBuffer)
         {
             DSLOG(("DSound: cbLive=%RU32, cbBuffer=%ld, offPlayWritePos=%ld, cbPlayPos=%ld\n",
-                   cbLive, cbBuffer, pDSoundStream->offPlayWritePos, cbPlayPos));
-            break;
-        }
-
-        LPDIRECTSOUNDBUFFER8 pDSB = pDSoundStream->pDSB;
+                   cbLive, cbBuffer, pStreamDS->Out.offPlayWritePos, cbPlayPos));
+            break;
+        }
+
+        LPDIRECTSOUNDBUFFER8 pDSB = pStreamDS->Out.pDSB;
         AssertPtr(pDSB);
 
         PVOID pv1, pv2;
         DWORD cb1, cb2;
-        HRESULT hr = directSoundPlayLock(pThis, pDSB, &pDSoundStream->Props, pDSoundStream->offPlayWritePos, cbLive,
+        HRESULT hr = directSoundPlayLock(pThis, pStreamDS, pStreamDS->Out.offPlayWritePos, cbLive,
                                          &pv1, &pv2, &cb1, &cb2, 0 /* dwFlags */);
         if (FAILED(hr))
@@ -1603 +1618 @@
         directSoundPlayUnlock(pThis, pDSB, pv1, pv2, cb1, cb2);
 
-        pDSoundStream->offPlayWritePos = (pDSoundStream->offPlayWritePos + PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, cbWrittenTotal))
+        pStreamDS->Out.offPlayWritePos = (pStreamDS->Out.offPlayWritePos + PDMAUDIOPCMPROPS_S2B(pProps, cbWrittenTotal))
                                        % cbBuffer;
 
         DSLOGF(("DSound: %RU32/%RU32, buffer write pos %ld, rc=%Rrc\n",
-                PDMAUDIOPCMPROPS_S2B(&pDSoundStream->Props, cbWrittenTotal), cbLive,
-                pDSoundStream->offPlayWritePos, rc));
-
-        if (pDSoundStream->fRestartPlayback)
+                PDMAUDIOPCMPROPS_S2B(pProps, cbWrittenTotal), cbLive, pStreamDS->Out.offPlayWritePos, rc));
+
+        if (pStreamDS->Out.fRestartPlayback)
         {
             /*
@@ -1617 +1631 @@
              * and it can start playing.
              */
-            pDSoundStream->fRestartPlayback = false;
+            pStreamDS->Out.fRestartPlayback = false;
 
             DWORD fFlags = 0;
@@ -1625 +1639 @@
             for (unsigned i = 0; i < DRV_DSOUND_RESTORE_ATTEMPTS_MAX; i++)
             {
-                hr = IDirectSoundBuffer8_Play(pDSoundStream->pDSB, 0, 0, fFlags);
+                hr = IDirectSoundBuffer8_Play(pStreamDS->Out.pDSB, 0, 0, fFlags);
                 if (   SUCCEEDED(hr)
                     || hr != DSERR_BUFFERLOST)
@@ -1632 +1646 @@
                 {
                     LogFlowFunc(("Restarting playback failed due to lost buffer, restoring ...\n"));
-                    directSoundPlayRestore(pThis, pDSoundStream->pDSB);
+                    directSoundPlayRestore(pThis, pStreamDS->Out.pDSB);
                 }
             }
@@ -1646 +1660 @@
     } while (0);
 
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        if (pcbWritten)
+            *pcbWritten = cbWrittenTotal;
+    }
+    else
         dsoundUpdateStatusInternal(pThis);
-    else if (pcbWritten)
-        *pcbWritten = cbWrittenTotal;
 
     return rc;
@@ -1655 +1672 @@
 
 
-static int dsoundDestroyStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAM pStream)
-{
-    PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
-
-    directSoundPlayClose(pThis, pDSoundStream);
-
-    pDSoundStream->offPlayWritePos  = 0;
-    pDSoundStream->fRestartPlayback = true;
-    pDSoundStream->cbPlayBuf        = 0;
-
-    RT_ZERO(pDSoundStream->streamCfg);
+static int dsoundDestroyStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream;
+
+    directSoundPlayClose(pThis, pStreamDS);
+
+    pStreamDS->Out.offPlayWritePos  = 0;
+    pStreamDS->Out.fRestartPlayback = true;
+    pStreamDS->Out.cbPlayBuf        = 0;
 
     return VINF_SUCCESS;
 }
 
-static int dsoundCreateStreamIn(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAM pStream,
+static int dsoundCreateStreamIn(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
                                 PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    PDSOUNDSTREAMIN pDSoundStream = (PDSOUNDSTREAMIN)pStream;
-
-    LogFlowFunc(("pStream=%p, pCfg=%p, enmRecSource=%ld\n", pStream, pCfgReq, pCfgReq->DestSource.Source));
-
-    memcpy(&pDSoundStream->streamCfg, pCfgReq, sizeof(PDMAUDIOSTREAMCFG));
-
-    /** @todo caller should already init Props? */
-    int rc = DrvAudioHlpStreamCfgToProps(&pDSoundStream->streamCfg, &pDSoundStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        /* Init the stream structure and save relevant information to it. */
-        pDSoundStream->offCaptureBufRead = 0;
-        pDSoundStream->cbCaptureBuf      = 0;
-        pDSoundStream->pDSC              = NULL;
-        pDSoundStream->pDSCB             = NULL;
-        pDSoundStream->enmRecSource      = pCfgReq->DestSource.Source;
-        pDSoundStream->hrLastCapture     = S_OK;
-
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = pThis->cfg.cbBufferIn >> pDSoundStream->Props.cShift;
-
-        /* Try to open capture in case the device is already there. */
-        directSoundCaptureOpen(pThis, pDSoundStream); /** @todo r=andy Why not checking the result here?? */
-    }
-    else
-    {
-        RT_ZERO(pDSoundStream->streamCfg);
-    }
-
-    LogFlowFuncLeaveRC(rc);
+    LogFunc(("pStreamDS=%p, pCfgReq=%p, enmRecSource=%s\n",
+             pStreamDS, pCfgReq, DrvAudioHlpRecSrcToStr(pCfgReq->DestSource.Source)));
+
+    /* Init the stream structure and save relevant information to it. */
+    pStreamDS->In.offCaptureBufRead = 0;
+    pStreamDS->In.cbCaptureBuf      = 0;
+    pStreamDS->In.pDSC              = NULL;
+    pStreamDS->In.pDSCB             = NULL;
+    pStreamDS->In.hrLastCapture     = S_OK;
+
+    int rc = VINF_SUCCESS;
+
+    /* Try to open capture in case the device is already there. */
+    HRESULT hr = directSoundCaptureOpen(pThis, pStreamDS, pCfgReq, pCfgAcq);
+    if (FAILED(hr))
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+
     return rc;
 }
 
-static int dsoundControlStreamIn(PDRVHOSTDSOUND pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    LogFlowFunc(("pStream=%p, enmStreamCmd=%ld\n", pStream, enmStreamCmd));
-    PDSOUNDSTREAMIN pDSoundStream = (PDSOUNDSTREAMIN)pStream;
+static int dsoundControlStreamIn(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
+    LogFlowFunc(("pStreamDS=%p, enmStreamCmd=%ld\n", pStreamDS, enmStreamCmd));
 
     int rc = VINF_SUCCESS;
@@ -1720 +1721 @@
         {
             /* Try to start capture. If it fails, then reopen and try again. */
-            hr = directSoundCaptureStart(pThis, pDSoundStream);
+            hr = directSoundCaptureStart(pThis, pStreamDS);
             if (FAILED(hr))
             {
-                hr = directSoundCaptureClose(pDSoundStream);
+                hr = directSoundCaptureClose(pStreamDS);
                 if (SUCCEEDED(hr))
                 {
-                    hr = directSoundCaptureOpen(pThis, pDSoundStream);
+                    PDMAUDIOSTREAMCFG CfgAcq;
+                    hr = directSoundCaptureOpen(pThis, pStreamDS, pStreamDS->pCfg /* pCfgReq */, &CfgAcq);
                     if (SUCCEEDED(hr))
-                        hr = directSoundCaptureStart(pThis, pDSoundStream);
+                    {
+                        DrvAudioHlpStreamCfgFree(pStreamDS->pCfg);
+
+                        pStreamDS->pCfg = DrvAudioHlpStreamCfgDup(&CfgAcq);
+                        AssertPtr(pStreamDS->pCfg);
+
+                        /** @todo What to do if the format has changed? */
+
+                        hr = directSoundCaptureStart(pThis, pStreamDS);
+                    }
                 }
             }
@@ -1740 +1751 @@
         case PDMAUDIOSTREAMCMD_PAUSE:
         {
-            hr = directSoundCaptureStop(pThis, pDSoundStream);
+            hr = directSoundCaptureStop(pThis, pStreamDS);
             if (FAILED(hr))
                 rc = VERR_NOT_SUPPORTED;
@@ -1762 +1773 @@
  */
 int drvHostDSoundStreamCapture(PPDMIHOSTAUDIO pInterface,
-                               PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                               PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
 
@@ -1770 +1781 @@
     AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
-
-    PDSOUNDSTREAMIN             pDSoundStream = (PDSOUNDSTREAMIN)pStream;
-    LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB         = pDSoundStream->pDSCB;
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
+
+    LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB = pStreamDS->In.pDSCB;
+    AssertPtr(pDSCB);
 
     int rc = VINF_SUCCESS;
@@ -1792 +1804 @@
         if (FAILED(hr))
         {
-            if (hr != pDSoundStream->hrLastCapture)
+            if (hr != pStreamDS->In.hrLastCapture)
             {
                 DSLOGREL(("DSound: Getting capture position failed with %Rhrc\n", hr));
-                pDSoundStream->hrLastCapture = hr;
+                pStreamDS->In.hrLastCapture = hr;
             }
 
@@ -1802 +1814 @@
         }
 
-        pDSoundStream->hrLastCapture = hr;
-
-        if (offCurPos & pDSoundStream->Props.uAlign)
-            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n", offCurPos, pDSoundStream->Props.uAlign));
+        pStreamDS->In.hrLastCapture = hr;
+
+        if (offCurPos & pStreamDS->uAlign)
+            DSLOGF(("DSound: Misaligned capture read position %ld (alignment: %RU32)\n",
+                    offCurPos, pStreamDS->uAlign + 1));
 
         /* Number of samples available in the DirectSound capture buffer. */
-        DWORD cbToCapture = dsoundRingDistance(offCurPos, pDSoundStream->offCaptureBufRead, pDSoundStream->cbCaptureBuf);
+        DWORD cbToCapture = dsoundRingDistance(offCurPos, pStreamDS->In.offCaptureBufRead, pStreamDS->In.cbCaptureBuf);
         if (cbToCapture == 0)
             break;
@@ -1819 +1832 @@
 
         DSLOGF(("DSound: Capture cbBuf=%RU32, offCurPos=%ld, offCaptureBufRead=%ld, cbToCapture=%ld\n",
-                cbBuf, offCurPos, pDSoundStream->offCaptureBufRead, cbToCapture));
+                cbBuf, offCurPos, pStreamDS->In.offCaptureBufRead, cbToCapture));
 
         /* No need to fetch more samples than mix buffer can receive. */
@@ -1827 +1840 @@
         PVOID pv1, pv2;
         DWORD cb1, cb2;
-        hr = directSoundCaptureLock(pDSCB, &pDSoundStream->Props,
-                                    pDSoundStream->offCaptureBufRead, /* dwOffset */
+        hr = directSoundCaptureLock(pDSCB, &pStreamDS->pCfg->Props,
+                                    pStreamDS->In.offCaptureBufRead,  /* dwOffset */
                                     cbToCapture,                      /* dwBytes */
                                     &pv1, &pv2, &cb1, &cb2,
@@ -1854 +1867 @@
         if (RT_SUCCESS(rc))
         {
-            pDSoundStream->offCaptureBufRead = (pDSoundStream->offCaptureBufRead + cbReadTotal)
-                                             % pDSoundStream->cbCaptureBuf;
+            pStreamDS->In.offCaptureBufRead = (pStreamDS->In.offCaptureBufRead + cbReadTotal)
+                                            % pStreamDS->In.cbCaptureBuf;
             DSLOGF(("DSound: Captured %ld bytes (%RU32 total)\n", cbToCapture, cbReadTotal));
         }
@@ -1872 +1885 @@
 }
 
-static int dsoundDestroyStreamIn(PPDMAUDIOSTREAM pStream)
-{
-    PDSOUNDSTREAMIN pDSoundStream = (PDSOUNDSTREAMIN)pStream;
-
-    directSoundCaptureClose(pDSoundStream);
-
-    pDSoundStream->offCaptureBufRead = 0;
-    pDSoundStream->cbCaptureBuf      = 0;
-
-    RT_ZERO(pDSoundStream->streamCfg);
+static int dsoundDestroyStreamIn(PDSOUNDSTREAM pStreamDS)
+{
+    directSoundCaptureClose(pStreamDS);
+
+    pStreamDS->In.offCaptureBufRead = 0;
+    pStreamDS->In.cbCaptureBuf      = 0;
 
     return VINF_SUCCESS;
@@ -2156 +2165 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostDSoundStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostDSoundStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                   PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -2163 +2173 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
 
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = dsoundCreateStreamIn(pThis,  pStream, pCfgReq, pCfgAcq);
+        rc = dsoundCreateStreamIn(pThis,  pStreamDS, pCfgReq, pCfgAcq);
     else
-        rc = dsoundCreateStreamOut(pThis, pStream, pCfgReq, pCfgAcq);
+        rc = dsoundCreateStreamOut(pThis, pStreamDS, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamDS->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamDS->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
 
     return rc;
@@ -2178 +2196 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostDSoundStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostDSoundStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
+
+    if (!pStreamDS->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = dsoundDestroyStreamIn(pStream);
+    if (pStreamDS->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = dsoundDestroyStreamIn(pStreamDS);
     else
-        rc = dsoundDestroyStreamOut(pThis, pStream);
+        rc = dsoundDestroyStreamOut(pThis, pStreamDS);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamDS->pCfg);
+        pStreamDS->pCfg = NULL;
+    }
 
     return rc;
@@ -2198 +2226 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostDSoundStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHostDSoundStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                    PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
+
+    if (!pStreamDS->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = dsoundControlStreamIn(pThis,  pStream, enmStreamCmd);
+    if (pStreamDS->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = dsoundControlStreamIn(pThis,  pStreamDS, enmStreamCmd);
     else
-        rc = dsoundControlStreamOut(pThis, pStream, enmStreamCmd);
+        rc = dsoundControlStreamOut(pThis, pStreamDS, enmStreamCmd);
 
     return rc;
@@ -2220 +2251 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, PDMAUDIOSTRMSTS_FLAG_NONE);
     AssertPtrReturn(pStream,    PDMAUDIOSTRMSTS_FLAG_NONE);
 
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
+    PDSOUNDSTREAM  pStreamDS = (PDSOUNDSTREAM)pStream;
+
+    if (!pStreamDS->pCfg) /* Not (yet) configured? Skip. */
+        return PDMAUDIOSTRMSTS_FLAG_NONE;
 
     PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-    {
-        PDSOUNDSTREAMIN pDSoundStream = (PDSOUNDSTREAMIN)pStream;
-        if (pDSoundStream->fEnabled)
+    if (pStreamDS->pCfg->enmDir == PDMAUDIODIR_IN)
+    {
+        if (pStreamDS->In.fEnabled)
             strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED | PDMAUDIOSTRMSTS_FLAG_DATA_READABLE;
     }
     else
     {
-        PDSOUNDSTREAMOUT pDSoundStream = (PDSOUNDSTREAMOUT)pStream;
-        if (pDSoundStream->fEnabled)
+        if (pStreamDS->Out.fEnabled)
         {
             strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
 
             DWORD cbFree;
-            int rc = dsoundGetPosOut(pThis, pDSoundStream, NULL /* cbBuffer */, &cbFree, NULL /* cbPlayPos */);
+            int rc = dsoundGetPosOut(pThis, pStreamDS, NULL /* cbBuffer */, &cbFree, NULL /* cbPlayPos */);
             if (   RT_SUCCESS(rc)
                 && cbFree)
@@ -2259 +2292 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostDSoundStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostDSoundStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

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

@@ -34 +34 @@
 typedef struct DEBUGAUDIOSTREAM
 {
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM     Stream;
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
     /** Audio file to dump output to or read input from. */
     PDMAUDIOFILE       File;
@@ -50 +50 @@
             uint64_t   tsLastPlayed;
             uint8_t   *pu8PlayBuffer;
-            size_t     cbPlayBuffer;
+            uint32_t   cbPlayBuffer;
         } Out;
     };
-    PDMAUDIOPCMPROPS   Props;
-
 } DEBUGAUDIOSTREAM, *PDEBUGAUDIOSTREAM;
 
@@ -77 +75 @@
 static DECLCALLBACK(int) drvHostDebugAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
@@ -95 +93 @@
 static DECLCALLBACK(int) drvHostDebugAudioInit(PPDMIHOSTAUDIO pInterface)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -107 +105 @@
 static DECLCALLBACK(void) drvHostDebugAudioShutdown(PPDMIHOSTAUDIO pInterface)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
 }
 
@@ -123 +121 @@
 
 
-static int debugCreateStreamIn(PPDMIHOSTAUDIO pInterface,
-                               PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    RT_NOREF(pInterface, pStream);
-
-    PDEBUGAUDIOSTREAM pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
-
-    /* Just adopt the wanted stream configuration. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pDbgStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = _1K;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-
-static int debugCreateStreamOut(PPDMIHOSTAUDIO pInterface,
-                                PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    RT_NOREF(pInterface);
-
-    PDEBUGAUDIOSTREAM pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
-
-    /* Just adopt the wanted stream configuration. */
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pDbgStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        pDbgStream->Out.tsLastPlayed  = 0;
-        pDbgStream->Out.cbPlayBuffer  = _1K * PDMAUDIOPCMPROPS_S2B(&pDbgStream->Props, 1); /** @todo Make this configurable? */
-        pDbgStream->Out.pu8PlayBuffer = (uint8_t *)RTMemAlloc(pDbgStream->Out.cbPlayBuffer);
-        if (!pDbgStream->Out.pu8PlayBuffer)
-            rc = VERR_NO_MEMORY;
-    }
+static int debugCreateStreamIn(PDRVHOSTDEBUGAUDIO pDrv, PDEBUGAUDIOSTREAM pStreamDbg,
+                               PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    RT_NOREF(pDrv, pStreamDbg, pCfgReq);
+
+    if (pCfgAcq)
+        pCfgAcq->cSampleBufferHint = _1K;
+
+    return VINF_SUCCESS;
+}
+
+
+static int debugCreateStreamOut(PDRVHOSTDEBUGAUDIO pDrv, PDEBUGAUDIOSTREAM pStreamDbg,
+                                PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    RT_NOREF(pDrv);
+
+    int rc = VINF_SUCCESS;
+
+    pStreamDbg->Out.tsLastPlayed  = 0;
+    pStreamDbg->Out.cbPlayBuffer  = _1K * PDMAUDIOSTREAMCFG_S2B(pCfgReq, 1); /** @todo Make this configurable? */
+    pStreamDbg->Out.pu8PlayBuffer = (uint8_t *)RTMemAlloc(pStreamDbg->Out.cbPlayBuffer);
+    if (!pStreamDbg->Out.pu8PlayBuffer)
+        rc = VERR_NO_MEMORY;
 
     if (RT_SUCCESS(rc))
@@ -172 +157 @@
             {
                 LogFlowFunc(("%s\n", szFile));
-                rc = DrvAudioHlpWAVFileOpen(&pDbgStream->File, szFile,
+                rc = DrvAudioHlpWAVFileOpen(&pStreamDbg->File, szFile,
                                             RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
-                                            &pDbgStream->Props, PDMAUDIOFILEFLAG_NONE);
+                                            &pCfgReq->Props, PDMAUDIOFILEFLAG_NONE);
                 if (RT_FAILURE(rc))
                     LogRel(("DebugAudio: Creating output file '%s' failed with %Rrc\n", szFile, rc));
@@ -188 +173 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pDbgStream->Props, pDbgStream->Out.cbPlayBuffer);
-    }
-
-    LogFlowFuncLeaveRC(rc);
+            pCfgAcq->cSampleBufferHint = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, pStreamDbg->Out.cbPlayBuffer);
+    }
+
     return rc;
 }
@@ -200 +184 @@
  */
 static DECLCALLBACK(int) drvHostDebugAudioStreamCreate(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream,
+                                                       PPDMAUDIOBACKENDSTREAM pStream,
                                                        PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
@@ -206 +190 @@
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgReq,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
+
+    PDRVHOSTDEBUGAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTDEBUGAUDIO, IHostAudio);
+    PDEBUGAUDIOSTREAM  pStreamDbg = (PDEBUGAUDIOSTREAM)pStream;
 
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = debugCreateStreamIn( pInterface, pStream, pCfgReq, pCfgAcq);
+        rc = debugCreateStreamIn( pDrv, pStreamDbg, pCfgReq, pCfgAcq);
     else
-        rc = debugCreateStreamOut(pInterface, pStream, pCfgReq, pCfgAcq);
-
-    LogFlowFunc(("%s: rc=%Rrc\n", pStream->szName, rc));
+        rc = debugCreateStreamOut(pDrv, pStreamDbg, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamDbg->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamDbg->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
+
     return rc;
 }
@@ -222 +216 @@
  */
 static DECLCALLBACK(int) drvHostDebugAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                     PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                     PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                      uint32_t *pcbWritten)
 {
@@ -228 +222 @@
 
     PDRVHOSTDEBUGAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTDEBUGAUDIO, IHostAudio);
-    PDEBUGAUDIOSTREAM  pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
+    PDEBUGAUDIOSTREAM  pStreamDbg = (PDEBUGAUDIOSTREAM)pStream;
 
     /* Consume as many samples as would be played at the current frequency since last call. */
@@ -234 +228 @@
 
     uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-   // uint64_t u64TicksElapsed = u64TicksNow  - pDbgStream->Out.tsLastPlayed;
+   // uint64_t u64TicksElapsed = u64TicksNow  - pStreamDbg->Out.tsLastPlayed;
    // uint64_t u64TicksFreq    = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
 
@@ -249 +243 @@
     uint32_t cbWritten = 0;
 
-    uint32_t cbAvail  = RT_MIN(cbBuf, pDbgStream->Out.cbPlayBuffer);
+    uint32_t cbAvail  = RT_MIN(cbBuf, pStreamDbg->Out.cbPlayBuffer);
     while (cbAvail)
     {
         uint32_t cbChunk = cbAvail; /** @todo Use chunks? */
 
-        memcpy(pDbgStream->Out.pu8PlayBuffer, pvBuf, cbChunk);
+        memcpy(pStreamDbg->Out.pu8PlayBuffer, pvBuf, cbChunk);
 #if 0
         RTFILE fh;
         RTFileOpen(&fh, "/tmp/AudioDebug-Output.pcm",
                    RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-        RTFileWrite(fh, pDbgStream->Out.pu8PlayBuffer, cbChunk, NULL);
+        RTFileWrite(fh, pStreamDbg->Out.pu8PlayBuffer, cbChunk, NULL);
         RTFileClose(fh);
 #endif
-        int rc2 = DrvAudioHlpWAVFileWrite(&pDbgStream->File,
-                                          pDbgStream->Out.pu8PlayBuffer, cbChunk, 0 /* fFlags */);
+        int rc2 = DrvAudioHlpWAVFileWrite(&pStreamDbg->File,
+                                          pStreamDbg->Out.pu8PlayBuffer, cbChunk, 0 /* fFlags */);
         if (RT_FAILURE(rc2))
         {
@@ -277 +271 @@
 
     /* Remember when samples were consumed. */
-    pDbgStream->Out.tsLastPlayed = u64TicksNow;
+    pStreamDbg->Out.tsLastPlayed = u64TicksNow;
 
     if (pcbWritten)
@@ -290 +284 @@
  */
 static DECLCALLBACK(int) drvHostDebugAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                        PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface, pStream, pvBuf, cbBuf);
@@ -302 +296 @@
 
 
-static int debugDestroyStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    RT_NOREF(pInterface, pStream);
-    LogFlowFuncLeaveRC(VINF_SUCCESS);
-    return VINF_SUCCESS;
-}
-
-
-static int debugDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    RT_NOREF(pInterface);
-    PDEBUGAUDIOSTREAM pDbgStream = (PDEBUGAUDIOSTREAM)pStream;
-    if (   pDbgStream
-        && pDbgStream->Out.pu8PlayBuffer)
-    {
-        RTMemFree(pDbgStream->Out.pu8PlayBuffer);
-        pDbgStream->Out.pu8PlayBuffer = NULL;
-    }
-
-    size_t cbDataSize = DrvAudioHlpWAVFileGetDataSize(&pDbgStream->File);
-
-    int rc = DrvAudioHlpWAVFileClose(&pDbgStream->File);
+static int debugDestroyStreamIn(PDRVHOSTDEBUGAUDIO pDrv, PDEBUGAUDIOSTREAM pStreamDbg)
+{
+    RT_NOREF(pDrv, pStreamDbg);
+    return VINF_SUCCESS;
+}
+
+
+static int debugDestroyStreamOut(PDRVHOSTDEBUGAUDIO pDrv, PDEBUGAUDIOSTREAM pStreamDbg)
+{
+    RT_NOREF(pDrv);
+
+    if (pStreamDbg->Out.pu8PlayBuffer)
+    {
+        RTMemFree(pStreamDbg->Out.pu8PlayBuffer);
+        pStreamDbg->Out.pu8PlayBuffer = NULL;
+    }
+
+    size_t cbDataSize = DrvAudioHlpWAVFileGetDataSize(&pStreamDbg->File);
+
+    int rc = DrvAudioHlpWAVFileClose(&pStreamDbg->File);
     if (RT_SUCCESS(rc))
     {
@@ -332 +324 @@
             && fDeleteEmptyFiles)
         {
-            rc = RTFileDelete(pDbgStream->File.szName);
+            rc = RTFileDelete(pStreamDbg->File.szName);
         }
         else
-            LogRel(("DebugAudio: Created output file '%s' (%zu bytes)\n", pDbgStream->File.szName, cbDataSize));
-    }
-
-    LogFlowFuncLeaveRC(rc);
+            LogRel(("DebugAudio: Created output file '%s' (%zu bytes)\n", pStreamDbg->File.szName, cbDataSize));
+    }
+
     return rc;
 }
 
 
-static DECLCALLBACK(int) drvHostDebugAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostDebugAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+
+    PDRVHOSTDEBUGAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTDEBUGAUDIO, IHostAudio);
+    PDEBUGAUDIOSTREAM  pStreamDbg = (PDEBUGAUDIOSTREAM)pStream;
+
+    if (!pStreamDbg->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = debugDestroyStreamIn(pInterface,  pStream);
+    if (pStreamDbg->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = debugDestroyStreamIn (pDrv, pStreamDbg);
     else
-        rc = debugDestroyStreamOut(pInterface, pStream);
+        rc = debugDestroyStreamOut(pDrv, pStreamDbg);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamDbg->pCfg);
+        pStreamDbg->pCfg = NULL;
+    }
 
     return rc;
@@ -358 +360 @@
 
 static DECLCALLBACK(int) drvHostDebugAudioStreamControl(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     RT_NOREF(enmStreamCmd);
@@ -364 +366 @@
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
-
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    NOREF(pStream);
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
 
     return (  PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED
@@ -378 +377 @@
 }
 
-static DECLCALLBACK(int) drvHostDebugAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    NOREF(pStream);
-
+static DECLCALLBACK(int) drvHostDebugAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
     return VINF_SUCCESS;
 }

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

@@ -60 +60 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-typedef struct NULLAUDIOSTREAMOUT
-{
-    /** @note Always must come first! */
-    PDMAUDIOSTREAM      Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS    Props;
-    uint64_t            u64TicksLast;
-} NULLAUDIOSTREAMOUT;
-typedef NULLAUDIOSTREAMOUT *PNULLAUDIOSTREAMOUT;
-
-typedef struct NULLAUDIOSTREAMIN
-{
-    /** @note Always must come first! */
-    PDMAUDIOSTREAM      Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS    Props;
-} NULLAUDIOSTREAMIN;
-typedef NULLAUDIOSTREAMIN *PNULLAUDIOSTREAMIN;
+typedef struct NULLAUDIOSTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
+    union
+    {
+        struct
+        {
+            /** Timestamp of last played samples. */
+            uint64_t   u64TicksLast;
+        } Out;
+    };
+} NULLAUDIOSTREAM;
+typedef NULLAUDIOSTREAM *PNULLAUDIOSTREAM;
 
 /**
@@ -101 +97 @@
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    pBackendCfg->cbStreamOut    = sizeof(NULLAUDIOSTREAMOUT);
-    pBackendCfg->cbStreamIn     = sizeof(NULLAUDIOSTREAMIN);
+    pBackendCfg->cbStreamOut    = sizeof(NULLAUDIOSTREAM);
+    pBackendCfg->cbStreamIn     = sizeof(NULLAUDIOSTREAM);
 
     pBackendCfg->cMaxStreamsOut = 1; /* Output */
@@ -147 +143 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                     const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
@@ -155 +151 @@
     AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
 
-    PDRVHOSTNULLAUDIO   pDrv        = RT_FROM_MEMBER(pInterface, DRVHOSTNULLAUDIO, IHostAudio);
-    PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
+    PDRVHOSTNULLAUDIO pDrv        = RT_FROM_MEMBER(pInterface, DRVHOSTNULLAUDIO, IHostAudio);
+    PNULLAUDIOSTREAM  pStreamNull = (PNULLAUDIOSTREAM)pStream;
 
     /* Consume as many samples as would be played at the current frequency since last call. */
-    uint32_t csLive          = PDMAUDIOPCMPROPS_B2S(&pNullStream->Props, cbBuf);
+    uint32_t csLive          = PDMAUDIOPCMPROPS_B2S(&pStreamNull->pCfg->Props, cbBuf);
 
     uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-    uint64_t u64TicksElapsed = u64TicksNow  - pNullStream->u64TicksLast;
+    uint64_t u64TicksElapsed = u64TicksNow  - pStreamNull->Out.u64TicksLast;
     uint64_t u64TicksFreq    = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
 
     /* Remember when samples were consumed. */
-    pNullStream->u64TicksLast = u64TicksNow;
+    pStreamNull->Out.u64TicksLast = u64TicksNow;
 
     /*
@@ -172 +168 @@
      * If rounding is not taken into account then the playback rate will be consistently lower that expected.
      */
-    uint64_t csPlayed = (2 * u64TicksElapsed * pNullStream->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
+    uint64_t csPlayed = (2 * u64TicksElapsed * pStreamNull->pCfg->Props.uHz + u64TicksFreq) / u64TicksFreq / 2;
 
     /* Don't play more than available. */
@@ -181 +177 @@
 
     if (pcbWritten)
-        *pcbWritten = PDMAUDIOPCMPROPS_S2B(&pNullStream->Props, csPlayed);
+        *pcbWritten = PDMAUDIOPCMPROPS_S2B(&pStreamNull->pCfg->Props, csPlayed);
 
     return VINF_SUCCESS;
@@ -190 +186 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvHostNullAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                       void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface, pStream);
 
+    /* Return silence. */
     RT_BZERO(pvBuf, cbBuf);
 
-    /* Return silent audio. */
     if (pcbRead)
         *pcbRead = cbBuf;
@@ -205 +201 @@
 
 
-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, &pNullStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = _1K;
-    }
-
-    return rc;
-}
-
-
-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, &pNullStream->Props);
-    if (RT_SUCCESS(rc))
-    {
-        pNullStream->u64TicksLast  = 0;
-
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = _1K; /** @todo Make this configurable. */
-    }
-
-    return rc;
+static int nullCreateStreamIn(PNULLAUDIOSTREAM pStreamNull, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    RT_NOREF(pStreamNull, pCfgReq);
+
+    if (pCfgAcq)
+        pCfgAcq->cSampleBufferHint = _1K;
+
+    return VINF_SUCCESS;
+}
+
+
+static int nullCreateStreamOut(PNULLAUDIOSTREAM pStreamNull, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    RT_NOREF(pCfgReq);
+
+    pStreamNull->Out.u64TicksLast  = 0;
+
+    if (pCfgAcq)
+        pCfgAcq->cSampleBufferHint = _1K; /** @todo Make this configurable. */
+
+    return VINF_SUCCESS;
 }
 
@@ -242 +228 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostNullAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
@@ -248 +234 @@
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgReq,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
+
+    PNULLAUDIOSTREAM pStreamNull = (PNULLAUDIOSTREAM)pStream;
 
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = nullCreateStreamIn( pStream, pCfgReq, pCfgAcq);
+        rc = nullCreateStreamIn( pStreamNull, pCfgReq, pCfgAcq);
     else
-        rc = nullCreateStreamOut(pStream, pCfgReq, pCfgAcq);
-
-    LogFlowFunc(("%s: rc=%Rrc\n", pStream->szName, rc));
+        rc = nullCreateStreamOut(pStreamNull, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamNull->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamNull->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
+
     return rc;
 }
@@ -267 +262 @@
 
 
-static int nullDestroyStreamOut(PPDMAUDIOSTREAM pStream)
-{
-    RT_NOREF(pStream);
+static int nullDestroyStreamOut(PNULLAUDIOSTREAM pStreamNull)
+{
+    RT_NOREF(pStreamNull);
     return VINF_SUCCESS;
 }
@@ -277 +272 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostNullAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
+    PNULLAUDIOSTREAM pStreamNull = (PNULLAUDIOSTREAM)pStream;
+
+    if (!pStreamNull->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
+    if (pStreamNull->pCfg->enmDir == PDMAUDIODIR_IN)
         rc = nullDestroyStreamIn();
     else
-        rc = nullDestroyStreamOut(pStream);
+        rc = nullDestroyStreamOut(pStreamNull);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamNull->pCfg);
+        pStreamNull->pCfg = NULL;
+    }
 
     return rc;
@@ -295 +301 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    RT_NOREF(enmStreamCmd);
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
-
+static DECLCALLBACK(int) drvHostNullAudioStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                       PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
+    RT_NOREF(pInterface, pStream, enmStreamCmd);
     return VINF_SUCCESS;
 }
@@ -310 +312 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface, pStream);
@@ -321 +323 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostNullAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostNullAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     NOREF(pInterface);

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

@@ -70 +70 @@
 typedef struct OSSAUDIOSTREAMCFG
 {
-    PDMAUDIOFMT       enmFormat;
-    PDMAUDIOENDIANNESS enmENDIANNESS;
-    uint16_t          uFreq;
-    uint8_t           cChannels;
+    PDMAUDIOPCMPROPS  Props;
     uint16_t          cFragments;
     uint32_t          cbFragmentSize;
 } OSSAUDIOSTREAMCFG, *POSSAUDIOSTREAMCFG;
 
-typedef struct OSSAUDIOSTREAMIN
-{
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM     pStreamIn;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS   Props;
+typedef struct OSSAUDIOSTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
+    /** Buffer alignment. */
+    uint8_t            uAlign;
+    union
+    {
+        struct
+        {
+
+        } In;
+        struct
+        {
+#ifndef RT_OS_L4
+            /** Whether we use a memory mapped file instead of our
+             *  own allocated PCM buffer below. */
+            /** @todo The memory mapped code seems to be utterly broken.
+             *        Needs investigation! */
+            bool       fMMIO;
+#endif
+        } Out;
+    };
     int                hFile;
     int                cFragments;
@@ -92 +106 @@
     size_t             cbBuf;
     int                old_optr;
-} OSSAUDIOSTREAMIN, *POSSAUDIOSTREAMIN;
-
-typedef struct OSSAUDIOSTREAMOUT
-{
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM      pStreamOut;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS    Props;
-    int                 hFile;
-    int                 cFragments;
-    int                 cbFragmentSize;
-#ifndef RT_OS_L4
-    /** Whether we use a memory mapped file instead of our
-     *  own allocated PCM buffer below. */
-    /** @todo The memory mapped code seems to be utterly broken.
-     *        Needs investigation! */
-    bool                fMMIO;
-#endif
-    /** Own PCM buffer in case memory mapping is unavailable. */
-    void               *pvBuf;
-    /** Size (in bytes) of own PCM buffer. */
-    size_t              cbBuf;
-    int                 old_optr;
-} OSSAUDIOSTREAMOUT, *POSSAUDIOSTREAMOUT;
+} OSSAUDIOSTREAM, *POSSAUDIOSTREAM;
 
 typedef struct OSSAUDIOCFG
@@ -160 +151 @@
 
 
-static int ossAudioFmtToOSS(PDMAUDIOFMT fmt)
-{
+static int ossOSSToAudioProps(int fmt, PPDMAUDIOPCMPROPS pProps)
+{
+    RT_BZERO(pProps, sizeof(PDMAUDIOPCMPROPS));
+
     switch (fmt)
     {
-        case PDMAUDIOFMT_S8:
-            return AFMT_S8;
-
-        case PDMAUDIOFMT_U8:
-            return AFMT_U8;
-
-        case PDMAUDIOFMT_S16:
-            return AFMT_S16_LE;
-
-        case PDMAUDIOFMT_U16:
-            return AFMT_U16_LE;
-
-        default:
-            break;
-    }
-
-    AssertMsgFailed(("Format %ld not supported\n", fmt));
-    return AFMT_U8;
-}
-
-
-static int ossOSSToAudioFmt(int fmt, PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pENDIANNESS)
-{
-    switch (fmt)
-    {
         case AFMT_S8:
-            *pFmt = PDMAUDIOFMT_S8;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 8;
+            pProps->fSigned = true;
             break;
 
         case AFMT_U8:
-            *pFmt = PDMAUDIOFMT_U8;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 8;
+            pProps->fSigned = false;
             break;
 
         case AFMT_S16_LE:
-            *pFmt = PDMAUDIOFMT_S16;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 16;
+            pProps->fSigned = true;
             break;
 
         case AFMT_U16_LE:
-            *pFmt = PDMAUDIOFMT_U16;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE;
-            break;
-
-        case AFMT_S16_BE:
-            *pFmt = PDMAUDIOFMT_S16;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits   = 16;
+            pProps->fSigned = false;
+            break;
+
+       case AFMT_S16_BE:
+            pProps->cBits   = 16;
+            pProps->fSigned = true;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
         case AFMT_U16_BE:
-            *pFmt = PDMAUDIOFMT_U16;
-            if (pENDIANNESS)
-                *pENDIANNESS = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits   = 16;
+            pProps->fSigned = false;
+#ifdef RT_LITTLE_ENDIAN
+            pProps->fSwapEndian = true;
+#endif
             break;
 
@@ -255 +223 @@
 
 
-static int ossStreamOpen(const char *pszDev, int fOpen, POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt, int *phFile)
-{
-    int rc;
+static int ossStreamOpen(const char *pszDev, int fOpen, POSSAUDIOSTREAMCFG pOSSReq, POSSAUDIOSTREAMCFG pOSSAcq, int *phFile)
+{
+    int rc = VINF_SUCCESS;
 
     int hFile = -1;
@@ -270 +238 @@
         }
 
-        int iFormat = ossAudioFmtToOSS(pReq->enmFormat);
+        int iFormat;
+        switch (pOSSReq->Props.cBits)
+        {
+            case 8:
+                iFormat = pOSSReq->Props.fSigned ? AFMT_S8 : AFMT_U8;
+                break;
+
+            case 16:
+                iFormat = pOSSReq->Props.fSigned ? AFMT_S16_LE : AFMT_U16_LE;
+                break;
+
+            default:
+                rc = VERR_NOT_SUPPORTED;
+                break;
+        }
+
+        if (RT_FAILURE(rc))
+            break;
+
         if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
         {
@@ -278 +264 @@
         }
 
-        int cChannels = pReq->cChannels;
+        int cChannels = pOSSReq->Props.cChannels;
         if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels))
         {
-            LogRel(("OSS: Failed to set number of audio channels (%d): %s (%d)\n", pReq->cChannels, strerror(errno), errno));
+            LogRel(("OSS: Failed to set number of audio channels (%RU8): %s (%d)\n",
+                    pOSSReq->Props.cChannels, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
         }
 
-        int freq = pReq->uFreq;
+        int freq = pOSSReq->Props.uHz;
         if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq))
         {
-            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s (%d)\n", pReq->uFreq, strerror(errno), errno));
+            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s (%d)\n", pOSSReq->Props.uHz, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -308 +295 @@
 
         LogRel2(("OSS: Requested %RU16 %s fragments, %RU32 bytes each\n",
-                 pReq->cFragments, fIn ? "input" : "output", pReq->cbFragmentSize));
-
-        int mmmmssss = (pReq->cFragments << 16) | lsbindex(pReq->cbFragmentSize);
+                 pOSSReq->cFragments, fIn ? "input" : "output", pOSSReq->cbFragmentSize));
+
+        int mmmmssss = (pOSSReq->cFragments << 16) | lsbindex(pOSSReq->cbFragmentSize);
         if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss))
         {
             LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s (%d)\n",
-                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno), errno));
+                    pOSSReq->cFragments, pOSSReq->cbFragmentSize, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -327 +314 @@
         }
 
-        rc = ossOSSToAudioFmt(iFormat, &pObt->enmFormat, &pObt->enmENDIANNESS);
+        rc = ossOSSToAudioProps(iFormat, &pOSSAcq->Props);
         if (RT_SUCCESS(rc))
         {
-            pObt->cChannels      = cChannels;
-            pObt->uFreq          = freq;
-            pObt->cFragments     = abinfo.fragstotal;
-            pObt->cbFragmentSize = abinfo.fragsize;
+            pOSSAcq->Props.cChannels = cChannels;
+            pOSSAcq->Props.uHz       = freq;
+            pOSSAcq->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pOSSAcq->Props.cBits, pOSSAcq->Props.cChannels);
+
+            pOSSAcq->cFragments      = abinfo.fragstotal;
+            pOSSAcq->cbFragmentSize  = abinfo.fragsize;
 
             LogRel2(("OSS: Got %RU16 %s fragments, %RU32 bytes each\n",
-                     pObt->cFragments, fIn ? "input" : "output", pObt->cbFragmentSize));
+                     pOSSAcq->cFragments, fIn ? "input" : "output", pOSSAcq->cbFragmentSize));
 
             *phFile = hFile;
@@ -351 +340 @@
 
 
-static int ossControlStreamIn(/*PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd*/ void)
+static int ossControlStreamIn(/*PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd*/ void)
 {
     /** @todo Nothing to do here right now!? */
@@ -359 +348 @@
 
 
-static int ossControlStreamOut(PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    POSSAUDIOSTREAMOUT pStreamOut = (POSSAUDIOSTREAMOUT)pStream;
+static int ossControlStreamOut(PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -370 +359 @@
         case PDMAUDIOSTREAMCMD_RESUME:
         {
-            DrvAudioHlpClearBuf(&pStreamOut->Props, pStreamOut->pvBuf, pStreamOut->cbBuf,
-                                PDMAUDIOPCMPROPS_B2S(&pStreamOut->Props, pStreamOut->cbBuf));
+            DrvAudioHlpClearBuf(&pStreamOSS->pCfg->Props, pStreamOSS->pvBuf, pStreamOSS->cbBuf,
+                                PDMAUDIOPCMPROPS_B2S(&pStreamOSS->pCfg->Props, pStreamOSS->cbBuf));
 
             int mask = PCM_ENABLE_OUTPUT;
-            if (ioctl(pStreamOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
+            if (ioctl(pStreamOSS->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
             {
                 LogRel(("OSS: Failed to enable output stream: %s\n", strerror(errno)));
@@ -387 +376 @@
         {
             int mask = 0;
-            if (ioctl(pStreamOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
+            if (ioctl(pStreamOSS->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
             {
                 LogRel(("OSS: Failed to disable output stream: %s\n", strerror(errno)));
@@ -402 +391 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -414 +402 @@
     RT_NOREF(pInterface);
 
-    LogFlowFuncEnter();
-
     return VINF_SUCCESS;
 }
@@ -423 +409 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostOSSAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                      PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    RT_NOREF(pInterface, cbBuf, pvBuf);
+static DECLCALLBACK(int) drvHostOSSAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                      void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+{
+    RT_NOREF(pInterface);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    POSSAUDIOSTREAMIN pStreamOSS = (POSSAUDIOSTREAMIN)pStream;
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -501 +487 @@
 
 
-static int ossDestroyStreamIn(PPDMAUDIOSTREAM pStream)
-{
-    POSSAUDIOSTREAMIN pStrm = (POSSAUDIOSTREAMIN)pStream;
+static int ossDestroyStreamIn(PPDMAUDIOBACKENDSTREAM pStream)
+{
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
     LogFlowFuncEnter();
 
-    if (pStrm->pvBuf)
-    {
-        Assert(pStrm->cbBuf);
-
-        RTMemFree(pStrm->pvBuf);
-        pStrm->pvBuf = NULL;
-    }
-
-    pStrm->cbBuf = 0;
-
-    ossStreamClose(&pStrm->hFile);
+    if (pStreamOSS->pvBuf)
+    {
+        Assert(pStreamOSS->cbBuf);
+
+        RTMemFree(pStreamOSS->pvBuf);
+        pStreamOSS->pvBuf = NULL;
+    }
+
+    pStreamOSS->cbBuf = 0;
+
+    ossStreamClose(&pStreamOSS->hFile);
 
     return VINF_SUCCESS;
@@ -523 +509 @@
 
 
-static int ossDestroyStreamOut(PPDMAUDIOSTREAM pStream)
-{
-    POSSAUDIOSTREAMOUT pStrm = (POSSAUDIOSTREAMOUT)pStream;
-
-    LogFlowFuncEnter();
+static int ossDestroyStreamOut(PPDMAUDIOBACKENDSTREAM pStream)
+{
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
 #ifndef RT_OS_L4
-    if (pStrm->fMMIO)
-    {
-        if (pStrm->pvBuf)
-        {
-            Assert(pStrm->cbBuf);
-
-            int rc2 = munmap(pStrm->pvBuf, pStrm->cbBuf);
+    if (pStreamOSS->Out.fMMIO)
+    {
+        if (pStreamOSS->pvBuf)
+        {
+            Assert(pStreamOSS->cbBuf);
+
+            int rc2 = munmap(pStreamOSS->pvBuf, pStreamOSS->cbBuf);
             if (rc2 == 0)
             {
-                pStrm->pvBuf      = NULL;
-                pStrm->cbBuf      = 0;
-
-                pStrm->fMMIO      = false;
+                pStreamOSS->pvBuf      = NULL;
+                pStreamOSS->cbBuf      = 0;
+
+                pStreamOSS->Out.fMMIO  = false;
             }
             else
@@ -551 +535 @@
     {
 #endif
-        if (pStrm->pvBuf)
-        {
-            Assert(pStrm->cbBuf);
-
-            RTMemFree(pStrm->pvBuf);
-            pStrm->pvBuf = NULL;
-        }
-
-        pStrm->cbBuf = 0;
+        if (pStreamOSS->pvBuf)
+        {
+            Assert(pStreamOSS->cbBuf);
+
+            RTMemFree(pStreamOSS->pvBuf);
+            pStreamOSS->pvBuf = NULL;
+        }
+
+        pStreamOSS->cbBuf = 0;
 #ifndef RT_OS_L4
     }
 #endif
 
-    ossStreamClose(&pStrm->hFile);
+    ossStreamClose(&pStreamOSS->hFile);
 
     return VINF_SUCCESS;
@@ -577 +561 @@
     RT_NOREF(pInterface);
 
-    pBackendCfg->cbStreamIn  = sizeof(OSSAUDIOSTREAMIN);
-    pBackendCfg->cbStreamOut = sizeof(OSSAUDIOSTREAMOUT);
+    pBackendCfg->cbStreamIn  = sizeof(OSSAUDIOSTREAM);
+    pBackendCfg->cbStreamOut = sizeof(OSSAUDIOSTREAM);
 
     int hFile = open("/dev/dsp", O_WRONLY | O_NONBLOCK, 0);
@@ -636 +620 @@
 
 
-static int ossCreateStreamIn(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    POSSAUDIOSTREAMIN pStrm = (POSSAUDIOSTREAMIN)pStream;
-
+static int ossCreateStreamIn(POSSAUDIOSTREAM pStreamOSS, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
     int rc;
+
     int hFile = -1;
 
     do
     {
-        uint32_t cSamples;
-
-        OSSAUDIOSTREAMCFG reqStream, obtStream;
-        reqStream.enmFormat      = pCfgReq->enmFormat;
-        reqStream.uFreq          = pCfgReq->uHz;
-        reqStream.cChannels      = pCfgReq->cChannels;
-        reqStream.cFragments     = s_OSSConf.nfrags;
-        reqStream.cbFragmentSize = s_OSSConf.fragsize;
-
-        rc = ossStreamOpen(s_OSSConf.devpath_in, O_RDONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile);
+        OSSAUDIOSTREAMCFG ossReq;
+        memcpy(&ossReq.Props, &pCfgReq->Props, sizeof(PDMAUDIOPCMPROPS));
+
+        ossReq.cFragments     = s_OSSConf.nfrags;
+        ossReq.cbFragmentSize = s_OSSConf.fragsize;
+
+        OSSAUDIOSTREAMCFG ossAcq;
+
+        rc = ossStreamOpen(s_OSSConf.devpath_in, O_RDONLY | O_NONBLOCK, &ossReq, &ossAcq, &hFile);
         if (RT_SUCCESS(rc))
         {
-            pCfgAcq->enmFormat     = obtStream.enmFormat;
-            pCfgAcq->uHz           = obtStream.uFreq;
-            pCfgAcq->cChannels     = obtStream.cChannels;
-            pCfgAcq->enmEndianness = obtStream.enmENDIANNESS;
-
-            rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStrm->Props);
+            memcpy(&pCfgAcq->Props, &ossAcq.Props, sizeof(PDMAUDIOPCMPROPS));
+
+            if (ossAcq.cFragments * ossAcq.cbFragmentSize & pStreamOSS->uAlign)
+            {
+                LogRel(("OSS: Warning: Misaligned capturing buffer: Size = %zu, Alignment = %u\n",
+                        ossAcq.cFragments * ossAcq.cbFragmentSize, pStreamOSS->uAlign + 1));
+            }
+
+            uint32_t cSamples = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, ossAcq.cFragments * ossAcq.cbFragmentSize);
+            if (!cSamples)
+                rc = VERR_INVALID_PARAMETER;
+
             if (RT_SUCCESS(rc))
             {
-                if (obtStream.cFragments * obtStream.cbFragmentSize & pStrm->Props.uAlign)
-                {
-                    LogRel(("OSS: Warning: Misaligned capturing buffer: Size = %zu, Alignment = %u\n",
-                            obtStream.cFragments * obtStream.cbFragmentSize, pStrm->Props.uAlign + 1));
-                }
-
-                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) >> pStrm->Props.cShift;
-                if (!cSamples)
-                    rc = VERR_INVALID_PARAMETER;
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-                size_t cbSample = (1 << pStrm->Props.cShift);
-
-                size_t cbBuf = cSamples * cbSample;
+                size_t cbBuf = PDMAUDIOSTREAMCFG_S2B(pCfgAcq, cSamples);
                 void  *pvBuf = RTMemAlloc(cbBuf);
                 if (!pvBuf)
                 {
-                    LogRel(("OSS: Failed allocating capturing buffer with %RU32 samples (%zu bytes per sample)\n",
-                            cSamples, cbSample));
+                    LogRel(("OSS: Failed allocating capturing buffer with (%zu bytes)\n", cbBuf));
                     rc = VERR_NO_MEMORY;
-                    break;
                 }
 
-                pStrm->hFile = hFile;
-                pStrm->pvBuf = pvBuf;
-                pStrm->cbBuf = cbBuf;
-
-                pCfgAcq->cSampleBufferSize = cSamples;
+                pStreamOSS->hFile = hFile;
+                pStreamOSS->pvBuf = pvBuf;
+                pStreamOSS->cbBuf = cbBuf;
+
+                pCfgAcq->cSampleBufferHint = cSamples;
             }
         }
@@ -708 +679 @@
 
 
-static int ossCreateStreamOut(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    POSSAUDIOSTREAMOUT pStrm = (POSSAUDIOSTREAMOUT)pStream;
-
+static int ossCreateStreamOut(POSSAUDIOSTREAM pStreamOSS, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
     int rc;
     int hFile = -1;
@@ -720 +689 @@
 
         OSSAUDIOSTREAMCFG reqStream, obtStream;
-        reqStream.enmFormat      = pCfgReq->enmFormat;
-        reqStream.uFreq          = pCfgReq->uHz;
-        reqStream.cChannels      = pCfgReq->cChannels;
+
+        memcpy(&reqStream.Props, &pCfgReq->Props, sizeof(PDMAUDIOPCMPROPS));
+
         reqStream.cFragments     = s_OSSConf.nfrags;
         reqStream.cbFragmentSize = s_OSSConf.fragsize;
@@ -729 +698 @@
         if (RT_SUCCESS(rc))
         {
-            pCfgAcq->enmFormat     = obtStream.enmFormat;
-            pCfgAcq->uHz           = obtStream.uFreq;
-            pCfgAcq->cChannels     = obtStream.cChannels;
-            pCfgAcq->enmEndianness = obtStream.enmENDIANNESS;
-
-            rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStrm->Props);
-            if (RT_SUCCESS(rc))
-            {
-                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, pStrm->Props.uAlign + 1));
-                }
+            memcpy(&pCfgAcq->Props, &obtStream.Props, sizeof(PDMAUDIOPCMPROPS));
+
+            cSamples = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, obtStream.cFragments * obtStream.cbFragmentSize);
+
+            if (obtStream.cFragments * obtStream.cbFragmentSize & pStreamOSS->uAlign)
+            {
+                LogRel(("OSS: Warning: Misaligned playback buffer: Size = %zu, Alignment = %u\n",
+                        obtStream.cFragments * obtStream.cbFragmentSize, pStreamOSS->uAlign + 1));
             }
         }
@@ -749 +711 @@
         if (RT_SUCCESS(rc))
         {
-            pStrm->fMMIO = false;
-
-            size_t cbSample = (1 << pStrm->Props.cShift);
-
-            size_t cbSamples = cSamples * cbSample;
-            Assert(cbSamples);
+            pStreamOSS->Out.fMMIO = false;
+
+            size_t cbBuf = PDMAUDIOSTREAMCFG_S2B(pCfgAcq, cSamples);
+            Assert(cbBuf);
 
 #ifndef RT_OS_L4
             if (s_OSSConf.try_mmap)
             {
-                pStrm->pvBuf = mmap(0, cbSamples, PROT_READ | PROT_WRITE, MAP_SHARED, hFile, 0);
-                if (pStrm->pvBuf == MAP_FAILED)
+                pStreamOSS->pvBuf = mmap(0, cbBuf, PROT_READ | PROT_WRITE, MAP_SHARED, hFile, 0);
+                if (pStreamOSS->pvBuf == MAP_FAILED)
                 {
-                    LogRel(("OSS: Failed to memory map %zu bytes of playback buffer: %s\n", cbSamples, strerror(errno)));
+                    LogRel(("OSS: Failed to memory map %zu bytes of playback buffer: %s\n", cbBuf, strerror(errno)));
                     rc = RTErrConvertFromErrno(errno);
                     break;
@@ -786 +746 @@
                         else
                         {
-                            pStrm->fMMIO = true;
+                            pStreamOSS->Out.fMMIO = true;
                             LogRel(("OSS: Using MMIO\n"));
                         }
@@ -793 +753 @@
                     if (RT_FAILURE(rc))
                     {
-                        int rc2 = munmap(pStrm->pvBuf, cbSamples);
+                        int rc2 = munmap(pStreamOSS->pvBuf, cbBuf);
                         if (rc2)
                             LogRel(("OSS: Failed to memory unmap playback buffer: %s\n", strerror(errno)));
@@ -804 +764 @@
             /* Memory mapping failed above? Try allocating an own buffer. */
 #ifndef RT_OS_L4
-            if (!pStrm->fMMIO)
-            {
-#endif
-                void *pvBuf = RTMemAlloc(cbSamples);
+            if (!pStreamOSS->Out.fMMIO)
+            {
+#endif
+                void *pvBuf = RTMemAlloc(cbBuf);
                 if (!pvBuf)
                 {
-                    LogRel(("OSS: Failed allocating playback buffer with %RU32 samples (%zu bytes)\n", cSamples, cbSamples));
+                    LogRel(("OSS: Failed allocating playback buffer with %RU32 samples (%zu bytes)\n", cSamples, cbBuf));
                     rc = VERR_NO_MEMORY;
                     break;
                 }
 
-                pStrm->hFile = hFile;
-                pStrm->pvBuf = pvBuf;
-                pStrm->cbBuf = cbSamples;
+                pStreamOSS->hFile = hFile;
+                pStreamOSS->pvBuf = pvBuf;
+                pStreamOSS->cbBuf = cbBuf;
 #ifndef RT_OS_L4
             }
 #endif
-            pCfgAcq->cSampleBufferSize = cSamples;
+            pCfgAcq->cSampleBufferHint = cSamples;
         }
 
@@ -838 +798 @@
  */
 static DECLCALLBACK(int) drvHostOSSAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                   PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                   PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                    uint32_t *pcbWritten)
 {
-    RT_NOREF(pInterface, cbBuf, pvBuf);
+    RT_NOREF(pInterface);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    POSSAUDIOSTREAMOUT pStreamOSS = (POSSAUDIOSTREAMOUT)pStream;
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -855 +815 @@
     do
     {
-        uint32_t cbAvail = PDMAUDIOPCMPROPS_S2B(&pStreamOSS->Props, cbBuf);
-        uint32_t cbToRead;
+        uint32_t cbAvail = cbBuf;
+        uint32_t cbToWrite;
 
 #ifndef RT_OS_L4
-        if (pStreamOSS->fMMIO)
+        if (pStreamOSS->Out.fMMIO)
         {
             /* Get current playback pointer. */
@@ -881 +841 @@
             Assert(cbData >= 0);
 
-            cbToRead = RT_MIN((unsigned)cbData, cbAvail);
+            cbToWrite = RT_MIN((unsigned)cbData, cbAvail);
         }
         else
@@ -909 +869 @@
             }
 
-            cbToRead = RT_MIN(unsigned(abinfo.fragments * abinfo.fragsize), cbAvail);
+            cbToWrite = RT_MIN(unsigned(abinfo.fragments * abinfo.fragsize), cbAvail);
 #ifndef RT_OS_L4
         }
 #endif
-        while (cbToRead)
-        {
-            uint32_t cbRead     = cbToRead;
-
-            memcpy(pStreamOSS->pvBuf, pvBuf, cbRead);
-
-            uint32_t cbChunk    = cbRead;
+        cbToWrite = RT_MIN(cbToWrite, pStreamOSS->cbBuf);
+
+        while (cbToWrite)
+        {
+            uint32_t cbWritten = cbToWrite;
+
+            memcpy(pStreamOSS->pvBuf, pvBuf, cbWritten);
+
+            uint32_t cbChunk    = cbWritten;
             uint32_t cbChunkOff = 0;
             while (cbChunk)
@@ -932 +894 @@
                 }
 
-                if (cbChunkWritten & pStreamOSS->Props.uAlign)
+                if (cbChunkWritten & pStreamOSS->uAlign)
                 {
                     LogRel(("OSS: Misaligned write (written %z, expected %RU32)\n", cbChunkWritten, cbChunk));
@@ -939 +901 @@
 
                 cbChunkOff += (uint32_t)cbChunkWritten;
-                Assert(cbChunkOff <= cbRead);
+                Assert(cbChunkOff <= cbWritten);
                 Assert(cbChunk    >= (uint32_t)cbChunkWritten);
                 cbChunk    -= (uint32_t)cbChunkWritten;
             }
 
-            Assert(cbToRead >= cbRead);
-            cbToRead       -= cbRead;
-            cbWrittenTotal += cbRead;
+            Assert(cbToWrite >= cbWritten);
+            cbToWrite      -= cbWritten;
+            cbWrittenTotal += cbWritten;
         }
 
 #ifndef RT_OS_L4
         /* Update read pointer. */
-        if (pStreamOSS->fMMIO)
+        if (pStreamOSS->Out.fMMIO)
             pStreamOSS->old_optr = cntinfo.ptr;
 #endif
@@ -991 +953 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostOSSAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostOSSAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                      PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
@@ -999 +961 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = ossCreateStreamIn(pStream, pCfgReq, pCfgAcq);
+        rc = ossCreateStreamIn (pStreamOSS, pCfgReq, pCfgAcq);
     else
-        rc = ossCreateStreamOut(pStream, pCfgReq, pCfgAcq);
+        rc = ossCreateStreamOut(pStreamOSS, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamOSS->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamOSS->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
 
     return rc;
@@ -1012 +983 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostOSSAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostOSSAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+
+    if (!pStreamOSS->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
+    if (pStreamOSS->pCfg->enmDir == PDMAUDIODIR_IN)
         rc = ossDestroyStreamIn(pStream);
     else
         rc = ossDestroyStreamOut(pStream);
 
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamOSS->pCfg);
+        pStreamOSS->pCfg = NULL;
+    }
+
     return rc;
 }
@@ -1030 +1012 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostOSSAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvHostOSSAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                       PDMAUDIOSTREAMCMD enmStreamCmd)
 {
@@ -1036 +1018 @@
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+
+    if (!pStreamOSS->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
+    if (pStreamOSS->pCfg->enmDir == PDMAUDIODIR_IN)
         rc = ossControlStreamIn(/*pInterface,  pStream, enmStreamCmd*/);
     else
-        rc = ossControlStreamOut(pStream, enmStreamCmd);
+        rc = ossControlStreamOut(pStreamOSS, enmStreamCmd);
 
     return rc;
@@ -1051 +1036 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostOSSAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostOSSAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1066 +1051 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
-    RT_NOREF(pStream);
+
+    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
 
     PDMAUDIOSTRMSTS strmSts =   PDMAUDIOSTRMSTS_FLAG_INITIALIZED
                               | PDMAUDIOSTRMSTS_FLAG_ENABLED;
 
-    strmSts |=   pStream->enmDir == PDMAUDIODIR_IN
+    strmSts |=   pStreamOSS->pCfg->enmDir == PDMAUDIODIR_IN
                ? PDMAUDIOSTRMSTS_FLAG_DATA_READABLE
                : PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE;

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

@@ -96 +96 @@
 typedef struct PULSEAUDIOSTREAM
 {
-    /** Associated host input/output stream.
-     *  Note: Always must come first! */
-    PDMAUDIOSTREAM         Stream;
-    PDMAUDIOPCMPROPS       Props;
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG     pCfg;
     /** Pointer to driver instance. */
     PDRVHOSTPULSEAUDIO     pDrv;
     /** Pointer to opaque PulseAudio stream. */
-    pa_stream             *pPAStream;
+    pa_stream             *pStream;
     /** Pulse sample format and attribute specification. */
     pa_sample_spec         SampleSpec;
@@ -199 +197 @@
 
 
-static pa_sample_format_t paFmtToPulse(PDMAUDIOFMT fmt)
-{
-    switch (fmt)
-    {
-        case PDMAUDIOFMT_U8:
-            return PA_SAMPLE_U8;
-
-        case PDMAUDIOFMT_S16:
-            return PA_SAMPLE_S16LE;
+static pa_sample_format_t paAudioPropsToPulse(PPDMAUDIOPCMPROPS pProps)
+{
+    switch (pProps->cBits)
+    {
+        case 8:
+            if (!pProps->fSigned)
+                return PA_SAMPLE_U8;
+
+        case 16:
+            if (pProps->fSigned)
+                return PA_SAMPLE_S16LE;
 
 #ifdef PA_SAMPLE_S32LE
-        case PDMAUDIOFMT_S32:
-            return PA_SAMPLE_S32LE;
+        case 32:
+            if (pProps->fSigned)
+                return PA_SAMPLE_S32LE;
 #endif
         default:
@@ -217 +218 @@
     }
 
-    AssertMsgFailed(("Format %ld not supported\n", fmt));
-    return PA_SAMPLE_U8;
-}
-
-
-static int paPulseToFmt(pa_sample_format_t pulsefmt,
-                        PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pEndianness)
+    AssertMsgFailed(("%RU8%s not supported\n", pProps->cBits, pProps->fSigned ? "S" : "U"));
+    return PA_SAMPLE_INVALID;
+}
+
+
+static int paPulseToAudioProps(pa_sample_format_t pulsefmt, PPDMAUDIOPCMPROPS pProps)
 {
     switch (pulsefmt)
     {
         case PA_SAMPLE_U8:
-            *pFmt = PDMAUDIOFMT_U8;
-            *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 8;
+            pProps->fSigned = false;
             break;
 
         case PA_SAMPLE_S16LE:
-            *pFmt = PDMAUDIOFMT_S16;
-            *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 16;
+            pProps->fSigned = true;
             break;
 
         case PA_SAMPLE_S16BE:
-            *pFmt = PDMAUDIOFMT_S16;
-            *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits   = 16;
+            pProps->fSigned = true;
+            /** @todo Handle Endianess. */
             break;
 
 #ifdef PA_SAMPLE_S32LE
         case PA_SAMPLE_S32LE:
-            *pFmt = PDMAUDIOFMT_S32;
-            *pEndianness = PDMAUDIOENDIANNESS_LITTLE;
+            pProps->cBits   = 32;
+            pProps->fSigned = true;
             break;
 #endif
@@ -251 +252 @@
 #ifdef PA_SAMPLE_S32BE
         case PA_SAMPLE_S32BE:
-            *pFmt = PDMAUDIOFMT_S32;
-            *pEndianness = PDMAUDIOENDIANNESS_BIG;
+            pProps->cBits   = 32;
+            pProps->fSigned = true;
+            /** @todo Handle Endianess. */
             break;
 #endif
@@ -649 +651 @@
 
 
-static int paCreateStreamOut(PPDMIHOSTAUDIO pInterface,
-                             PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
-
-    LogFlowFuncEnter();
-
+static int paCreateStreamOut(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA,
+                             PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
     pStreamPA->pDrainOp            = NULL;
 
-    pStreamPA->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
-    pStreamPA->SampleSpec.rate     = pCfgReq->uHz;
-    pStreamPA->SampleSpec.channels = pCfgReq->cChannels;
+    pStreamPA->SampleSpec.format   = paAudioPropsToPulse(&pCfgReq->Props);
+    pStreamPA->SampleSpec.rate     = pCfgReq->Props.uHz;
+    pStreamPA->SampleSpec.channels = pCfgReq->Props.cChannels;
 
     /* Note that setting maxlength to -1 does not work on PulseAudio servers
@@ -672 +669 @@
 
     /* Note that the struct BufAttr is updated to the obtained values after this call! */
-    int rc = paStreamOpen(pThis, false /* fIn */, "PulseAudio (Out)", &pStreamPA->SampleSpec, &pStreamPA->BufAttr, &pStreamPA->pPAStream);
+    int rc = paStreamOpen(pThis, false /* fIn */, "PulseAudio (Out)",
+                          &pStreamPA->SampleSpec, &pStreamPA->BufAttr, &pStreamPA->pStream);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = paPulseToFmt(pStreamPA->SampleSpec.format,
-                      &pCfgAcq->enmFormat, &pCfgAcq->enmEndianness);
+    rc = paPulseToAudioProps(pStreamPA->SampleSpec.format, &pCfgAcq->Props);
     if (RT_FAILURE(rc))
     {
@@ -684 +681 @@
     }
 
-    pCfgAcq->uHz       = pStreamPA->SampleSpec.rate;
-    pCfgAcq->cChannels = pStreamPA->SampleSpec.channels;
-
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamPA->Props);
-    if (RT_SUCCESS(rc))
-    {
-        uint32_t cbBuf  = RT_MIN(pStreamPA->BufAttr.tlength * 2,
-                                 pStreamPA->BufAttr.maxlength); /** @todo Make this configurable! */
-        if (cbBuf)
-        {
-            pStreamPA->pDrv     = pThis;
-
-            pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pStreamPA->Props, cbBuf);
-        }
-        else
-            rc = VERR_INVALID_PARAMETER;
-    }
-
-    LogFlowFuncLeaveRC(rc);
+    pCfgAcq->Props.uHz       = pStreamPA->SampleSpec.rate;
+    pCfgAcq->Props.cChannels = pStreamPA->SampleSpec.channels;
+    pCfgAcq->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cBits, pCfgAcq->Props.cChannels);
+
+    uint32_t cbBuf = RT_MIN(pStreamPA->BufAttr.tlength * 2,
+                            pStreamPA->BufAttr.maxlength); /** @todo Make this configurable! */
+    if (cbBuf)
+    {
+        pCfgAcq->cSampleBufferHint = PDMAUDIOSTREAMCFG_B2S(pCfgAcq, cbBuf);
+
+        pStreamPA->pDrv = pThis;
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+
     return rc;
 }
 
 
-static int paCreateStreamIn(PPDMIHOSTAUDIO pInterface,
-                            PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
-
-    pStreamPA->SampleSpec.format   = paFmtToPulse(pCfgReq->enmFormat);
-    pStreamPA->SampleSpec.rate     = pCfgReq->uHz;
-    pStreamPA->SampleSpec.channels = pCfgReq->cChannels;
+static int paCreateStreamIn(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM  pStreamPA,
+                            PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    pStreamPA->SampleSpec.format   = paAudioPropsToPulse(&pCfgReq->Props);
+    pStreamPA->SampleSpec.rate     = pCfgReq->Props.uHz;
+    pStreamPA->SampleSpec.channels = pCfgReq->Props.cChannels;
 
     /** @todo Check these values! */
@@ -723 +713 @@
     /* Note: Other members of BufAttr are ignored for record streams. */
     int rc = paStreamOpen(pThis, true /* fIn */, "PulseAudio (In)", &pStreamPA->SampleSpec, &pStreamPA->BufAttr,
-                          &pStreamPA->pPAStream);
+                          &pStreamPA->pStream);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = paPulseToFmt(pStreamPA->SampleSpec.format, &pCfgAcq->enmFormat, &pCfgAcq->enmEndianness);
+    rc = paPulseToAudioProps(pStreamPA->SampleSpec.format, &pCfgAcq->Props);
     if (RT_FAILURE(rc))
     {
@@ -734 +724 @@
     }
 
-    rc = DrvAudioHlpStreamCfgToProps(pCfgAcq, &pStreamPA->Props);
-    if (RT_SUCCESS(rc))
-    {
-        pStreamPA->pDrv       = pThis;
-        pStreamPA->pu8PeekBuf = NULL;
-
-        pCfgAcq->uHz               = pStreamPA->SampleSpec.rate;
-        pCfgAcq->cChannels         = pStreamPA->SampleSpec.channels;
-        pCfgAcq->cSampleBufferSize = PDMAUDIOPCMPROPS_B2S(&pStreamPA->Props,
-                                                          RT_MIN(pStreamPA->BufAttr.fragsize * 10, pStreamPA->BufAttr.maxlength));
-    }
+    pStreamPA->pDrv       = pThis;
+    pStreamPA->pu8PeekBuf = NULL;
+
+    pCfgAcq->Props.uHz         = pStreamPA->SampleSpec.rate;
+    pCfgAcq->Props.cChannels   = pStreamPA->SampleSpec.channels;
+    pCfgAcq->cSampleBufferHint = PDMAUDIOSTREAMCFG_B2S(pCfgAcq,
+                                                       RT_MIN(pStreamPA->BufAttr.fragsize * 10, pStreamPA->BufAttr.maxlength));
 
     LogFlowFuncLeaveRC(rc);
@@ -755 +741 @@
  */
 static DECLCALLBACK(int) drvHostPulseAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                        PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pvBuf, cbBuf);
@@ -769 +755 @@
     /* We should only call pa_stream_readable_size() once and trust the first value. */
     pa_threaded_mainloop_lock(pThis->pMainLoop);
-    size_t cbAvail = pa_stream_readable_size(pStreamPA->pPAStream);
+    size_t cbAvail = pa_stream_readable_size(pStreamPA->pStream);
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
@@ -806 +792 @@
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            pa_stream_peek(pStreamPA->pPAStream,
+            pa_stream_peek(pStreamPA->pStream,
                            (const void**)&pStreamPA->pu8PeekBuf, &pStreamPA->cbPeekBuf);
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -849 +835 @@
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            pa_stream_drop(pStreamPA->pPAStream);
+            pa_stream_drop(pStreamPA->pStream);
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
@@ -870 +856 @@
  */
 static DECLCALLBACK(int) drvHostPulseAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                     PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                     PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                      uint32_t *pcbWritten)
 {
@@ -891 +877 @@
     do
     {
-        size_t cbWriteable = pa_stream_writable_size(pPAStream->pPAStream);
+        size_t cbWriteable = pa_stream_writable_size(pPAStream->pStream);
         if (cbWriteable == (size_t)-1)
         {
@@ -904 +890 @@
         {
             cbWritten = cbToWrite;
-            if (pa_stream_write(pPAStream->pPAStream, (uint8_t *)pvBuf + cbWrittenTotal, cbWritten, NULL /* Cleanup callback */,
+            if (pa_stream_write(pPAStream->pStream, (uint8_t *)pvBuf + cbWrittenTotal, cbWritten, NULL /* Cleanup callback */,
                                 0, PA_SEEK_RELATIVE) < 0)
             {
@@ -1120 +1106 @@
 
 
-static int paDestroyStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
-
+static int paDestroyStreamIn(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA)
+{
     LogFlowFuncEnter();
 
-    if (pStrm->pPAStream)
+    if (pStreamPA->pStream)
     {
         pa_threaded_mainloop_lock(pThis->pMainLoop);
 
-        pa_stream_disconnect(pStrm->pPAStream);
-        pa_stream_unref(pStrm->pPAStream);
-
-        pStrm->pPAStream = NULL;
+        pa_stream_disconnect(pStreamPA->pStream);
+        pa_stream_unref(pStreamPA->pStream);
+
+        pStreamPA->pStream = NULL;
 
         pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1146 +1126 @@
 
 
-static int paDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    AssertPtrReturn(pInterface,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
-
-    LogFlowFuncEnter();
-
-    if (pStrm->pPAStream)
+static int paDestroyStreamOut(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA)
+{
+    if (pStreamPA->pStream)
     {
         pa_threaded_mainloop_lock(pThis->pMainLoop);
 
         /* Make sure to cancel a pending draining operation, if any. */
-        if (pStrm->pDrainOp)
-        {
-            pa_operation_cancel(pStrm->pDrainOp);
-            pStrm->pDrainOp = NULL;
-        }
-
-        pa_stream_disconnect(pStrm->pPAStream);
-        pa_stream_unref(pStrm->pPAStream);
-
-        pStrm->pPAStream = NULL;
+        if (pStreamPA->pDrainOp)
+        {
+            pa_operation_cancel(pStreamPA->pDrainOp);
+            pStreamPA->pDrainOp = NULL;
+        }
+
+        pa_stream_disconnect(pStreamPA->pStream);
+        pa_stream_unref(pStreamPA->pStream);
+
+        pStreamPA->pStream = NULL;
 
         pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1179 +1151 @@
 
 
-static int paControlStreamOut(PPDMIHOSTAUDIO pInterface,
-                              PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    AssertPtrReturn(pInterface , VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
-
+static int paControlStreamOut(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
     int rc = VINF_SUCCESS;
-
-    LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
 
     switch (enmStreamCmd)
@@ -1199 +1162 @@
             pa_threaded_mainloop_lock(pThis->pMainLoop);
 
-            if (   pStrm->pDrainOp
-                && pa_operation_get_state(pStrm->pDrainOp) != PA_OPERATION_DONE)
+            if (   pStreamPA->pDrainOp
+                && pa_operation_get_state(pStreamPA->pDrainOp) != PA_OPERATION_DONE)
             {
-                pa_operation_cancel(pStrm->pDrainOp);
-                pa_operation_unref(pStrm->pDrainOp);
-
-                pStrm->pDrainOp = NULL;
+                pa_operation_cancel(pStreamPA->pDrainOp);
+                pa_operation_unref(pStreamPA->pDrainOp);
+
+                pStreamPA->pDrainOp = NULL;
             }
             else
             {
-                rc = paWaitFor(pThis, pa_stream_cork(pStrm->pPAStream, 0, paStreamCbSuccess, pStrm));
+                rc = paWaitFor(pThis, pa_stream_cork(pStreamPA->pStream, 0, paStreamCbSuccess, pStreamPA));
             }
 
@@ -1222 +1185 @@
              * Note that we must return immediately from here! */
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            if (!pStrm->pDrainOp)
+            if (!pStreamPA->pDrainOp)
             {
-                rc = paWaitFor(pThis, pa_stream_trigger(pStrm->pPAStream, paStreamCbSuccess, pStrm));
+                rc = paWaitFor(pThis, pa_stream_trigger(pStreamPA->pStream, paStreamCbSuccess, pStreamPA));
                 if (RT_SUCCESS(rc))
-                    pStrm->pDrainOp = pa_stream_drain(pStrm->pPAStream, paStreamCbDrain, pStrm);
+                    pStreamPA->pDrainOp = pa_stream_drain(pStreamPA->pStream, paStreamCbDrain, pStreamPA);
             }
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1243 +1206 @@
 
 
-static int paControlStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
-                             PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
-
+static int paControlStreamIn(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
     int rc = VINF_SUCCESS;
 
@@ -1262 +1218 @@
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            rc = paWaitFor(pThis, pa_stream_cork(pStrm->pPAStream, 0 /* Play / resume */, paStreamCbSuccess, pStrm));
+            rc = paWaitFor(pThis, pa_stream_cork(pStreamPA->pStream, 0 /* Play / resume */, paStreamCbSuccess, pStreamPA));
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
             break;
@@ -1271 +1227 @@
         {
             pa_threaded_mainloop_lock(pThis->pMainLoop);
-            if (pStrm->pu8PeekBuf) /* Do we need to drop the peek buffer?*/
+            if (pStreamPA->pu8PeekBuf) /* Do we need to drop the peek buffer?*/
             {
-                pa_stream_drop(pStrm->pPAStream);
-                pStrm->pu8PeekBuf = NULL;
+                pa_stream_drop(pStreamPA->pStream);
+                pStreamPA->pu8PeekBuf = NULL;
             }
 
-            rc = paWaitFor(pThis, pa_stream_cork(pStrm->pPAStream, 1 /* Stop / pause */, paStreamCbSuccess, pStrm));
+            rc = paWaitFor(pThis, pa_stream_cork(pStreamPA->pStream, 1 /* Stop / pause */, paStreamCbSuccess, pStreamPA));
             pa_threaded_mainloop_unlock(pThis->pMainLoop);
             break;
@@ -1352 +1308 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostPulseAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostPulseAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1359 +1316 @@
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = paCreateStreamIn(pInterface,  pStream, pCfgReq, pCfgAcq);
-    else if (pStream->enmDir == PDMAUDIODIR_OUT)
-        rc = paCreateStreamOut(pInterface, pStream, pCfgReq, pCfgAcq);
+        rc = paCreateStreamIn (pThis, pStreamPA, pCfgReq, pCfgAcq);
+    else if (pCfgReq->enmDir == PDMAUDIODIR_OUT)
+        rc = paCreateStreamOut(pThis, pStreamPA, pCfgReq, pCfgAcq);
     else
         AssertFailedReturn(VERR_NOT_IMPLEMENTED);
 
+    if (RT_SUCCESS(rc))
+    {
+        pStreamPA->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamPA->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
+
     return rc;
 }
@@ -1374 +1341 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostPulseAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostPulseAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+
+    if (!pStreamPA->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = paDestroyStreamIn(pInterface,  pStream);
-    else if (pStream->enmDir == PDMAUDIODIR_OUT)
-        rc = paDestroyStreamOut(pInterface, pStream);
+    if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = paDestroyStreamIn (pThis, pStreamPA);
+    else if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_OUT)
+        rc = paDestroyStreamOut(pThis, pStreamPA);
     else
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED);
+        AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamPA->pCfg);
+        pStreamPA->pCfg = NULL;
+    }
 
     return rc;
@@ -1394 +1373 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostPulseAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHostPulseAudioStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+
+    if (!pStreamPA->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-        rc = paControlStreamIn(pInterface,  pStream, enmStreamCmd);
-    else if (pStream->enmDir == PDMAUDIODIR_OUT)
-        rc = paControlStreamOut(pInterface, pStream, enmStreamCmd);
+    if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = paControlStreamIn (pThis, pStreamPA, enmStreamCmd);
+    else if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_OUT)
+        rc = paControlStreamOut(pThis, pStreamPA, enmStreamCmd);
     else
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED);
+        AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
 
     return rc;
@@ -1416 +1400 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
-    PPULSEAUDIOSTREAM  pStrm = (PPULSEAUDIOSTREAM)pStream;
+    PDRVHOSTPULSEAUDIO pThis     = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
+    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
 
     PDMAUDIOSTRMSTS strmSts  = PDMAUDIOSTRMSTS_FLAG_NONE;
@@ -1437 +1421 @@
 
     /* Check the PulseAudio stream. */
-    if (PA_STREAM_IS_GOOD(pa_stream_get_state(pStrm->pPAStream)))
+    if (PA_STREAM_IS_GOOD(pa_stream_get_state(pStreamPA->pStream)))
     {
         size_t cbSize;
-        if (pStream->enmDir == PDMAUDIODIR_IN)
-        {
-            cbSize = pa_stream_readable_size(pStrm->pPAStream);
+        if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_IN)
+        {
+            cbSize = pa_stream_readable_size(pStreamPA->pStream);
             Log3Func(("cbSize=%zu\n", cbSize));
 
@@ -1448 +1432 @@
                 strmSts |= PDMAUDIOSTRMSTS_FLAG_DATA_READABLE;
         }
-        else if (pStream->enmDir == PDMAUDIODIR_OUT)
-        {
-            cbSize = pa_stream_writable_size(pStrm->pPAStream);
-            Log3Func(("cbSize=%zu, cbMinReq=%RU32\n", cbSize, pStrm->BufAttr.minreq));
-
-            if (cbSize >= pStrm->BufAttr.minreq)
+        else if (pStreamPA->pCfg->enmDir == PDMAUDIODIR_OUT)
+        {
+            cbSize = pa_stream_writable_size(pStreamPA->pStream);
+            Log3Func(("cbSize=%zu, cbMinReq=%RU32\n", cbSize, pStreamPA->BufAttr.minreq));
+
+            if (cbSize >= pStreamPA->BufAttr.minreq)
                 strmSts |= PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE;
         }
@@ -1469 +1453 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvHostPulseAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostPulseAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

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

@@ -33 +33 @@
 typedef struct VAKITAUDIOSTREAM
 {
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM     Stream;
+    /** The stream's acquired configuration. */
+    PDMAUDIOSTREAMCFG  Cfg;
     /** Audio file to dump output to or read input from. */
     PDMAUDIOFILE       File;
@@ -128 +128 @@
 
 static int debugCreateStreamIn(PPDMIHOSTAUDIO pInterface,
-                               PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+                               PPDMAUDIOBACKENDSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     RT_NOREF(pInterface, pStream);
@@ -134 +134 @@
     /* Just adopt the wanted stream configuration. */
     PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
+    int rc = DrvAudioHlpStreamCfgDup(pCfgReq, &Props);
     if (RT_SUCCESS(rc))
     {
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = _1K;
+            pCfgAcq->cSampleBufferHint = _1K;
     }
 
@@ -147 +147 @@
 
 static int debugCreateStreamOut(PPDMIHOSTAUDIO pInterface,
-                                PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+                                PPDMAUDIOBACKENDSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     NOREF(pInterface);
@@ -155 +155 @@
     /* Just adopt the wanted stream configuration. */
     PDMAUDIOPCMPROPS Props;
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &Props);
+    int rc = DrvAudioHlpStreamCfgDup(pCfgReq, &Props);
     if (RT_SUCCESS(rc))
     {
@@ -204 +204 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = pDbgStream->Out.cMaxSamplesInPlayBuffer;
+            pCfgAcq->cSampleBufferHint = pDbgStream->Out.cMaxSamplesInPlayBuffer;
     }
 
@@ -216 +216 @@
  */
 static DECLCALLBACK(int) drvHostVaKitAudioStreamCreate(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream,
+                                                       PPDMAUDIOBACKENDSTREAM pStream,
                                                        PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
@@ -238 +238 @@
  */
 static DECLCALLBACK(int) drvHostVaKitAudioStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                     PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
+                                                     PPDMAUDIOBACKENDSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                      uint32_t *pcbWritten)
 {
@@ -338 +338 @@
  */
 static DECLCALLBACK(int) drvHostVaKitAudioStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                        PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface, pStream, pvBuf, cbBuf);
@@ -350 +350 @@
 
 
-static int debugDestroyStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static int debugDestroyStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface, pStream);
@@ -358 +358 @@
 
 
-static int debugDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static int debugDestroyStreamOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -400 +400 @@
 
 
-static DECLCALLBACK(int) drvHostVaKitAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostVaKitAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -415 +415 @@
 
 static DECLCALLBACK(int) drvHostVaKitAudioStreamControl(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     RT_NOREF(enmStreamCmd);
@@ -427 +427 @@
 }
 
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     NOREF(pInterface);
@@ -436 +436 @@
 }
 
-static DECLCALLBACK(int) drvHostVaKitAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvHostVaKitAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     NOREF(pInterface);

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -601 +601 @@
 
     uint32_t    u32A_param;
-    AMPLIFIER B_params;
+    AMPLIFIER   B_params;
 
 } DACNODE, *PDACNODE;
@@ -1584 +1584 @@
  * Misc helpers.
  */
-static int hdaCodecToAudVolume(PHDACODEC pThis, AMPLIFIER *pAmp, PDMAUDIOMIXERCTL enmMixerCtl)
-{
+static int hdaCodecToAudVolume(PHDACODEC pThis, PCODECNODE pNode, AMPLIFIER *pAmp, PDMAUDIOMIXERCTL enmMixerCtl)
+{
+    RT_NOREF(pNode);
+
     uint8_t iDir;
     switch (enmMixerCtl)
@@ -1621 +1623 @@
 
     PDMAUDIOVOLUME Vol = { RT_BOOL(iMute), lVol, rVol };
+
+    LogFunc(("[NID0x%02x] %RU8/%RU8 (%s)\n",
+             pNode->node.uID, lVol, rVol, RT_BOOL(iMute) ? "Muted" : "Unmuted"));
 
     LogRel2(("HDA: Setting volume for mixer control '%s' to %RU8/%RU8 (%s)\n",
@@ -1744 +1749 @@
     bool fIsOut     = CODEC_SET_AMP_IS_OUT_DIRECTION(cmd);
     bool fIsIn      = CODEC_SET_AMP_IS_IN_DIRECTION(cmd);
+    bool fIsLeft    = CODEC_SET_AMP_IS_LEFT_SIDE(cmd);
     bool fIsRight   = CODEC_SET_AMP_IS_RIGHT_SIDE(cmd);
-    bool fIsLeft    = CODEC_SET_AMP_IS_LEFT_SIDE(cmd);
     uint8_t u8Index = CODEC_SET_AMP_INDEX(cmd);
 
@@ -1751 +1756 @@
         || (!fIsOut && !fIsIn))
         return VINF_SUCCESS;
+
+    LogFunc(("[NID0x%02x] fIsOut=%RTbool, fIsIn=%RTbool, fIsLeft=%RTbool, fIsRight=%RTbool, Idx=%RU8\n",
+             CODEC_NID(cmd), fIsOut, fIsIn, fIsLeft, fIsRight, u8Index));
 
     if (fIsIn)
@@ -1759 +1767 @@
             hdaCodecSetRegisterU8(&AMPLIFIER_REGISTER(*pAmplifier, AMPLIFIER_IN, AMPLIFIER_RIGHT, u8Index), cmd, 0);
 
-        /** @todo Fix ID of u8AdcVolsLineIn! */
-        hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_LINE_IN);
+    //    if (CODEC_NID(cmd) == pThis->u8AdcVolsLineIn)
+    //    {
+            hdaCodecToAudVolume(pThis, pNode, pAmplifier, PDMAUDIOMIXERCTL_LINE_IN);
+    //    }
     }
     if (fIsOut)
@@ -1770 +1780 @@
 
         if (CODEC_NID(cmd) == pThis->u8DacLineOut)
-            hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_FRONT);
+            hdaCodecToAudVolume(pThis, pNode, pAmplifier, PDMAUDIOMIXERCTL_FRONT);
     }
 
@@ -2325 +2335 @@
 #endif
 
+/* F06 */
 static DECLCALLBACK(int) vrbProcGetStreamId(PHDACODEC pThis, uint32_t cmd, uint64_t *pResp)
 {
@@ -2348 +2359 @@
 }
 
-/* F06 */
+/* 706 */
 static DECLCALLBACK(int) vrbProcSetStreamId(PHDACODEC pThis, uint32_t cmd, uint64_t *pResp)
 {
     *pResp = 0;
 
+    uint8_t uSD      = CODEC_F00_06_GET_STREAM_ID(cmd);
+    uint8_t uChannel = CODEC_F00_06_GET_CHANNEL_ID(cmd);
+
+    LogFlowFunc(("[NID0x%02x] Setting to stream ID=%RU8, channel=%RU8\n",
+                 CODEC_NID(cmd), uSD, uChannel));
+
     PDMAUDIODIR enmDir;
-
     uint32_t *pu32Addr = NULL;
     if (hdaCodecIsDacNode(pThis, CODEC_NID(cmd)))
@@ -2385 +2401 @@
     if (enmDir != PDMAUDIODIR_UNKNOWN)
     {
-        uint8_t uSD      = CODEC_F00_06_GET_STREAM_ID(cmd);
-        uint8_t uChannel = CODEC_F00_06_GET_CHANNEL_ID(cmd);
-
-        LogFlowFunc(("[NID0x%02x] Setting to stream ID=%RU8, channel=%RU8, enmDir=%RU32\n",
-                     CODEC_NID(cmd), uSD, uChannel, enmDir));
-
         pThis->paNodes[CODEC_NID(cmd)].node.uSD      = uSD;
         pThis->paNodes[CODEC_NID(cmd)].node.uChannel = uChannel;
@@ -3114 +3124 @@
 int hdaCodecLoadState(PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion)
 {
-    PCSSMFIELD pFields;
-    uint32_t   fFlags;
+    int rc = VINF_SUCCESS;
+
+    PCSSMFIELD pFields = NULL;
+    uint32_t   fFlags  = 0;
     switch (uVersion)
     {
@@ -3149 +3161 @@
 
         default:
-            return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    }
-
-    for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)
-    {
-        uint8_t idOld = pThis->paNodes[idxNode].SavedState.Core.uID;
-        int rc = SSMR3GetStructEx(pSSM, &pThis->paNodes[idxNode].SavedState,
-                                  sizeof(pThis->paNodes[idxNode].SavedState),
-                                  fFlags, pFields, NULL);
-        if (RT_FAILURE(rc))
-            return rc;
-        AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.uID,
-                              ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.uID, idOld),
-                              VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
-    }
-
-    /*
-     * Update stuff after changing the state.
-     */
-    if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
-        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_FRONT);
-    else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
-        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
-    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
-
-    return VINF_SUCCESS;
+            rc = VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)
+        {
+            uint8_t idOld = pThis->paNodes[idxNode].SavedState.Core.uID;
+            int rc2 = SSMR3GetStructEx(pSSM, &pThis->paNodes[idxNode].SavedState,
+                                       sizeof(pThis->paNodes[idxNode].SavedState),
+                                       fFlags, pFields, NULL);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+
+            if (RT_FAILURE(rc))
+                break;
+
+            AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.uID,
+                                  ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.uID, idOld),
+                                  VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Update stuff after changing the state.
+             */
+            PCODECNODE pNode;
+            if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
+            {
+                pNode = &pThis->paNodes[pThis->u8DacLineOut];
+                hdaCodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
+            }
+            else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
+            {
+                pNode = &pThis->paNodes[pThis->u8DacLineOut];
+                hdaCodecToAudVolume(pThis, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
+            }
+
+            pNode = &pThis->paNodes[pThis->u8AdcVolsLineIn];
+            hdaCodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -3258 +3291 @@
         PDMAUDIOSTREAMCFG strmCfg;
         RT_ZERO(strmCfg);
-        strmCfg.uHz           = 44100;
-        strmCfg.cChannels     = 2;
-        strmCfg.enmFormat     = PDMAUDIOFMT_S16;
-        strmCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
+
+        strmCfg.Props.uHz       = 44100;
+        strmCfg.Props.cChannels = 2;
+        strmCfg.Props.cBits     = 16;
+        strmCfg.Props.fSigned   = true;
 
         /* Note: Adding the default input/output streams is *not* critical for the overall
@@ -3318 +3352 @@
      * Set initial volume.
      */
-    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params,       PDMAUDIOMIXERCTL_FRONT);
-    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
+    PCODECNODE pNode = &pThis->paNodes[pThis->u8DacLineOut];
+    hdaCodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
+
+    pNode = &pThis->paNodes[pThis->u8AdcVolsLineIn];
+    hdaCodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-    #error "Implement mic-in support!"
+# error "Implement mic-in support!"
 #endif
 

trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp

@@ -46 +46 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        44100,                    /* Hz */
-        2                         /* Channels */,
-        PDMAUDIOFMT_S16           /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-    PDMAUDIOPCMPROPS props;
-
-    int rc = DrvAudioHlpStreamCfgToProps(&config, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          2,                        /* Channels */
+          44100,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&config));
 
     uint32_t cBufSize = _1K;
@@ -62 +63 @@
      */
     PDMAUDIOMIXBUF mb;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&mb, "Single", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&mb, "Single", &config.Props, cBufSize));
     RTTESTI_CHECK(AudioMixBufSize(&mb) == cBufSize);
     RTTESTI_CHECK(AUDIOMIXBUF_B2S(&mb, AudioMixBufSizeBytes(&mb)) == cBufSize);
@@ -149 +150 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        44100,                    /* Hz */
-        2                         /* Channels */,
-        PDMAUDIOFMT_S16           /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    PDMAUDIOPCMPROPS props;
-    int rc = DrvAudioHlpStreamCfgToProps(&cfg_p, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          2,                        /* Channels */
+          44100,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_p));
 
     PDMAUDIOMIXBUF parent;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p.Props, cBufSize));
 
     PDMAUDIOSTREAMCFG cfg_c1 = /* Upmixing to parent */
@@ -167 +169 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        22050,                    /* Hz */
-        2                         /* Channels */,
-        PDMAUDIOFMT_S16           /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    rc = DrvAudioHlpStreamCfgToProps(&cfg_c1, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          2,                        /* Channels */
+          22050,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_c1));
 
     PDMAUDIOMIXBUF child1;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child1, "Child1", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child1, "Child1", &cfg_c1.Props, cBufSize));
     RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child1, &parent));
 
@@ -185 +189 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        48000,                    /* Hz */
-        2                         /* Channels */,
-        PDMAUDIOFMT_S16           /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    rc = DrvAudioHlpStreamCfgToProps(&cfg_c2, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          2,                        /* Channels */
+          48000,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_c2));
 
     PDMAUDIOMIXBUF child2;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child2, "Child2", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child2, "Child2", &cfg_c2.Props, cBufSize));
     RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child2, &parent));
 
@@ -262 +268 @@
     unsigned         i;
     uint32_t         cBufSize = 256;
-    PDMAUDIOPCMPROPS props;
 
     RTTestSubF(hTest, "Sample conversion (U8)");
@@ -271 +276 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        44100,                    /* Hz */
-        1                         /* Channels */,
-        PDMAUDIOFMT_U8            /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    int rc = DrvAudioHlpStreamCfgToProps(&cfg_p, &props);
-    AssertRC(rc);
+        { 8,                        /* Bits */
+          false,                    /* Signed */
+          1,                        /* Shift */
+          1,                        /* Channels */
+          44100,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_p));
 
     PDMAUDIOMIXBUF parent;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p.Props, cBufSize));
 
     /* Child uses half the sample rate; that ensures the mixing engine can't
@@ -295 +302 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        22050,                    /* Hz */
-        1                         /* Channels */,
-        PDMAUDIOFMT_U8            /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    rc = DrvAudioHlpStreamCfgToProps(&cfg_c, &props);
-    AssertRC(rc);
+        { 8,                        /* Bits */
+          false,                    /* Signed */
+          1,                        /* Shift */
+          1,                        /* Channels */
+          22050,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_c));
 
     PDMAUDIOMIXBUF child;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg_c.Props, cBufSize));
     RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
 
@@ -324 +333 @@
 
     /**** 8-bit unsigned samples ****/
-    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Conversion test %uHz %uch 8-bit\n", cfg_c.uHz, cfg_c.cChannels);
+    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Conversion test %uHz %uch 8-bit\n", cfg_c.Props.uHz, cfg_c.Props.cChannels);
     RTTESTI_CHECK_RC_OK(AudioMixBufWriteCirc(&child, &samples, sizeof(samples), &cSamplesWritten));
     RTTESTI_CHECK_MSG(cSamplesWritten == cSamplesChild, ("Child: Expected %RU32 written samples, got %RU32\n", cSamplesChild, cSamplesWritten));
@@ -370 +379 @@
     unsigned         i;
     uint32_t         cBufSize = 256;
-    PDMAUDIOPCMPROPS props;
 
     RTTestSubF(hTest, "Sample conversion (S16)");
@@ -379 +387 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        44100,                    /* Hz */
-        1                         /* Channels */,
-        PDMAUDIOFMT_S16           /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    int rc = DrvAudioHlpStreamCfgToProps(&cfg_p, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          1,                        /* Channels */
+          44100,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_p));
 
     PDMAUDIOMIXBUF parent;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg_p.Props, cBufSize));
 
     PDMAUDIOSTREAMCFG cfg_c =   /* Upmixing to parent */
@@ -396 +406 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        22050,                    /* Hz */
-        1                         /* Channels */,
-        PDMAUDIOFMT_S16               /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    rc = DrvAudioHlpStreamCfgToProps(&cfg_c, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          1,                        /* Channels */
+          22050,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg_c));
 
     PDMAUDIOMIXBUF child;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg_c.Props, cBufSize));
     RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
 
@@ -425 +437 @@
 
     /**** 16-bit signed samples ****/
-    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Conversion test %uHz %uch 16-bit\n", cfg_c.uHz, cfg_c.cChannels);
+    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Conversion test %uHz %uch 16-bit\n", cfg_c.Props.uHz, cfg_c.Props.cChannels);
     RTTESTI_CHECK_RC_OK(AudioMixBufWriteCirc(&child, &samples, sizeof(samples), &cSamplesWritten));
     RTTESTI_CHECK_MSG(cSamplesWritten == cSamplesChild, ("Child: Expected %RU32 written samples, got %RU32\n", cSamplesChild, cSamplesWritten));
@@ -470 +482 @@
     unsigned         i;
     uint32_t         cBufSize = 256;
-    PDMAUDIOPCMPROPS props;
 
     RTTestSubF(hTest, "Volume control");
@@ -480 +491 @@
         PDMAUDIODIR_OUT,
         { PDMAUDIOPLAYBACKDEST_UNKNOWN },
-        44100,                    /* Hz */
-        2                         /* Channels */,
-        PDMAUDIOFMT_S16               /* Format */,
-        PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */
-    };
-
-    int rc = DrvAudioHlpStreamCfgToProps(&cfg, &props);
-    AssertRC(rc);
+        { 16,                       /* Bits */
+          true,                     /* Signed */
+          1,                        /* Shift */
+          2,                        /* Channels */
+          44100,                    /* Hz */
+          false                     /* Swap Endian */ },
+        0 /* cSampleBufferSize */
+    };
+
+    RTTESTI_CHECK(DrvAudioHlpStreamCfgIsValid(&cfg));
 
     PDMAUDIOVOLUME vol = { false, 0, 0 };   /* Not muted. */
     PDMAUDIOMIXBUF parent;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&parent, "Parent", &cfg.Props, cBufSize));
 
     PDMAUDIOMIXBUF child;
-    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &props, cBufSize));
+    RTTESTI_CHECK_RC_OK(AudioMixBufInit(&child, "Child", &cfg.Props, cBufSize));
     RTTESTI_CHECK_RC_OK(AudioMixBufLinkTo(&child, &parent));
 
@@ -515 +528 @@
 
     /**** Volume control test ****/
-    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Volume control test %uHz %uch \n", cfg.uHz, cfg.cChannels);
+    RTTestPrintf(hTest, RTTESTLVL_DEBUG, "Volume control test %uHz %uch \n", cfg.Props.uHz, cfg.Props.cChannels);
 
     /* 1) Full volume/0dB attenuation (255). */

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

@@ -61 +61 @@
 } DRVAUDIOVRDE, *PDRVAUDIOVRDE;
 
-typedef struct VRDESTREAMIN
-{
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM       Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS     Props;
-    /** Number of samples this stream can handle at once. */
-    uint32_t             cSamplesMax;
-    /** Circular buffer for holding the recorded audio samples from the host. */
-    PRTCIRCBUF           pCircBuf;
-} VRDESTREAMIN, *PVRDESTREAMIN;
-
-typedef struct VRDESTREAMOUT
-{
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM       Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS     Props;
-    uint64_t             old_ticks;
-    uint64_t             cSamplesSentPerSec;
-} VRDESTREAMOUT, *PVRDESTREAMOUT;
-
-
-
-static int vrdeCreateStreamIn(PVRDESTREAMIN pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStreamVRDE->Props);
+typedef struct VRDESTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG pCfg;
+    union
+    {
+        struct
+        {
+            /** Number of samples this stream can handle at once. */
+            uint32_t    cSamplesMax;
+            /** Circular buffer for holding the recorded audio samples from the host. */
+            PRTCIRCBUF  pCircBuf;
+        } In;
+        struct
+        {
+            uint64_t    old_ticks;
+            uint64_t    cSamplesSentPerSec;
+        } Out;
+    };
+} VRDESTREAM, *PVRDESTREAM;
+
+
+static int vrdeCreateStreamIn(PVRDESTREAM pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    pStreamVRDE->In.cSamplesMax = _1K; /** @todo Make this configurable. */
+
+    int rc = RTCircBufCreate(&pStreamVRDE->In.pCircBuf, pStreamVRDE->In.cSamplesMax * (pCfgReq->Props.cBits / 8) /* Bytes */);
     if (RT_SUCCESS(rc))
     {
-        pStreamVRDE->cSamplesMax = _1K; /** @todo Make this configurable. */
-
-        rc = RTCircBufCreate(&pStreamVRDE->pCircBuf, pStreamVRDE->cSamplesMax * (pStreamVRDE->Props.cBits / 8) /* Bytes */);
-        if (RT_SUCCESS(rc))
-        {
-            if (pCfgAcq)
-                pCfgAcq->cSampleBufferSize = pStreamVRDE->cSamplesMax;
-        }
+        if (pCfgAcq)
+            pCfgAcq->cSampleBufferHint = pStreamVRDE->In.cSamplesMax;
     }
 
@@ -104 +98 @@
 
 
-static int vrdeCreateStreamOut(PVRDESTREAMOUT pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStreamVRDE->Props);
-    if (RT_SUCCESS(rc))
-    {
-        if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = _4K; /** @todo Make this configurable. */
-    }
-
-    return rc;
-}
-
-
-static int vrdeControlStreamOut(PDRVAUDIOVRDE pDrv, PVRDESTREAMOUT pStreamVRDE, PDMAUDIOSTREAMCMD enmStreamCmd)
+static int vrdeCreateStreamOut(PVRDESTREAM pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    RT_NOREF(pStreamVRDE, pCfgReq);
+
+    if (pCfgAcq)
+        pCfgAcq->cSampleBufferHint = _4K; /** @todo Make this configurable. */
+
+    return VINF_SUCCESS;
+}
+
+
+static int vrdeControlStreamOut(PDRVAUDIOVRDE pDrv, PVRDESTREAM pStreamVRDE, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     RT_NOREF(pDrv, pStreamVRDE, enmStreamCmd);
@@ -127 +119 @@
 
 
-static int vrdeControlStreamIn(PDRVAUDIOVRDE pDrv, PVRDESTREAMIN pVRDEStrmIn, PDMAUDIOSTREAMCMD enmStreamCmd)
+static int vrdeControlStreamIn(PDRVAUDIOVRDE pDrv, PVRDESTREAM pStreamVRDE, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
@@ -141 +133 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, pVRDEStrmIn->cSamplesMax,
-                                                               pVRDEStrmIn->Props.uHz,
-                                                               pVRDEStrmIn->Props.cChannels, pVRDEStrmIn->Props.cBits);
+            rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pStreamVRDE, pStreamVRDE->In.cSamplesMax,
+                                                               pStreamVRDE->pCfg->Props.uHz, pStreamVRDE->pCfg->Props.cChannels,
+                                                               pStreamVRDE->pCfg->Props.cBits);
             if (rc == VERR_NOT_SUPPORTED)
             {
@@ -203 +195 @@
  */
 static DECLCALLBACK(int) drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                   PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                   PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -211 +203 @@
     /* pcbRead is optional. */
 
-    PVRDESTREAMIN pStreamVRDE = (PVRDESTREAMIN)pStream;
+    PVRDESTREAM pStreamVRDE = (PVRDESTREAM)pStream;
 
     size_t cbData = 0;
 
-    if (RTCircBufUsed(pStreamVRDE->pCircBuf))
+    if (RTCircBufUsed(pStreamVRDE->In.pCircBuf))
     {
         void *pvData;
 
-        RTCircBufAcquireReadBlock(pStreamVRDE->pCircBuf, cbBuf, &pvData, &cbData);
+        RTCircBufAcquireReadBlock(pStreamVRDE->In.pCircBuf, cbBuf, &pvData, &cbData);
 
         if (cbData)
             memcpy(pvBuf, pvData, cbData);
 
-        RTCircBufReleaseReadBlock(pStreamVRDE->pCircBuf, cbData);
+        RTCircBufReleaseReadBlock(pStreamVRDE->In.pCircBuf, cbData);
     }
 
@@ -237 +229 @@
  * @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, PPDMAUDIOBACKENDSTREAM pStream,
+                                                const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -246 +238 @@
     /* pcbWritten is optional. */
 
-    PDRVAUDIOVRDE  pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
-    PVRDESTREAMOUT pStreamVRDE = (PVRDESTREAMOUT)pStream;
+    PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
+    PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
 
     uint32_t cbLive           = cbBuf;
 
     uint64_t now              = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-    uint64_t ticks            = now  - pStreamVRDE->old_ticks;
+    uint64_t ticks            = now  - pStreamVRDE->Out.old_ticks;
     uint64_t ticks_per_second = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
 
+    PPDMAUDIOPCMPROPS pProps  = &pStreamVRDE->pCfg->Props;
+
     /* Minimize the rounding error: samples = int((ticks * freq) / ticks_per_second + 0.5). */
-    uint32_t cbToWrite = (int)((2 * ticks * pStreamVRDE->Props.uHz + ticks_per_second) / ticks_per_second / 2);
+    uint32_t cbToWrite = (int)((2 * ticks * pProps->uHz + ticks_per_second) / ticks_per_second / 2);
 
     /* Remember when samples were consumed. */
-    pStreamVRDE->old_ticks = now;
-
-    VRDEAUDIOFORMAT format = VRDE_AUDIO_FMT_MAKE(pStreamVRDE->Props.uHz,
-                                                 pStreamVRDE->Props.cChannels,
-                                                 pStreamVRDE->Props.cBits,
-                                                 pStreamVRDE->Props.fSigned);
+    pStreamVRDE->Out.old_ticks = now;
+
+    VRDEAUDIOFORMAT format = VRDE_AUDIO_FMT_MAKE(pProps->uHz,
+                                                 pProps->cChannels,
+                                                 pProps->cBits,
+                                                 pProps->fSigned);
 
     Log2Func(("uFreq=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool, enmFormat=%ld, cbLive=%RU32, cbToWrite=%RU32\n",
-              pStreamVRDE->Props.uHz,   pStreamVRDE->Props.cChannels,
-              pStreamVRDE->Props.cBits, pStreamVRDE->Props.fSigned,
-              format, cbLive, cbToWrite));
+              pProps->uHz,   pProps->cChannels, pProps->cBits, pProps->fSigned, format, cbLive, cbToWrite));
 
     /* Don't play more than available. */
@@ -291 +283 @@
 
         pDrv->pConsoleVRDPServer->SendAudioSamples((uint8_t *)pvBuf + cbWritten,
-                                                   PDMAUDIOPCMPROPS_B2S(&pStreamVRDE->Props, cbChunk) /* Samples */, format);
+                                                   PDMAUDIOSTREAMCFG_B2S(pStreamVRDE->pCfg, cbChunk) /* Samples */, format);
         cbWritten += cbChunk;
         Assert(cbWritten <= cbBuf);
@@ -311 +303 @@
 
 
-static int vrdeDestroyStreamIn(PDRVAUDIOVRDE pDrv, PVRDESTREAMIN pStreamVRDE)
+static int vrdeDestroyStreamIn(PDRVAUDIOVRDE pDrv, PVRDESTREAM pStreamVRDE)
 {
     if (pDrv->pConsoleVRDPServer)
         pDrv->pConsoleVRDPServer->SendAudioInputEnd(NULL);
 
-    if (pStreamVRDE->pCircBuf)
-    {
-        RTCircBufDestroy(pStreamVRDE->pCircBuf);
-        pStreamVRDE->pCircBuf = NULL;
-    }
-
-    return VINF_SUCCESS;
-}
-
-
-static int vrdeDestroyStreamOut(PDRVAUDIOVRDE pDrv, PVRDESTREAMOUT pStreamVRDE)
+    if (pStreamVRDE->In.pCircBuf)
+    {
+        RTCircBufDestroy(pStreamVRDE->In.pCircBuf);
+        pStreamVRDE->In.pCircBuf = NULL;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+static int vrdeDestroyStreamOut(PDRVAUDIOVRDE pDrv, PVRDESTREAM pStreamVRDE)
 {
     RT_NOREF(pDrv, pStreamVRDE);
@@ -339 +331 @@
 static DECLCALLBACK(int) drvAudioVRDEGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    pBackendCfg->cbStreamOut    = sizeof(VRDESTREAMOUT);
-    pBackendCfg->cbStreamIn     = sizeof(VRDESTREAMIN);
+    pBackendCfg->cbStreamOut    = sizeof(VRDESTREAM);
+    pBackendCfg->cbStreamIn     = sizeof(VRDESTREAM);
     pBackendCfg->cMaxStreamsIn  = UINT32_MAX;
     pBackendCfg->cMaxStreamsOut = UINT32_MAX;
@@ -379 +371 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface,
-                                                  PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                  PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -389 +381 @@
     RT_NOREF(pInterface);
 
+    PVRDESTREAM pStreamVRDE = (PVRDESTREAM)pStream;
+
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-    {
-        PVRDESTREAMIN pStreamVRDE = (PVRDESTREAMIN)pStream;
-        rc = vrdeCreateStreamIn(pStreamVRDE, pCfgReq, pCfgAcq);
-    }
+        rc = vrdeCreateStreamIn (pStreamVRDE, pCfgReq, pCfgAcq);
     else
-    {
-        PVRDESTREAMOUT pStreamVRDE = (PVRDESTREAMOUT)pStream;
         rc = vrdeCreateStreamOut(pStreamVRDE, pCfgReq, pCfgAcq);
+
+    if (RT_SUCCESS(rc))
+    {
+        pStreamVRDE->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamVRDE->pCfg)
+            rc = VERR_NO_MEMORY;
     }
 
@@ -408 +403 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvAudioVRDEStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvAudioVRDEStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface);
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+
+    PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
+    PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
+
+    if (!pStreamVRDE->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
+    int rc;
+    if (pStreamVRDE->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = vrdeDestroyStreamIn(pDrv, pStreamVRDE);
+    else
+        rc = vrdeDestroyStreamOut(pDrv, pStreamVRDE);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamVRDE->pCfg);
+        pStreamVRDE->pCfg = NULL;
+    }
+
+    return rc;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
+ */
+static DECLCALLBACK(int) drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface,
+                                                   PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
+    PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
+    PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
+
+    if (!pStreamVRDE->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
 
     int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-    {
-        PVRDESTREAMIN pStreamVRDE = (PVRDESTREAMIN)pStream;
-        rc = vrdeDestroyStreamIn(pDrv, pStreamVRDE);
-    }
+    if (pStreamVRDE->pCfg->enmDir == PDMAUDIODIR_IN)
+        rc = vrdeControlStreamIn(pDrv, pStreamVRDE, enmStreamCmd);
     else
-    {
-        PVRDESTREAMOUT pStreamVRDE = (PVRDESTREAMOUT)pStream;
-        rc = vrdeDestroyStreamOut(pDrv, pStreamVRDE);
-    }
+        rc = vrdeControlStreamOut(pDrv, pStreamVRDE, enmStreamCmd);
 
     return rc;
@@ -432 +456 @@
 
 /**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
- */
-static DECLCALLBACK(int) drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface,
-                                                   PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
+ */
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface);
+    RT_NOREF(pStream);
+
+    return (  PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED
+            | PDMAUDIOSTRMSTS_FLAG_DATA_READABLE | PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE);
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
+ */
+static DECLCALLBACK(int) drvAudioVRDEStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-
-    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
-
-    int rc;
-    if (pStream->enmDir == PDMAUDIODIR_IN)
-    {
-        PVRDESTREAMIN pStreamVRDE = (PVRDESTREAMIN)pStream;
-        rc = vrdeControlStreamIn(pDrv, pStreamVRDE, enmStreamCmd);
-    }
-    else
-    {
-        PVRDESTREAMOUT pStreamVRDE = (PVRDESTREAMOUT)pStream;
-        rc = vrdeControlStreamOut(pDrv, pStreamVRDE, enmStreamCmd);
-    }
-
-    return rc;
-}
-
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
- */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    NOREF(pStream);
-
-    return (  PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED
-            | PDMAUDIOSTRMSTS_FLAG_DATA_READABLE | PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE);
-}
-
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
- */
-static DECLCALLBACK(int) drvAudioVRDEStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-
-    LogFlowFuncEnter();
 
     /* Nothing to do here for VRDE. */
@@ -543 +538 @@
     AssertPtrReturn(pVRDEAudioBegin, VERR_INVALID_POINTER);
 
-    PVRDESTREAMIN pVRDEStrmIn = (PVRDESTREAMIN)pvContext;
+    PVRDESTREAM pVRDEStrmIn = (PVRDESTREAM)pvContext;
     AssertPtrReturn(pVRDEStrmIn, VERR_INVALID_POINTER);
 
     VRDEAUDIOFORMAT audioFmt = pVRDEAudioBegin->fmt;
 
-    int iSampleHz  = VRDE_AUDIO_FMT_SAMPLE_FREQ(audioFmt);     NOREF(iSampleHz);
-    int cChannels  = VRDE_AUDIO_FMT_CHANNELS(audioFmt);        NOREF(cChannels);
-    int cBits      = VRDE_AUDIO_FMT_BITS_PER_SAMPLE(audioFmt); NOREF(cBits);
-    bool fUnsigned = VRDE_AUDIO_FMT_SIGNED(audioFmt);          NOREF(fUnsigned);
+    int iSampleHz  = VRDE_AUDIO_FMT_SAMPLE_FREQ(audioFmt);     RT_NOREF(iSampleHz);
+    int cChannels  = VRDE_AUDIO_FMT_CHANNELS(audioFmt);        RT_NOREF(cChannels);
+    int cBits      = VRDE_AUDIO_FMT_BITS_PER_SAMPLE(audioFmt); RT_NOREF(cBits);
+    bool fUnsigned = VRDE_AUDIO_FMT_SIGNED(audioFmt);          RT_NOREF(fUnsigned);
 
     LogFlowFunc(("cbSample=%RU32, iSampleHz=%d, cChannels=%d, cBits=%d, fUnsigned=%RTbool\n",
@@ -562 +557 @@
 int AudioVRDE::onVRDEInputData(void *pvContext, const void *pvData, uint32_t cbData)
 {
-    PVRDESTREAMIN pStreamVRDE = (PVRDESTREAMIN)pvContext;
+    PVRDESTREAM pStreamVRDE = (PVRDESTREAM)pvContext;
     AssertPtrReturn(pStreamVRDE, VERR_INVALID_POINTER);
 
@@ -568 +563 @@
     size_t cbBuf;
 
-    RTCircBufAcquireWriteBlock(pStreamVRDE->pCircBuf, cbData, &pvBuf, &cbBuf);
+    RTCircBufAcquireWriteBlock(pStreamVRDE->In.pCircBuf, cbData, &pvBuf, &cbBuf);
 
     if (cbBuf)
         memcpy(pvBuf, pvData, cbBuf);
 
-    RTCircBufReleaseWriteBlock(pStreamVRDE->pCircBuf, cbBuf);
+    RTCircBufReleaseWriteBlock(pStreamVRDE->In.pCircBuf, cbBuf);
 
     if (cbBuf < cbData)
@@ -584 +579 @@
 int AudioVRDE::onVRDEInputEnd(void *pvContext)
 {
-    NOREF(pvContext);
+    RT_NOREF(pvContext);
 
     return VINF_SUCCESS;

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

@@ -180 +180 @@
 
 /**
- * Audio video recording output stream.
- */
-typedef struct AVRECSTREAMOUT
-{
-    /** Note: Always must come first! */
-    PDMAUDIOSTREAM       Stream;
-    /** The PCM properties of this stream. */
-    PDMAUDIOPCMPROPS     Props;
+ * Audio video recording (output) stream.
+ */
+typedef struct AVRECSTREAM
+{
+    /** The stream's acquired configuration. */
+    PPDMAUDIOSTREAMCFG   pCfg;
     /** (Audio) frame buffer. */
     PRTCIRCBUF           pCircBuf;
     /** Pointer to sink to use for writing. */
     PAVRECSINK           pSink;
-} AVRECSTREAMOUT, *PAVRECSTREAMOUT;
+} AVRECSTREAM, *PAVRECSTREAM;
 
 /**
@@ -359 +357 @@
  * @returns IPRT status code.
  * @param   pThis               Driver instance.
- * @param   pStream             Audio output stream to create.
+ * @param   pStreamAV           Audio output stream to create.
  * @param   pSink               Recording sink to associate audio output stream to.
  * @param   pCfgReq             Requested configuration by the audio backend.
  * @param   pCfgAcq             Acquired configuration by the audio output stream.
  */
-static int avRecCreateStreamOut(PDRVAUDIOVIDEOREC pThis, PPDMAUDIOSTREAM pStream,
+static int avRecCreateStreamOut(PDRVAUDIOVIDEOREC pThis, PAVRECSTREAM pStreamAV,
                                 PAVRECSINK pSink, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    AssertPtrReturn(pSink,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfgAcq, VERR_INVALID_POINTER);
-
-    PAVRECSTREAMOUT pStreamOut = (PAVRECSTREAMOUT)pStream;
+    AssertPtrReturn(pThis,     VERR_INVALID_POINTER);
+    AssertPtrReturn(pStreamAV, VERR_INVALID_POINTER);
+    AssertPtrReturn(pSink,     VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgReq,   VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfgAcq,   VERR_INVALID_POINTER);
 
     if (pCfgReq->DestSource.Dest != PDMAUDIOPLAYBACKDEST_FRONT)
@@ -380 +376 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferSize = 0;
+            pCfgAcq->cSampleBufferHint = 0;
 
         LogRel2(("VideoRec: Support for surround audio not implemented yet\n"));
@@ -386 +382 @@
     }
 
-    int rc = DrvAudioHlpStreamCfgToProps(pCfgReq, &pStreamOut->Props);
-    if (RT_FAILURE(rc))
-        return rc;
+    int rc = VINF_SUCCESS;
 
 #ifdef VBOX_WITH_LIBOPUS
@@ -398 +392 @@
                                            WebMWriter::AudioCodec_Opus, WebMWriter::VideoCodec_None);
         if (RT_SUCCESS(rc))
-            rc = pSink->Con.WebM.pWebM->AddAudioTrack(pSink->Codec.Parms.uHz, pStreamOut->Props.cChannels, pStreamOut->Props.cBits,
+            rc = pSink->Con.WebM.pWebM->AddAudioTrack(pSink->Codec.Parms.uHz, pCfgReq->Props.cChannels, pCfgReq->Props.cBits,
                                                       &pSink->Con.WebM.uTrack);
     }
@@ -405 +399 @@
         return rc;
 
-    rc = RTCircBufCreate(&pStreamOut->pCircBuf, (pSink->Codec.Opus.csFrame * pSink->Codec.Parms.cChannels) * sizeof(uint16_t));
+    rc = RTCircBufCreate(&pStreamAV->pCircBuf, (pSink->Codec.Opus.csFrame * pSink->Codec.Parms.cChannels) * sizeof(uint16_t));
     if (RT_SUCCESS(rc))
     {
-        pStreamOut->pSink = pSink; /* Assign sink to stream. */
+        pStreamAV->pSink = pSink; /* Assign sink to stream. */
 
         if (pCfgAcq)
@@ -414 +408 @@
             /* Make sure to let the driver backend know that we need the audio data in
              * a specific sampling rate Opus is optimized for. */
-            pCfgAcq->uHz               = pSink->Codec.Parms.uHz;
-            pCfgAcq->cSampleBufferSize = _4K; /** @todo Make this configurable. */
+            pCfgAcq->Props.uHz         = pSink->Codec.Parms.uHz;
+            pCfgAcq->Props.cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cBits, pCfgAcq->Props.cChannels);
+            pCfgAcq->cSampleBufferHint = _4K; /** @todo Make this configurable. */
         }
     }
 #else
-    RT_NOREF(pThis, pSink, pStream, pCfgReq, pCfgAcq);
+    RT_NOREF(pThis, pSink, pStreamAV, pCfgReq, pCfgAcq);
     rc = VERR_NOT_SUPPORTED;
 #endif /* VBOX_WITH_LIBOPUS */
@@ -433 +428 @@
  * @returns IPRT status code.
  * @param   pThis               Driver instance.
- * @param   pStream             Audio output stream to destroy.
- */
-static int avRecDestroyStreamOut(PDRVAUDIOVIDEOREC pThis, PPDMAUDIOSTREAM pStream)
+ * @param   pStreamAV           Audio output stream to destroy.
+ */
+static int avRecDestroyStreamOut(PDRVAUDIOVIDEOREC pThis, PAVRECSTREAM pStreamAV)
 {
     RT_NOREF(pThis);
-    PAVRECSTREAMOUT pStreamOut = (PAVRECSTREAMOUT)pStream;
-
-    if (pStreamOut->pCircBuf)
-    {
-        RTCircBufDestroy(pStreamOut->pCircBuf);
-        pStreamOut->pCircBuf = NULL;
+
+    if (pStreamAV->pCircBuf)
+    {
+        RTCircBufDestroy(pStreamAV->pCircBuf);
+        pStreamAV->pCircBuf = NULL;
     }
 
@@ -455 +449 @@
  * @returns IPRT status code.
  * @param   pThis               Driver instance.
- * @param   pStream             Audio output stream to control.
+ * @param   pStreamAV           Audio output stream to control.
  * @param   enmStreamCmd        Stream command to issue.
  */
 static int avRecControlStreamOut(PDRVAUDIOVIDEOREC pThis,
-                                 PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-    RT_NOREF(enmStreamCmd);
-
-    RT_NOREF(pThis);
-
-    LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
+                                 PAVRECSTREAM pStreamAV, PDMAUDIOSTREAMCMD enmStreamCmd)
+{
+    RT_NOREF(pThis, pStreamAV);
 
     switch (enmStreamCmd)
@@ -520 +508 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvAudioVideoRecStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvAudioVideoRecStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                       void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface, pStream, pvBuf, cbBuf);
@@ -535 +523 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvAudioVideoRecStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                    PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
-                                                    uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvAudioVideoRecStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                    const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -545 +532 @@
     /* pcbWritten is optional. */
 
-    PDRVAUDIOVIDEOREC pThis      = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
+    PDRVAUDIOVIDEOREC pThis     = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
     RT_NOREF(pThis);
-    PAVRECSTREAMOUT   pStreamOut = (PAVRECSTREAMOUT)pStream;
+    PAVRECSTREAM      pStreamAV = (PAVRECSTREAM)pStream;
 
     int rc = VINF_SUCCESS;
@@ -557 +544 @@
      */
 #ifdef VBOX_WITH_LIBOPUS
-    PAVRECSINK pSink    = pStreamOut->pSink;
+    PAVRECSINK pSink    = pStreamAV->pSink;
     AssertPtr(pSink);
-    PRTCIRCBUF pCircBuf = pStreamOut->pCircBuf;
+    PRTCIRCBUF pCircBuf = pStreamAV->pCircBuf;
     AssertPtr(pCircBuf);
 
@@ -598 +585 @@
 
     const uint32_t csFrame = pSink->Codec.Opus.csFrame;
-    const uint32_t cbFrame = PDMAUDIOPCMPROPS_S2B(&pStreamOut->Props, csFrame);
+    const uint32_t cbFrame = PDMAUDIOSTREAMCFG_S2B(pStreamAV->pCfg, csFrame);
 
     while (RTCircBufUsed(pCircBuf) >= cbFrame)
@@ -716 +703 @@
 static DECLCALLBACK(int) drvAudioVideoRecGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
-    NOREF(pInterface);
+    RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    pBackendCfg->cbStreamOut    = sizeof(AVRECSTREAMOUT);
+    pBackendCfg->cbStreamOut    = sizeof(AVRECSTREAM);
     pBackendCfg->cbStreamIn     = 0;
     pBackendCfg->cMaxStreamsIn  = 0;
@@ -756 +743 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvAudioVideoRecStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream,
+static DECLCALLBACK(int) drvAudioVideoRecStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgReq,    VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgAcq,    VERR_INVALID_POINTER);
 
-    PDRVAUDIOVIDEOREC pThis = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
+    if (pCfgReq->enmDir == PDMAUDIODIR_IN)
+        return VERR_NOT_SUPPORTED;
+
+    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+
+    PDRVAUDIOVIDEOREC pThis     = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
+    PAVRECSTREAM      pStreamAV = (PAVRECSTREAM)pStream;
 
     /* For now we only have one sink, namely the driver's one.
@@ -770 +762 @@
     PAVRECSINK pSink = &pThis->Sink;
 
-    if (pCfgReq->enmDir == PDMAUDIODIR_OUT)
-        return avRecCreateStreamOut(pThis, pStream, pSink, pCfgReq, pCfgAcq);
-
-    return VERR_NOT_SUPPORTED;
+    int rc = avRecCreateStreamOut(pThis, pStreamAV, pSink, pCfgReq, pCfgAcq);
+    if (RT_SUCCESS(rc))
+    {
+        pStreamAV->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
+        if (!pStreamAV->pCfg)
+            rc = VERR_NO_MEMORY;
+    }
+
+    return rc;
 }
 
@@ -780 +777 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvAudioVideoRecStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvAudioVideoRecStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVAUDIOVIDEOREC pThis = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
-
-    if (pStream->enmDir == PDMAUDIODIR_OUT)
-        return avRecDestroyStreamOut(pThis, pStream);
-
-    return VINF_SUCCESS;
+    PDRVAUDIOVIDEOREC pThis     = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
+    PAVRECSTREAM      pStreamAV = (PAVRECSTREAM)pStream;
+
+    if (!pStreamAV->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
+    int rc = VINF_SUCCESS;
+
+    if (pStreamAV->pCfg->enmDir == PDMAUDIODIR_OUT)
+        rc = avRecDestroyStreamOut(pThis, pStreamAV);
+
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpStreamCfgFree(pStreamAV->pCfg);
+        pStreamAV->pCfg = NULL;
+    }
+
+    return rc;
 }
 
@@ -798 +807 @@
  */
 static DECLCALLBACK(int) drvAudioVideoRecStreamControl(PPDMIHOSTAUDIO pInterface,
-                                                       PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+                                                       PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
 
-    PDRVAUDIOVIDEOREC pThis = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
-
-    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
-
-    if (pStream->enmDir == PDMAUDIODIR_OUT)
-        return avRecControlStreamOut(pThis,  pStream, enmStreamCmd);
+    PDRVAUDIOVIDEOREC pThis     = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
+    PAVRECSTREAM      pStreamAV = (PAVRECSTREAM)pStream;
+
+    if (!pStreamAV->pCfg) /* Not (yet) configured? Skip. */
+        return VINF_SUCCESS;
+
+    if (pStreamAV->pCfg->enmDir == PDMAUDIODIR_OUT)
+        return avRecControlStreamOut(pThis, pStreamAV, enmStreamCmd);
 
     return VINF_SUCCESS;
@@ -817 +828 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
-{
-    NOREF(pInterface);
-    NOREF(pStream);
+static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface);
+    RT_NOREF(pStream);
 
     return (  PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED
@@ -830 +841 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
  */
-static DECLCALLBACK(int) drvAudioVideoRecStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(int) drvAudioVideoRecStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);