Changeset 54230 in vbox

Timestamp:

Feb 17, 2015 1:13:02 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Update.

Location:

trunk

Files:

• include/VBox/RemoteDesktop/VRDE.h (modified) (1 diff)
• include/VBox/vmm/pdmaudioifs.h (modified) (12 diffs)
• src/VBox/Devices/Audio/AudioMixBuffer.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/AudioMixBuffer.h (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioMixer.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (30 diffs)
• src/VBox/Devices/Audio/DevIchHda.cpp (modified) (9 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (43 diffs)
• src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-client/ConsoleVRDPServer.cpp (modified) (13 diffs)
• src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (14 diffs)
• src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (2 diffs)

trunk/include/VBox/RemoteDesktop/VRDE.h

@@ -633 +633 @@
 
 /** Hints what has been intercepted by the application. */
-#define VRDE_CLIENT_INTERCEPT_AUDIO     (0x1)
-#define VRDE_CLIENT_INTERCEPT_USB       (0x2)
-#define VRDE_CLIENT_INTERCEPT_CLIPBOARD (0x4)
-#define VRDE_CLIENT_INTERCEPT_AUDIO_INPUT (0x8)
+#define VRDE_CLIENT_INTERCEPT_AUDIO       RT_BIT(0)
+#define VRDE_CLIENT_INTERCEPT_USB         RT_BIT(1)
+#define VRDE_CLIENT_INTERCEPT_CLIPBOARD   RT_BIT(2)
+#define VRDE_CLIENT_INTERCEPT_AUDIO_INPUT RT_BIT(3)
 
 

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -64 +64 @@
 
 /**
- * Function pointer for device emulation callback.
- */
-typedef void (*PDMAUDIOCALLBACK_FN) (void *pvContext, uint32_t cbData);
-
-/**
- * Structure holding all necessary callback data to communicate
- * with the sound device emulation, e.g. for reading or writing
- * audio data.
- */
-typedef struct PDMAUDIOCALLBACK
-{
-    /** Callback function to use in the device emulation. */
-    PDMAUDIOCALLBACK_FN fn;
-    /** Opaque pointer to context data given on callback
-     *  creation. Set by the device emulation. */
-    void *pvContext;
-} PDMAUDIOCALLBACK, *PPDMAUDIOCALLBACK;
-
-/**
  * Audio configuration of a certain backend.
  */
@@ -142 +123 @@
 #endif
 
-typedef enum
+typedef enum PDMAUDIODIR
+{
+    PDMAUDIODIR_UNKNOWN = 0,
+    PDMAUDIODIR_IN      = 1,
+    PDMAUDIODIR_OUT     = 2,
+    PDMAUDIODIR_BOTH    = 3
+} PDMAUDIODIR;
+
+typedef enum PDMAUDIOMIXERCTL
 {
     PDMAUDIOMIXERCTL_UNKNOWN = 0,
@@ -152 +141 @@
 } PDMAUDIOMIXERCTL;
 
-typedef enum
+typedef enum PDMAUDIORECSOURCE
 {
     PDMAUDIORECSOURCE_UNKNOWN = 0,
@@ -372 +361 @@
     /** Pointer to associated host input stream. */
     PPDMAUDIOHSTSTRMIN     pHstStrmIn;
-    /**
-     * Callback set by the device emulation on creation.
-     * This function is used to mix the guest input samples into the target
-     * host input recording buffer. */
-    PDMAUDIOCALLBACK       Callback;
 } PDMAUDIOGSTSTRMIN, *PPDMAUDIOGSTSTRMIN;
 
@@ -397 +381 @@
     /** Pointer to the associated host output stream. */
     PPDMAUDIOHSTSTRMOUT    pHstStrmOut;
-    /**
-     * Callback set by the device emulation on creation.
-     * This function is used to tell the device emulation that we're ready to
-     * process new samples.
-     */
-    PDMAUDIOCALLBACK       Callback;
 } PDMAUDIOGSTSTRMOUT, *PPDMAUDIOGSTSTRMOUT;
 
@@ -414 +392 @@
 typedef struct PDMIAUDIOCONNECTOR
 {
-    DECLR3CALLBACKMEMBER(int, pfnQueryData, (PPDMIAUDIOCONNECTOR pInterface, uint32_t *pcbAvailIn, uint32_t *pcbFreeOut, uint32_t *pcSamplesLive));
+    DECLR3CALLBACKMEMBER(int, pfnQueryStatus, (PPDMIAUDIOCONNECTOR pInterface, uint32_t *pcbAvailIn, uint32_t *pcbFreeOut, uint32_t *pcSamplesLive));
 
     /**
@@ -476 +454 @@
      * @param   uVolRight       Right audio stream volume.
      */
-    DECLR3CALLBACKMEMBER(int, pfnIsSetOutVolume, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOGSTSTRMOUT pGstStrmOut,
-                                                  bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
+    DECLR3CALLBACKMEMBER(int, pfnSetVolumeOut, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOGSTSTRMOUT pGstStrmOut,
+                                                bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
 
     /**
@@ -534 +512 @@
      * @param   pszName              Name of the audio channel.
      * @param   enmRecSource         Specifies the type of recording source to be opened.
-     * @param   fnCallback           Callback function to be assigned to this input stream.
-     * @param   pvCallback           Pointer to parameters assigned to the callback function.
      * @param   pCfg                 Pointer to PDMAUDIOSTREAMCFG to use.
      * @param   ppGstStrmIn          Pointer where to return the guest guest input stream on success.
      */
     DECLR3CALLBACKMEMBER(int, pfnOpenIn, (PPDMIAUDIOCONNECTOR pInterface, const char *pszName,
-                                          PDMAUDIORECSOURCE enmRecSource,
-                                          PDMAUDIOCALLBACK_FN fnCallback, void *pvCallback,
-                                          PPDMAUDIOSTREAMCFG pCfg,
+                                          PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOSTREAMCFG pCfg,
                                           PPDMAUDIOGSTSTRMIN *ppGstStrmIn));
 
@@ -551 +525 @@
      * @param   pInterface           Pointer to the interface structure containing the called function pointer.
      * @param   pszName              Name of the audio channel.
-     * @param   fnCallback           Callback function to be assigned to this input stream.
-     * @param   pvCallback           Pointer to parameters assigned to the callback function.
      * @param   pCfg                 Pointer to PDMAUDIOSTREAMCFG to use.
      * @param   ppGstStrmOut         Pointer where to return the guest guest input stream on success.
      */
     DECLR3CALLBACKMEMBER(int, pfnOpenOut, (PPDMIAUDIOCONNECTOR pInterface, const char *pszName,
-                                           PDMAUDIOCALLBACK_FN fnCallback, void *pvCallback,
-                                           PPDMAUDIOSTREAMCFG pCfg,
-                                           PPDMAUDIOGSTSTRMOUT *ppGstStrmOut));
-
-    DECLR3CALLBACKMEMBER(int, pfnPlayOut, (PPDMIAUDIOCONNECTOR pInterface));
+                                           PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOGSTSTRMOUT *ppGstStrmOut));
+
+    DECLR3CALLBACKMEMBER(int, pfnPlayOut, (PPDMIAUDIOCONNECTOR pInterface, uint32_t *pcSamplesPlayed));
 
     /**
@@ -585 +555 @@
 /** PDMIAUDIOCONNECTOR interface ID. */
 #define PDMIAUDIOCONNECTOR_IID                  "a41ca770-ed07-4f57-a0a6-41377d9d484f"
+
+/** Defines all needed interface callbacks for an audio backend. */
+#define PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(_aDrvName) \
+    pThis->IHostAudioR3.pfnCaptureIn  = _aDrvName##CaptureIn;  \
+    pThis->IHostAudioR3.pfnControlIn  = _aDrvName##ControlIn;  \
+    pThis->IHostAudioR3.pfnControlOut = _aDrvName##ControlOut; \
+    pThis->IHostAudioR3.pfnFiniIn     = _aDrvName##FiniIn;     \
+    pThis->IHostAudioR3.pfnFiniOut    = _aDrvName##FiniOut;    \
+    pThis->IHostAudioR3.pfnGetConf    = _aDrvName##GetConf;    \
+    pThis->IHostAudioR3.pfnInit       = _aDrvName##Init;       \
+    pThis->IHostAudioR3.pfnInitIn     = _aDrvName##InitIn;     \
+    pThis->IHostAudioR3.pfnInitOut    = _aDrvName##InitOut;    \
+    pThis->IHostAudioR3.pfnIsEnabled  = _aDrvName##IsEnabled;  \
+    pThis->IHostAudioR3.pfnPlayOut    = _aDrvName##PlayOut;
 
 /** Pointer to a host audio interface. */
@@ -661 +645 @@
     DECLR3CALLBACKMEMBER(int, pfnFiniOut, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut));
 
-    /**
-     * Plays an audio stream.
+    DECLR3CALLBACKMEMBER(bool, pfnIsEnabled, (PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir));
+
+    /**
+     * Plays a host audio stream.
      *
      * @returns VBox status code.

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

@@ +1 @@
+/* $Id$ */
+/** @file
+ * VBox audio: TODO
+ */
+
+/*
+ * Copyright (C) 2014-2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
 
 #include <iprt/asm-math.h>
@@ -22 +38 @@
 # include <VBox/log.h>
 #else
- #define AUDMIXBUF_LOG(x)
+# define AUDMIXBUF_LOG(x)
 #endif
 
@@ -1148 +1164 @@
     uint32_t cWritten;
 
-#ifdef DEBUG
+#if 0
     RTFILE fh;
     rc = RTFileOpen(&fh, "c:\\temp\\test_writeat.pcm",
@@ -1266 +1282 @@
     }
 
-#ifdef DEBUG_andy
+#if 0
         RTFILE fh;
         RTFileOpen(&fh, "c:\\temp\\test_writeex.pcm",

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 
 /** Constructs 32 bit value for given frequency, number of channels, bits per sample and signed bit.
- *  Note: This currently matches 1:1 the VRDE encoding. */
+ *  Note: This currently matches 1:1 the VRDE encoding -- this might change in the future, so better don't rely on this fact! */
 #define AUDMIXBUF_AUDIO_FMT_MAKE(freq, c, bps, s) ((((s) & 0x1) << 28) + (((bps) & 0xFF) << 20) + (((c) & 0xF) << 16) + ((freq) & 0xFFFF))
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -576 +576 @@
 
                     rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
-                                                     pszDesc, PDMAUDIORECSOURCE_LINE_IN,
-                                                     NULL, pDrv /* pvContext */,
-                                                     &streamCfg,
-                                                     &pDrv->LineIn.pStrmIn);
+                                                     pszDesc, PDMAUDIORECSOURCE_LINE_IN, &streamCfg, &pDrv->LineIn.pStrmIn);
                     LogFlowFunc(("LUN#%RU8: Opened line input with rc=%Rrc\n", uLUN, rc));
                     if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
@@ -606 +603 @@
                     }
 
-                    rc = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszDesc,
-                                                      NULL, pDrv /* pvContext */,
-                                                      &streamCfg,
-                                                      &pDrv->Out.pStrmOut);
+                    rc = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszDesc, &streamCfg, &pDrv->Out.pStrmOut);
                     LogFlowFunc(("LUN#%RU8: Opened output with rc=%Rrc\n", uLUN, rc));
 
@@ -629 +623 @@
 
                     rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
-                                                     pszDesc, PDMAUDIORECSOURCE_MIC,
-                                                     NULL, pDrv /* pvContext */,
-                                                     &streamCfg,
-                                                     &pDrv->MicIn.pStrmIn);
+                                                     pszDesc, PDMAUDIORECSOURCE_MIC, &streamCfg, &pDrv->MicIn.pStrmIn);
                     LogFlowFunc(("LUN#%RU8: Opened mic input with rc=%Rrc\n", uLUN, rc));
                     if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
@@ -820 +811 @@
         pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn, fEnable);
 #else
-     AUD_set_active_in(pThis->voice_mc, active[MC_INDEX]);
+    AUD_set_active_in(pThis->voice_mc, active[MC_INDEX]);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 }
@@ -845 +836 @@
     if (index == AC97_Master_Volume_Mute)
     {
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
-            pDrv->pConnector->pfnIsSetOutVolume(pDrv->pConnector, pDrv->Out.pStrmOut, RT_BOOL(mute), lvol, rvol);
-# else
+            pDrv->pConnector->pfnSetVolumeOut(pDrv->pConnector, pDrv->Out.pStrmOut, RT_BOOL(mute), lvol, rvol);
+#else
         AUD_set_volume_out(pThis->voice_po, mute, lvol, rvol);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     }
     else
     {
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
-        {
-            /** @todo In SetVolume no passing audmixerctl_in as its not used in DrvAudio.cpp. */
             pDrv->pConnector->pfnSetVolume(pDrv->pConnector, RT_BOOL(mute), lvol, rvol);
-        }
-# else
+#else
         AUD_set_volume(mt, &mute, &lvol, &rvol);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     }
 #else /* !SOFT_VOLUME */
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
         pDrv->pConnector->pfnSetVolume(pDrv->pConnector, RT_BOOL(mute), lvol, rvol);
-# else
+#else
     AUD_set_volume(mt, &mute, &lvol, &rvol);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 #endif /* SOFT_VOLUME */
 
@@ -1042 +1030 @@
 }
 
+/**
+ * Writes data from the device to the host backends.
+ *
+ * @return  IPRT status code.
+ * @return  int
+ * @param   pThis
+ * @param   pReg
+ * @param   cbMax
+ * @param   pcbWritten
+ */
 static int ichac97WriteAudio(PAC97STATE pThis, PAC97BMREG pReg, uint32_t cbMax, uint32_t *pcbWritten)
 {
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtrReturn(pReg, VERR_INVALID_POINTER);
+    AssertReturn(cbMax, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbWritten, VERR_INVALID_POINTER);
+
     PPDMDEVINS  pDevIns = ICHAC97STATE_2_DEVINS(pThis);
 
     uint32_t    addr           = pReg->bd.addr;
     uint32_t    cbWrittenTotal = 0;
-    uint32_t    cbToRead;
+    uint32_t    cbToRead       = 0;
 
     uint32_t cbToWrite = RT_MIN((uint32_t)(pReg->picb << 1), cbMax);
     if (!cbToWrite)
-        return VERR_NO_DATA;
+    {
+        *pcbWritten = 0;
+        return VINF_EOF;
+    }
 
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("pReg=%p, cbMax=%RU32\n", pReg, cbMax));
+    LogFlowFunc(("pReg=%p, cbMax=%RU32, cbToWrite=%RU32\n", pReg, cbMax, cbToWrite));
 
     while (cbToWrite)
@@ -1089 +1095 @@
         if (!cbWrittenMin)
         {
-            rc = VERR_NO_DATA;
+            rc = VINF_EOF;
             break;
         }
@@ -1114 +1120 @@
                 pThis->last_samp = *(uint32_t *)&pThis->pvReadWriteBuf[cbToRead - 4];
         }
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        if (pcbWritten)
-            *pcbWritten = cbWrittenTotal;
+
+        *pcbWritten = cbWrittenTotal;
     }
 
@@ -1177 +1179 @@
 }
 
-static int ichac97ReadAudio(PAC97STATE pThis, PAC97BMREG pReg, uint32_t cbMax, uint32_t *pcbWritten)
-{
+static int ichac97ReadAudio(PAC97STATE pThis, PAC97BMREG pReg, uint32_t cbMax, uint32_t *pcbRead)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtrReturn(pReg, VERR_INVALID_POINTER);
     AssertReturn(cbMax, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pcbRead, VERR_INVALID_POINTER);
 
     PPDMDEVINS pDevIns = ICHAC97STATE_2_DEVINS(pThis);
 
-    int rc = VINF_SUCCESS;
+    int rc;
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* Select audio sink to process. */
-    PAUDMIXSINK pSink = (pReg - pThis->bm_regs) == MC_INDEX
-                      ? pThis->pSinkMicIn : pThis->pSinkLineIn;
+    PAUDMIXSINK pSink = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->pSinkMicIn : pThis->pSinkLineIn;
     AssertPtr(pSink);
 
@@ -1197 +1201 @@
 
     if (!cbToRead)
-        return VERR_NO_DATA;
+    {
+        *pcbRead = 0;
+        return VINF_EOF;
+    }
 
     uint8_t *pvMixBuf = (uint8_t *)RTMemAlloc(cbMixBuf);
@@ -1218 +1225 @@
     {
         Assert(cbRead);
-        if (pcbWritten)
-            *pcbWritten = cbRead;
+        *pcbRead = cbRead;
     }
 
     return rc;
 #else
+    rc = VINF_SUCCESS;
+
     uint32_t    addr = pReg->bd.addr;
     uint32_t    temp = pReg->picb << 1;
@@ -1233 +1241 @@
     temp = audio_MIN(temp, (uint32_t)cbMax);
     if (!temp)
-        return VERR_NO_DATA;
+    {
+        *pcbRead = 0;
+        return VINF_EOF;
+    }
 
     uint8_t tmpbuf[4096];
@@ -1255 +1266 @@
 
     if (RT_SUCCESS(rc))
-    {
-        if (pcbWritten)
-            *pcbWritten = nread;
-    }
+        *pcbRead = nread;
 
     return rc;
@@ -1268 +1276 @@
 {
     PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE);
-    AssertPtr(pThis);
+    AssertPtrReturnVoid(pThis);
 
     STAM_PROFILE_START(&pThis->StatTimer, a);
@@ -1278 +1286 @@
 
     PAC97DRIVER pDrv;
-    uint32_t cbIn, cbOut;
+
+    LogFlowFuncEnter();
 
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
-        if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
-            continue;
-
-        rc = pDrv->pConnector->pfnQueryData(pDrv->pConnector, /** @todo Rename QueryStatus */
-                                            &cbIn, &cbOut, &pDrv->cSamplesLive);
+        uint32_t cbIn, cbOut;
+        rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
+                                              &cbIn, &cbOut, &pDrv->cSamplesLive);
         if (RT_SUCCESS(rc))
         {
-            if (cbIn || cbOut)
-                LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+            LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+
+            if (pDrv->cSamplesLive)
+            {
+                uint32_t cSamplesPlayed;
+                int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
+                if (RT_SUCCESS(rc2))
+                {
+                    LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
+                                 pDrv->uLUN, pDrv->cSamplesLive, cSamplesPlayed));
+                    Assert(pDrv->cSamplesLive >= cSamplesPlayed);
+                    pDrv->cSamplesLive -= cSamplesPlayed;
+                }
+
+                rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
+                                                      &cbIn, &cbOut, &pDrv->cSamplesLive);
+                if (RT_SUCCESS(rc))
+                    LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+            }
 
             cbInMax  = RT_MAX(cbInMax, cbIn);
@@ -1298 +1322 @@
             pDrv->cSamplesLive = 0;
     }
+
+    LogFlowFunc(("cbInMax=%RU32, cbOutMin=%RU32\n", cbInMax, cbOutMin));
+
+    if (cbOutMin == UINT32_MAX)
+        cbOutMin = 0;
 
     /*
@@ -1306 +1335 @@
         Assert(cbOutMin != UINT32_MAX);
         ichac97TransferAudio(pThis, PO_INDEX, cbOutMin); /** @todo Add rc! */
-    }
-    else
-    {
-        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
-        {
-            if (pDrv->cSamplesLive)
-                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);
-        }
     }
 
@@ -1324 +1345 @@
     TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
 
+    LogFlowFuncLeave();
+
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
 }
@@ -1364 +1387 @@
         if (!pReg->picb) /* Got a new buffer descriptor, that is, the position is 0? */
         {
-            LogFlowFunc(("Fresh buffer descriptor %d is empty, addr=%#x, len=%#x, skipping\n",
+            LogFlowFunc(("Fresh buffer descriptor %RU8 is empty, addr=%#x, len=%#x, skipping\n",
                          pReg->civ, pReg->bd.addr, pReg->bd.ctl_len));
             if (pReg->civ == pReg->lvi)
@@ -1371 +1394 @@
                 pThis->bup_flag = 0;
 
-                rc = VINF_SUCCESS;
+                rc = VINF_EOF;
                 break;
             }
@@ -1383 +1406 @@
         }
 
-        uint32_t cbWritten;
+        uint32_t cbTransferred;
         switch (index)
         {
             case PO_INDEX:
-            {
-                rc = ichac97WriteAudio(pThis, pReg, cbElapsed, &cbWritten);
-                if (RT_SUCCESS(rc))
                 {
-                    cbWrittenTotal += cbWritten;
-                    cbElapsed      -= cbWritten;
-                    Assert((cbWritten & 1) == 0);    /* Else the following shift won't work */
-                    pReg->picb     -= (cbWritten >> 1);
+                    rc = ichac97WriteAudio(pThis, pReg, cbElapsed, &cbTransferred);
+                    if (RT_SUCCESS(rc)
+                        && cbTransferred)
+                    {
+                        cbWrittenTotal += cbTransferred;
+                        Assert(cbElapsed >= cbTransferred);
+                        cbElapsed      -= cbTransferred;
+                        Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
+                        pReg->picb     -= (cbTransferred >> 1);
+                    }
+                    break;
                 }
-                break;
-            }
 
             case PI_INDEX:
             case MC_INDEX:
-            {
-                rc = ichac97ReadAudio(pThis, pReg, cbElapsed, &cbWritten);
-                if (RT_SUCCESS(rc))
                 {
-                    cbElapsed  -= cbWritten;
-                    Assert((cbWritten & 1) == 0);    /* Else the following shift won't work */
-                    pReg->picb -= (cbWritten >> 1);
+                    rc = ichac97ReadAudio(pThis, pReg, cbElapsed, &cbTransferred);
+                    if (RT_SUCCESS(rc)
+                        && cbTransferred)
+                    {
+                        Assert(cbElapsed >= cbTransferred);
+                        cbElapsed  -= cbTransferred;
+                        Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
+                        pReg->picb -= (cbTransferred >> 1);
+                    }
+                    break;
                 }
-                break;
-            }
 
             default:
@@ -1418 +1445 @@
         }
 
-        LogFlowFunc(("pReg->picb=%RU16, cbWrittenTotal=%RU32\n", pReg->picb, cbWrittenTotal));
+        LogFlowFunc(("pReg->picb=%#x, cbWrittenTotal=%RU32\n", pReg->picb, cbWrittenTotal));
 
         if (!pReg->picb)
@@ -1431 +1458 @@
             if (pReg->civ == pReg->lvi)
             {
-                LogFlowFunc(("Underrun civ (%d) == lvi (%d)\n", pReg->civ, pReg->lvi));
+                LogFlowFunc(("Underrun civ (%RU8) == lvi (%RU8)\n", pReg->civ, pReg->lvi));
                 new_sr |= SR_LVBCI | SR_DCH | SR_CELV;
                 pThis->bup_flag = (pReg->bd.ctl_len & BD_BUP) ? BUP_LAST : 0;
 
-                rc = VERR_NO_DATA;
+                rc = VINF_EOF;
             }
             else
@@ -1447 +1474 @@
         }
 
-        if (RT_FAILURE(rc))
-        {
-            if (rc == VERR_NO_DATA)
-                rc = VINF_SUCCESS;
-
+        if (   RT_FAILURE(rc)
+            || rc == VINF_EOF) /* All data processed? */
+        {
             break;
         }
@@ -2171 +2196 @@
     }
 
+    LogFlowFuncLeave();
     return VINF_SUCCESS;
 }
@@ -2319 +2345 @@
     RTListInit(&pThis->lstDrv);
 
-    uint8_t uLUN = 0;
-    do
+    uint8_t uLUN;
+    for (uLUN = 0; uLUN < UINT8_MAX; uLUN)
     {
         LogFunc(("Trying to attach driver for LUN #%RU8 ...\n", uLUN));
-        rc = ichac97Attach(pDevIns, uLUN++, PDM_TACH_FLAGS_NOT_HOT_PLUG);
+        rc = ichac97Attach(pDevIns, uLUN, PDM_TACH_FLAGS_NOT_HOT_PLUG);
         if (RT_FAILURE(rc))
         {
@@ -2331 +2357 @@
         }
 
-    } while (0);
+        uLUN++;
+    }
 
     LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
@@ -2472 +2499 @@
     {
         pThis->cbReadWriteBuf = _4K; /** @todo Make this configurable. */
-        pThis->pvReadWriteBuf = (uint8_t *)RTMemAlloc(pThis->cbReadWriteBuf);
+        pThis->pvReadWriteBuf = (uint8_t *)RTMemAllocZ(pThis->cbReadWriteBuf);
         if (!pThis->pvReadWriteBuf)
             rc = VERR_NO_MEMORY;
@@ -2571 +2598 @@
 #endif /* !IN_RING3 */
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
-

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

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
 #endif
 #include "DevIchHdaCodec.h"
-
-#ifdef DEBUG
-//#define DEBUG_LUN
-# ifdef DEBUG_LUN
-#  define DEBUG_LUN_NUM 0
-# endif
-#endif /* DEBUG */
 
 /*******************************************************************************
@@ -2480 +2473 @@
         }
 
-        rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
-                                         pszDesc, enmRecSource,
-                                         NULL /* fnCallback */, NULL /* pvCallback */,
-                                         pCfg,
-                                         &pDrv->LineIn.pStrmIn);
+        rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector, pszDesc, enmRecSource, pCfg, &pDrv->LineIn.pStrmIn);
         LogFlowFunc(("LUN#%RU8: Opened input \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
@@ -2509 +2498 @@
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        int rc2 = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszName,
-                                               NULL /* fnCallback */, pDrv /* pvCallback */,
-                                               pCfg,
-                                               &pDrv->Out.pStrmOut);
+        int rc2 = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszName, pCfg, &pDrv->Out.pStrmOut);
         if (RT_FAILURE(rc2))
         {
@@ -2565 +2551 @@
     PHDADRIVER pDrv;
     uint32_t cbIn, cbOut;
-#ifdef DEBUG_LUN
-    uint8_t uLUN = 0;
-#endif
+
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
         if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
+        {
+            pDrv->cSamplesLive = 0;
             continue;
-
-        rc = pDrv->pConnector->pfnQueryData(pDrv->pConnector, /** @todo Rename QueryStatus */
-                                            &cbIn, &cbOut, &pDrv->cSamplesLive);
+        }
+
+        rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
+                                              &cbIn, &cbOut, &pDrv->cSamplesLive);
         if (RT_SUCCESS(rc))
         {
-#ifdef DEBUG_LUN
-            LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", uLUN, cbIn, cbOut));
-#endif
+            if (cbIn || cbOut)
+                LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+
             cbInMax  = RT_MAX(cbInMax, cbIn);
             cbOutMin = RT_MIN(cbOutMin, cbOut);
@@ -2585 +2572 @@
         else
             pDrv->cSamplesLive = 0;
-
-#ifdef DEBUG_LUN
-        uLUN++;
-#endif
     }
 
@@ -2603 +2586 @@
         RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
         {
-            if (pDrv->cSamplesLive)
-                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);
+            /*if (pDrv->cSamplesLive)
+                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);*/
         }
     }
@@ -3837 +3820 @@
     RTListInit(&pThis->lstDrv);
 
-    unsigned uLUN = 0;
-    do
+    uint8_t uLUN;
+    for (uLUN = 0; uLUN < UINT8_MAX; uLUN)
     {
         LogFunc(("Trying to attach driver for LUN #%RU32 ...\n", uLUN));
-        rc = hdaAttach(pDevIns, uLUN++, PDM_TACH_FLAGS_NOT_HOT_PLUG);
+        rc = hdaAttach(pDevIns, uLUN, PDM_TACH_FLAGS_NOT_HOT_PLUG);
         if (RT_FAILURE(rc))
         {
@@ -3850 +3833 @@
         }
 
-    } while (RT_SUCCESS(rc));
+        uLUN++;
+    }
+
+    LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
 
     if (RT_SUCCESS(rc))

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

@@ -299 +299 @@
         as.enmEndianness = PDMAUDIOHOSTENDIANESS;
 
-        int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out",
-                                     sb16AudioCallback /* fnCallback */, s /* pvCallback */,
-                                     &as,
-                                     &s->pGstStrmOut);
+        int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out", &as, &s->pGstStrmOut);
         AssertRC(rc);
 #else
@@ -459 +456 @@
         as.enmEndianness = PDMAUDIOHOSTENDIANESS;
 
-        int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out",
-                                     sb16AudioCallback /* fnCallback */, s /* pvCallback */,
-                                     &as,
-                                     &s->pGstStrmOut);
+        int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out", &as, &s->pGstStrmOut);
         AssertRC(rc);
 #else
@@ -972 +966 @@
     as.enmEndianness = PDMAUDIOHOSTENDIANESS;
 
-    int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out",
-                                 sb16AudioCallback /* fnCallback */, s /* pvContext */,
-                                 &as,
-                                 &s->pGstStrmOut);
+    int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out", &as, &s->pGstStrmOut);
     AssertRC(rc);
 #else
@@ -1747 +1738 @@
             streamCfg.enmEndianness = PDMAUDIOHOSTENDIANESS;
 
-            int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out",
-                                         sb16AudioCallback /* fnCallback */, s /* pvContext */,
-                                         &streamCfg,
-                                         &s->pGstStrmOut);
+            int rc = s->pDrv->pfnOpenOut(s->pDrv, "sb16.out", &streamCfg, &s->pGstStrmOut);
             AssertRC(rc);
 #else

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

@@ -97 +97 @@
 };
 
-int drvAudioAddHstOut(PDRVAUDIO pThis, PPDMAUDIOSTREAMCFG pCfg,
-                      PPDMAUDIOHSTSTRMOUT *ppHstStrmOut)
-{
-    LogFlowFuncEnter();
+int drvAudioAddHstOut(PDRVAUDIO pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOHSTSTRMOUT *ppHstStrmOut)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
     PPDMAUDIOHSTSTRMOUT pHstStrmOut;
@@ -108 +109 @@
         && conf.fixed_out.greedy)
     {
-        rc = drvAudioAllocHstOut(pThis, pCfg, &pHstStrmOut);
+        rc = drvAudioAllocHstOut(pThis, pszName, pCfg, &pHstStrmOut);
     }
     else
@@ -118 +119 @@
         if (!pHstStrmOut)
         {
-            rc = drvAudioAllocHstOut(pThis, pCfg, &pHstStrmOut);
+            rc = drvAudioAllocHstOut(pThis, pszName, pCfg, &pHstStrmOut);
             if (RT_FAILURE(rc))
                 pHstStrmOut = drvAudioFindAnyHstOut(pThis, NULL /* pHstStrmOut */);
@@ -129 +130 @@
         *ppHstStrmOut = pHstStrmOut;
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -392 +392 @@
 }
 
-/*
- * Guest input stream handling (capturing from the host).
- */
-
-/*
- * Host output handling (playing output from the guest).
- */
-
 int drvAudioDestroyHstOut(PDRVAUDIO pThis, PPDMAUDIOHSTSTRMOUT pHstStrmOut)
 {
@@ -405 +397 @@
     AssertPtrReturn(pHstStrmOut, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%p\n", pHstStrmOut));
+    LogFlowFunc(("%s\n", pHstStrmOut->MixBuf.pszName));
 
     int rc;
@@ -426 +418 @@
         rc = VERR_ACCESS_DENIED;
 
-    LogFlowFunc(("Host output stream %p still being used, rc=%Rrc\n",
-                 pHstStrmOut, rc));
-
+    LogFlowFunc(("[%s] Still is being used, rc=%Rrc\n", pHstStrmOut->MixBuf.pszName, rc));
     return rc;
 }
@@ -533 +523 @@
 }
 
-int drvAudioAllocHstOut(PDRVAUDIO pThis, PPDMAUDIOSTREAMCFG pCfg,
-                        PPDMAUDIOHSTSTRMOUT *ppHstStrmOut)
+int drvAudioAllocHstOut(PDRVAUDIO pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOHSTSTRMOUT *ppHstStrmOut)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
@@ -579 +569 @@
         fInitialized = true;
 
-        rc = audioMixBufInit(&pHstStrmOut->MixBuf, "HostOut", &pHstStrmOut->Props, cSamples);
+        rc = audioMixBufInit(&pHstStrmOut->MixBuf, pszName, &pHstStrmOut->Props, cSamples);
         if (RT_SUCCESS(rc))
         {
@@ -610 +600 @@
                                 PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOGSTSTRMOUT *ppGstStrmOut)
 {
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
+
     PPDMAUDIOSTREAMCFG pThisCfg;
     if (conf.fixed_out.enabled)
@@ -616 +610 @@
         pThisCfg = pCfg;
 
-    AssertPtrReturn(pThisCfg, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pThisCfg, VERR_INVALID_POINTER);
 
     LogFlowFunc(("Using fixed audio output settings: %RTbool\n",
@@ -625 +619 @@
     if (!pGstStrmOut)
     {
-        LogFlowFunc(("Failed to allocate memory for guest output stream \"%s\"\n",
-                     pszName));
+        LogFlowFunc(("Failed to allocate memory for guest output stream \"%s\"\n", pszName));
         return VERR_NO_MEMORY;
     }
 
     PPDMAUDIOHSTSTRMOUT pHstStrmOut;
-    int rc = drvAudioAddHstOut(pThis, pThisCfg, &pHstStrmOut);
+    int rc = drvAudioAddHstOut(pThis, pszName, pThisCfg, &pHstStrmOut);
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("Error adding host output stream \"%s\", rc=%Rrc\n",
-                     pszName, rc));
+        LogFlowFunc(("Error adding host output stream \"%s\", rc=%Rrc\n", pszName, rc));
 
         RTMemFree(pGstStrmOut);
@@ -837 +829 @@
 {
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
-
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
     AssertPtrReturn(pGstStrmOut, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
@@ -844 +836 @@
     /* pcbWritten is optional. */
 
+    if (!pThis->pHostDrvAudio->pfnIsEnabled(pThis->pHostDrvAudio, PDMAUDIODIR_OUT))
+        return VERR_NOT_AVAILABLE;
+
     PPDMAUDIOHSTSTRMOUT pHstStrmOut = pGstStrmOut->pHstStrmOut;
     AssertPtrReturn(pHstStrmOut, VERR_INVALID_POINTER);
 
     AssertMsg(pGstStrmOut->pHstStrmOut->fEnabled,
-              ("Writing to disabled host output stream %p not possible\n",
-              pGstStrmOut->pHstStrmOut));
+              ("Writing to disabled host output stream \"%s\" not possible\n",
+              pHstStrmOut->MixBuf.pszName));
 
     /*
@@ -856 +851 @@
      */
     uint32_t cWritten;
-    int rc = audioMixBufWriteAt(&pGstStrmOut->MixBuf,
-                                0 /* Offset in samples */,
-                                pvBuf, cbBuf,
-                                &cWritten);
+    int rc = audioMixBufWriteAt(&pGstStrmOut->MixBuf, 0 /* Offset in samples */, pvBuf, cbBuf, &cWritten);
 
     /*
@@ -869 +861 @@
         && cWritten)
     {
-        rc = audioMixBufMixToParent(&pGstStrmOut->MixBuf,
-                                    cWritten, &cMixed);
+        rc = audioMixBufMixToParent(&pGstStrmOut->MixBuf, cWritten, &cMixed);
     }
     else
@@ -884 +875 @@
     }
 
-    LogFlowFunc(("Written pvBuf=%p, cbBuf=%zu, cWritten=%RU32 (%RU32 bytes), cMixed=%RU32, rc=%Rrc\n",
-                 pvBuf, cbBuf, cWritten, AUDIOMIXBUF_S2B(&pGstStrmOut->MixBuf, cWritten),
-                 cMixed, rc));
+    LogFlowFunc(("%s -> %s: Written pvBuf=%p, cbBuf=%zu, cWritten=%RU32 (%RU32 bytes), cMixed=%RU32, rc=%Rrc\n",
+                 pGstStrmOut->MixBuf.pszName, pHstStrmOut->MixBuf.pszName, pvBuf, cbBuf, cWritten,
+                 AUDIOMIXBUF_S2B(&pGstStrmOut->MixBuf, cWritten), cMixed, rc));
     return rc;
 }
@@ -931 +922 @@
     AssertPtrReturn(pHstStrmIn, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%p\n", pHstStrmIn));
+    LogFlowFunc(("%s\n", pHstStrmIn->MixBuf.pszName));
 
     int rc;
@@ -951 +942 @@
         rc = VERR_ACCESS_DENIED;
 
-    LogFlowFunc(("Host input stream %p still being used, rc=%Rrc\n",
-                 pHstStrmIn, rc));
-
+    LogFlowFunc(("[%s] Still is being used, rc=%Rrc\n", pHstStrmIn->MixBuf.pszName, rc));
     return rc;
 }
@@ -961 +950 @@
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("%p\n", pGstStrmIn));
+    LogFlowFunc(("%s\n", pGstStrmIn->MixBuf.pszName));
 
     if (pGstStrmIn)
@@ -984 +973 @@
 }
 
-static DECLCALLBACK(int) drvAudioQueryData(PPDMIAUDIOCONNECTOR pInterface,
-                                           uint32_t *pcbAvailIn, uint32_t *pcbFreeOut,
-                                           uint32_t *pcSamplesLive)
+static DECLCALLBACK(int) drvAudioQueryStatus(PPDMIAUDIOCONNECTOR pInterface,
+                                             uint32_t *pcbAvailIn, uint32_t *pcbFreeOut,
+                                             uint32_t *pcSamplesLive)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    /* pcbAvailIn is optional. */
+    /* pcbFreeOut is optional. */
+    /* pcSamplesLive is optional. */
 
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
+
+    if (!pThis->pHostDrvAudio->pfnIsEnabled(pThis->pHostDrvAudio, PDMAUDIODIR_OUT))
+        return VERR_NOT_AVAILABLE;
 
     int rc = VINF_SUCCESS;
@@ -1021 +1016 @@
                 pHstStrmOut->fPendingDisable = false;
 
-                LogFunc(("%p: Disabling stream\n", pHstStrmOut));
+                LogFunc(("[%s] Disabling stream\n", pHstStrmOut->MixBuf.pszName));
             }
             else
-                LogFunc(("%p: Backend vetoed against closing output stream, rc=%Rrc\n",
-                         pHstStrmOut, rc2));
+                LogFunc(("[%s] Backend vetoed against closing output stream, rc=%Rrc\n", pHstStrmOut->MixBuf.pszName, rc2));
 
             continue;
         }
 
-        LogFlowFunc(("%p: Has %RU32 live samples\n", pHstStrmOut, cSamplesLive));
+        LogFlowFunc(("[%s] cSamplesLive=%RU32\n", pHstStrmOut->MixBuf.pszName, cSamplesLive));
 
         /*
@@ -1051 +1045 @@
                     cbFree2 = RT_MIN(cbFree2, AUDIOMIXBUF_S2B_RATIO(&pGstStrmOut->MixBuf,
                                                                     audioMixBufFree(&pGstStrmOut->MixBuf)));
+
+                    LogFlowFunc(("\t[%s] cbFree=%RU32\n", pGstStrmOut->MixBuf.pszName, cbFree2));
                 }
             }
 
             cbFreeOut = RT_MIN(cbFreeOut, cbFree2);
-            continue;
         }
     }
@@ -1081 +1076 @@
             cbAvailIn = RT_MAX(cbAvailIn, AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf,
                                                           audioMixBufMixed(&pHstStrmIn->MixBuf)));
+
+            LogFlowFunc(("\t[%s] cbFree=%RU32\n", pHstStrmIn->MixBuf.pszName, cbAvailIn));
         }
     }
@@ -1102 +1099 @@
 }
 
-static DECLCALLBACK(int) drvAudioPlayOut(PPDMIAUDIOCONNECTOR pInterface)
+static DECLCALLBACK(int) drvAudioPlayOut(PPDMIAUDIOCONNECTOR pInterface, uint32_t *pcSamplesPlayed)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    /* pcbFree is optional. */
+    /* pcSamplesPlayed is optional. */
 
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
 
     int rc = VINF_SUCCESS;
+    uint32_t cSamplesPlayedMax = 0;
 
     /*
@@ -1117 +1115 @@
     while ((pHstStrmOut = drvAudioHstFindAnyEnabledOut(pThis, pHstStrmOut)))
     {
+#if 0
         uint32_t cStreamsLive;
         uint32_t cSamplesLive = drvAudioHstOutSamplesLive(pHstStrmOut, &cStreamsLive);
@@ -1139 +1138 @@
             else
                 LogFunc(("\t%p: Backend vetoed against closing output stream, rc=%Rrc\n",
-                         rc2, pHstStrmOut));
+                         pHstStrmOut, rc2));
 
             continue;
         }
-
-        uint32_t cSamplesPlayed;
+#endif
+
+        uint32_t cSamplesPlayed = 0;
         int rc2 = pThis->pHostDrvAudio->pfnPlayOut(pThis->pHostDrvAudio, pHstStrmOut,
                                                    &cSamplesPlayed);
-        LogFlowFunc(("\t%p: cStreamsLive=%RU32, cSamplesLive=%RU32, cSamplesPlayed=%RU32, rc=%Rrc\n",
-                     pHstStrmOut, cStreamsLive, cSamplesLive, cSamplesPlayed, rc2));
+        if (RT_SUCCESS(rc2))
+            cSamplesPlayedMax = RT_MAX(cSamplesPlayed, cSamplesPlayedMax);
+
+        LogFlowFunc(("\t[%s] cSamplesPlayed=%RU32, rc=%Rrc\n", pHstStrmOut->MixBuf.pszName, cSamplesPlayed, rc2));
 
         bool fNeedsCleanup = false;
@@ -1162 +1164 @@
             {
                 pGstStrmOut->State.fEmpty = true;
-                fNeedsCleanup |=    !pGstStrmOut->State.fActive
-                                 && !pGstStrmOut->Callback.fn;
+                fNeedsCleanup |= !pGstStrmOut->State.fActive;
             }
         }
@@ -1175 +1176 @@
             }
         }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pcSamplesPlayed)
+            *pcSamplesPlayed = cSamplesPlayedMax;
     }
 
@@ -1386 +1393 @@
 {
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
-
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
     AssertPtrReturn(pGstStrmIn, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
@@ -1393 +1400 @@
     /* pcbWritten is optional. */
 
+    if (!pThis->pHostDrvAudio->pfnIsEnabled(pThis->pHostDrvAudio, PDMAUDIODIR_IN))
+        return VERR_NOT_AVAILABLE;
+
     PPDMAUDIOHSTSTRMIN pHstStrmIn = pGstStrmIn->pHstStrmIn;
     AssertPtrReturn(pHstStrmIn, VERR_INVALID_POINTER);
 
     AssertMsg(pGstStrmIn->pHstStrmIn->fEnabled,
-              ("Reading from disabled host input stream %p not possible\n",
-              pGstStrmIn->pHstStrmIn));
+              ("Reading from disabled host input stream \"%s\" not possible\n", pGstStrmIn->MixBuf.pszName));
 
     /*
@@ -1423 +1432 @@
                                                 bool fMute, uint8_t uVolLeft, uint8_t uVolRight)
 {
-    LogFlowFunc(("pGstStrmOut=%p, fMute=%RTbool, uVolLeft=%RU8, uVolRight=%RU8\n",
-                 pGstStrmOut, fMute, uVolLeft, uVolRight));
+    LogFlowFunc(("[%s] fMute=%RTbool, uVolLeft=%RU8, uVolRight=%RU8\n",
+                 pGstStrmOut->MixBuf.pszName, fMute, uVolLeft, uVolRight));
 
     if (pGstStrmOut)
@@ -1529 +1538 @@
         AssertPtr(pHstStrmIn);
 
-        LogFlowFunc(("pHstStrmIn=%p, pGstStrmIn=%p, fEnable=%RTbool\n",
-                     pHstStrmIn, pGstStrmIn, fEnable));
+        LogFlowFunc(("%s -> %s, fEnable=%RTbool\n",
+                     pHstStrmIn->MixBuf.pszName, pGstStrmIn->MixBuf.pszName, fEnable));
 
         if (pGstStrmIn->State.fActive != fEnable)
@@ -1579 +1588 @@
 
 static DECLCALLBACK(int) drvAudioOpenIn(PPDMIAUDIOCONNECTOR pInterface, const char *pszName,
-                                        PDMAUDIORECSOURCE enmRecSource,
-                                        PDMAUDIOCALLBACK_FN fnCallback, void *pvCallback,
-                                        PPDMAUDIOSTREAMCFG pCfg,
+                                        PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOSTREAMCFG pCfg,
                                         PPDMAUDIOGSTSTRMIN *ppGstStrmIn)
 {
@@ -1604 +1611 @@
         && drvAudioPCMPropsAreEqual(&pGstStrmIn->Props, pCfg))
     {
-        LogFunc(("Input stream %p exists and matches required configuration, skipping creation\n",
-                 pGstStrmIn));
+        LogFunc(("[%s] Exists and matches required configuration, skipping creation\n",
+                 pGstStrmIn->MixBuf.pszName));
         return VWRN_ALREADY_EXISTS;
     }
@@ -1635 +1642 @@
         pGstStrmIn->State.fMuted = RT_BOOL(nominal_volume.mute);
 
-        pGstStrmIn->Callback.fn = fnCallback;
-        pGstStrmIn->Callback.pvContext = pvCallback;
-
         *ppGstStrmIn = pGstStrmIn;
     }
@@ -1646 +1650 @@
 
 DECLCALLBACK(int) drvAudioOpenOut(PPDMIAUDIOCONNECTOR pInterface, const char *pszName,
-                                  PDMAUDIOCALLBACK_FN fnCallback, void *pvCallback,
-                                  PPDMAUDIOSTREAMCFG pCfg,
-                                  PPDMAUDIOGSTSTRMOUT *ppGstStrmOut)
+                                  PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOGSTSTRMOUT *ppGstStrmOut)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
@@ -1669 +1671 @@
         && drvAudioPCMPropsAreEqual(&pGstStrmOut->Props, pCfg))
     {
-        LogFunc(("Output stream %p exists and matches required configuration, skipping creation\n",
-                 pGstStrmOut));
+        LogFunc(("[%s] Exists and matches required configuration, skipping creation\n",
+                 pGstStrmOut->MixBuf.pszName));
         return VWRN_ALREADY_EXISTS;
     }
@@ -1724 +1726 @@
         pGstStrmOut->State.uVolumeRight = nominal_volume.r;
         pGstStrmOut->State.fMuted       = RT_BOOL(nominal_volume.mute);
-        pGstStrmOut->Callback.fn        = fnCallback;
-        pGstStrmOut->Callback.pvContext = pvCallback;
 
         *ppGstStrmOut = pGstStrmOut;
@@ -1835 +1835 @@
     pDrvIns->IBase.pfnQueryInterface                 = drvAudioQueryInterface;
     /* IAudio. */
-    pThis->IAudioConnector.pfnQueryData              = drvAudioQueryData;
+    pThis->IAudioConnector.pfnQueryStatus            = drvAudioQueryStatus;
     pThis->IAudioConnector.pfnRead                   = drvAudioRead;
     pThis->IAudioConnector.pfnWrite                  = drvAudioWrite;
@@ -1841 +1841 @@
     pThis->IAudioConnector.pfnIsOutputOK             = drvAudioIsOutputOK;
     pThis->IAudioConnector.pfnInitNull               = drvAudioInitNull;
-    pThis->IAudioConnector.pfnIsSetOutVolume         = drvAudioIsSetOutVolume;
+    pThis->IAudioConnector.pfnSetVolumeOut           = drvAudioIsSetOutVolume;
     pThis->IAudioConnector.pfnSetVolume              = drvAudioSetVolume;
     pThis->IAudioConnector.pfnEnableOut              = drvAudioEnableOut;
@@ -1870 +1870 @@
         LogRel(("Audio: Failed to query interface for underlying host driver\n"));
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_BELOW,
-                                N_("No audio interface below"));
-    }
-
-    pThis->pDrvIns = pDrvIns;
+                                N_("Host audio backend missing or invalid"));
+    }
 
 #ifdef DEBUG_andy
@@ -1880 +1878 @@
 
     rc = drvAudioInit(pCfgHandle, pDrvIns);
+    if (RT_SUCCESS(rc))
+    {
+        pThis->fTerminate = false;
+        pThis->pDrvIns    = pDrvIns;
+    }
 
     LogFlowFuncLeaveRC(rc);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -766 +766 @@
 }
 
+static DECLCALLBACK(bool) drvHostOSSAudioIsEnabled(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+{
+    NOREF(pInterface);
+    NOREF(enmDir);
+    return true; /* Always all enabled. */
+}
+
 static DECLCALLBACK(int) drvHostOSSAudioPlayOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut,
                                                 uint32_t *pcSamplesPlayed)
@@ -933 +940 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                    = pDrvIns;
+    pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface  = drvHostOSSAudioQueryInterface;
-    pThis->IHostAudioR3.pfnInitIn     = drvHostOSSAudioInitIn;
-    pThis->IHostAudioR3.pfnInitOut    = drvHostOSSAudioInitOut;
-    pThis->IHostAudioR3.pfnControlIn  = drvHostOSSAudioControlIn;
-    pThis->IHostAudioR3.pfnControlOut = drvHostOSSAudioControlOut;
-    pThis->IHostAudioR3.pfnFiniIn     = drvHostOSSAudioFiniIn;
-    pThis->IHostAudioR3.pfnFiniOut    = drvHostOSSAudioFiniOut;
-    pThis->IHostAudioR3.pfnCaptureIn  = drvHostOSSAudioCaptureIn;
-    pThis->IHostAudioR3.pfnPlayOut    = drvHostOSSAudioPlayOut;
-    pThis->IHostAudioR3.pfnGetConf    = drvHostOSSAudioGetConf;
-    pThis->IHostAudioR3.pfnInit       = drvHostOSSAudioInit;
+    pDrvIns->IBase.pfnQueryInterface = drvHostOSSAudioQueryInterface;
+    /* IHostAudioR3 */
+    PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvHostOSSAudio);
 
     return VINF_SUCCESS;

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

@@ -1450 +1450 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         if (mAudioVRDE)
-            mAudioVRDE->onVRDEInputIntercept(false /* fIntercept */);
+            mAudioVRDE->onVRDEControl(false /* fEnable */, 0 /* uFlags */);
 #else
         mcAudioRefs--;
@@ -1501 +1501 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (mAudioVRDE)
-        mAudioVRDE->onVRDEInputIntercept(true /* fIntercept */);
+        mAudioVRDE->onVRDEControl(true /* fEnable */, 0 /* uFlags */);
 #else
     ++mcAudioRefs;
@@ -2380 +2380 @@
                            (PFNRT)i_unplugCpu, 3,
                            this, pUVM, (VMCPUID)aCpu);
-    
+
         /* release the lock before a VMR3* call (EMT might wait for it, @bugref{7648})! */
         alock.release();
@@ -4821 +4821 @@
      */
     bool fResume = false;
-    int rc = i_suspendBeforeConfigChange(pUVM, NULL, &fResume);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hr = i_suspendBeforeConfigChange(pUVM, NULL, &fResume);
+    if (FAILED(hr))
+        return hr;
 
     /*
@@ -4830 +4830 @@
      * here to make requests from under the lock in order to serialize them.
      */
-    PVMREQ pReq;
-    int vrc = VMR3ReqCallWaitU(pUVM, 0 /*idDstCpu*/,
-                               (PFNRT)i_changeNetworkAttachment, 6,
-                               this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
+    int rc = VMR3ReqCallWaitU(pUVM, 0 /*idDstCpu*/,
+                              (PFNRT)i_changeNetworkAttachment, 6,
+                              this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
 
     if (fResume)
         i_resumeAfterConfigChange(pUVM);
 
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("Returns S_OK\n"));
+    if (RT_SUCCESS(rc))
         return S_OK;
-    }
 
     return setError(E_FAIL,
-                    tr("Could not change the network adaptor attachement type (%Rrc)"),
-                    vrc);
+                    tr("Could not change the network adaptor attachement type (%Rrc)"), rc);
 }
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Console VRDP Helper class
+ * VBox Console VRDP helper class.
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -651 +651 @@
             size_t cbPortRange = portRange.length() + 1;
 
-            if (cbPortRange >= 0x10000)
-            {
-                /* More than 64K seems to be an  invalid port range string. */
+            if (cbPortRange >= _64K)
+            {
+                /* More than 64K seems to be an invalid port range string. */
                 rc = VERR_TOO_MUCH_DATA;
                 break;
@@ -797 +797 @@
 
                 HRESULT hrc = server->mConsole->i_machine()->GetExtraData(com::Bstr(extraData).raw(),
-                                                                        bstrValue.asOutParam());
+                                                                          bstrValue.asOutParam());
                 if (FAILED(hrc) || bstrValue.isEmpty())
                 {
@@ -805 +805 @@
 
                     hrc = server->mConsole->i_machine()->GetExtraData(com::Bstr(extraData).raw(),
-                                                                    bstrValue.asOutParam());
+                                                                      bstrValue.asOutParam());
                     if (FAILED(hrc))
                     {
@@ -817 +817 @@
                 const char *pszPropertyName = &pFeature->achInfo[9];
                 HRESULT hrc = server->mConsole->i_getVRDEServer()->GetVRDEProperty(Bstr(pszPropertyName).raw(),
-                                                                                 bstrValue.asOutParam());
+                                                                                   bstrValue.asOutParam());
                 if (FAILED(hrc))
                 {
@@ -957 +957 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        pServer->mConsole->i_getAudioVRDE()->onVRDEInputIntercept(false);
+        AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
+        if (pVRDE)
+            pVRDE->onVRDEInputIntercept(false /* fIntercept */);
 #else
         PPDMIAUDIOSNIFFERPORT pPort = pServer->mConsole->i_getAudioSniffer()->getAudioSnifferPort();
@@ -983 +985 @@
 {
     ConsoleVRDPServer *pServer = static_cast<ConsoleVRDPServer*>(pvCallback);
+    AssertPtrReturn(pServer, VERR_INVALID_POINTER);
 
     LogFlowFunc(("%x\n", fu32Intercept));
@@ -1018 +1021 @@
         case VRDE_CLIENT_INTERCEPT_AUDIO_INPUT:
         {
-            /* This request is processed internally by the ConsoleVRDPServer.
+            /*
+             * This request is processed internally by the ConsoleVRDPServer.
              * Only one client is allowed to intercept audio input.
              */
             if (ASMAtomicCmpXchgU32(&pServer->mu32AudioInputClientId, u32ClientId, 0) == true)
             {
-                LogFunc(("Connected client %u\n", u32ClientId));
+                LogFunc(("Intercepting audio input by client %RU32\n", u32ClientId));
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                pServer->mConsole->i_getAudioVRDE()->onVRDEInputIntercept(true);
+                AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
+                if (pVRDE)
+                    pVRDE->onVRDEInputIntercept(true /* fIntercept */);
 #else
                 PPDMIAUDIOSNIFFERPORT pPort = pServer->mConsole->i_getAudioSniffer()->getAudioSnifferPort();
@@ -1044 +1050 @@
             else
             {
-                Log(("AUDIOIN: ignored client %u, active client %u\n", u32ClientId, pServer->mu32AudioInputClientId));
+                Log(("AUDIOIN: ignored client %RU32, active client %RU32\n", u32ClientId, pServer->mu32AudioInputClientId));
                 rc = VERR_NOT_SUPPORTED;
             }
@@ -1311 +1317 @@
 #endif
 
+    AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
+    if (!pVRDE) /* Nothing to do, bail out early. */
+        return;
+
     switch (u32Event)
     {
@@ -1316 +1326 @@
         {
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            pServer->mConsole->i_getAudioVRDE()->onVRDEInputBegin(pvCtx, (PVRDEAUDIOINBEGIN)pvData);
+            pVRDE->onVRDEInputBegin(pvCtx, (PVRDEAUDIOINBEGIN)pvData);
 #else
             const VRDEAUDIOINBEGIN *pParms = (const VRDEAUDIOINBEGIN *)pvData;
@@ -1331 +1341 @@
         case VRDE_AUDIOIN_DATA:
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            pServer->mConsole->i_getAudioVRDE()->onVRDEInputData(pvCtx, pvData, cbData);
+            pVRDE->onVRDEInputData(pvCtx, pvData, cbData);
 #else
             pPort->pfnAudioInputEventData (pPort, pvCtx, pvData, cbData);
@@ -1339 +1349 @@
         case VRDE_AUDIOIN_END:
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            pServer->mConsole->i_getAudioVRDE()->onVRDEInputEnd(pvCtx);
+            pVRDE->onVRDEInputEnd(pvCtx);
 #else
             pPort->pfnAudioInputEventEnd (pPort, pvCtx);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -50 +50 @@
     /** Pointer to the driver instance structure. */
     PDMIHOSTAUDIO        IHostAudioR3;
+    /** Pointer to the VRDP's console object. */
     ConsoleVRDPServer   *pConsoleVRDPServer;
-    /** Pointer to the DrvAudio port interface that is above it. */
+    /** Pointer to the DrvAudio port interface that is above us. */
     PPDMIAUDIOCONNECTOR  pDrvAudio;
+    /** Whether this driver is enabled or not. */
+    bool                 fEnabled;
 } DRVAUDIOVRDE, *PDRVAUDIOVRDE;
 
@@ -64 +67 @@
     /** Critical section. */
     RTCRITSECT           CritSect;
-
 } VRDESTREAMIN, *PVRDESTREAMIN;
 
@@ -82 +84 @@
 }
 
-static DECLCALLBACK(int) drvAudioVRDEInitOut(PPDMIHOSTAUDIO pInterface,
-                                             PPDMAUDIOHSTSTRMOUT pHstStrmOut, PPDMAUDIOSTREAMCFG pCfg,
-                                             uint32_t *pcSamples)
-{
-    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
-    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
-
-    LogFlowFunc(("pHstStrmOut=%p, pCfg=%p\n", pHstStrmOut, pCfg));
-
-    PVRDESTREAMOUT pVRDEStrmOut = (PVRDESTREAMOUT)pHstStrmOut;
-    AssertPtrReturn(pVRDEStrmOut, VERR_INVALID_POINTER);
-
-    if (pcSamples)
-        *pcSamples = _4K; /** @todo Make this configurable. */
-
-    return drvAudioStreamCfgToProps(pCfg, &pVRDEStrmOut->HstStrmOut.Props);
-}
-
 static DECLCALLBACK(int) drvAudioVRDEInitIn(PPDMIHOSTAUDIO pInterface,
                                             PPDMAUDIOHSTSTRMIN pHstStrmIn, PPDMAUDIOSTREAMCFG pCfg,
@@ -115 +99 @@
 
     return drvAudioStreamCfgToProps(pCfg, &pVRDEStrmIn->HstStrmIn.Props);
+}
+
+static DECLCALLBACK(int) drvAudioVRDEInitOut(PPDMIHOSTAUDIO pInterface,
+                                             PPDMAUDIOHSTSTRMOUT pHstStrmOut, PPDMAUDIOSTREAMCFG pCfg,
+                                             uint32_t *pcSamples)
+{
+    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
+    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("pHstStrmOut=%p, pCfg=%p\n", pHstStrmOut, pCfg));
+
+    PVRDESTREAMOUT pVRDEStrmOut = (PVRDESTREAMOUT)pHstStrmOut;
+    AssertPtrReturn(pVRDEStrmOut, VERR_INVALID_POINTER);
+
+    if (pcSamples)
+        *pcSamples = _4K; /** @todo Make this configurable. */
+
+    return drvAudioStreamCfgToProps(pCfg, &pVRDEStrmOut->HstStrmOut.Props);
+}
+
+static DECLCALLBACK(bool) drvAudioVRDEIsEnabled(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+{
+    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
+    AssertPtrReturn(pDrv, false);
+
+    NOREF(enmDir);
+
+    if (!pDrv->fEnabled)
+        return false;
+
+    return true;
 }
 
@@ -184 +199 @@
     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
+
     PVRDESTREAMOUT pVRDEStrmOut = (PVRDESTREAMOUT)pHstStrmOut;
     AssertPtrReturn(pVRDEStrmOut, VERR_INVALID_POINTER);
@@ -311 +327 @@
 
     /* Initialize only if not already done. */
+    int rc;
     if (enmStreamCmd == PDMAUDIOSTREAMCMD_ENABLE)
     {
-        int rc2 = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, audioMixBufSize(&pThisStrmIn->MixBuf),
-                                                                pThisStrmIn->Props.uHz,
-                                                                pThisStrmIn->Props.cChannels, pThisStrmIn->Props.cBits);
-#ifdef DEBUG
-        if (rc2 == VERR_NOT_SUPPORTED)
+        rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, audioMixBufSize(&pThisStrmIn->MixBuf),
+                                                           pThisStrmIn->Props.uHz,
+                                                           pThisStrmIn->Props.cChannels, pThisStrmIn->Props.cBits);
+        if (rc == VERR_NOT_SUPPORTED)
+        {
             LogFlowFunc(("No RDP client connected, so no input recording supported\n"));
-#endif
+            rc = VINF_SUCCESS;
+        }
     }
     else if (enmStreamCmd == PDMAUDIOSTREAMCMD_DISABLE)
     {
         pDrv->pConsoleVRDPServer->SendAudioInputEnd(NULL /* pvUserCtx */);
-    }
-
-    return VINF_SUCCESS;
+        rc = VINF_SUCCESS;
+    }
+
+    return rc;
 }
 
@@ -334 +353 @@
     pCfg->cbStreamIn      = sizeof(VRDESTREAMIN);
     pCfg->cMaxHstStrmsOut = 1;
-    pCfg->cMaxHstStrmsIn  = 2; /* Microphone in + line in. */
+    pCfg->cMaxHstStrmsIn  = 2; /* Microphone in + Line in. */
 
     return VINF_SUCCESS;
@@ -367 +386 @@
 }
 
-int AudioVRDE::onVRDEInputIntercept(bool fIntercept)
-{
-    LogFlowThisFunc(("fIntercept=%RTbool\n", fIntercept));
+int AudioVRDE::onVRDEControl(bool fEnable, uint32_t uFlags)
+{
+    LogFlowThisFunc(("fEnable=%RTbool, uFlags=0x%x\n", fEnable, uFlags));
+
+    mpDrv->fEnabled = fEnable;
 
     return VINF_SUCCESS; /* Never veto. */
@@ -398 +419 @@
     bool fUnsigned = VRDE_AUDIO_FMT_SIGNED(audioFmt);
 
-    /*pVRDEStrmIn->cbSample = VRDE_AUDIO_FMT_BYTES_PER_SAMPLE(audioFmt);
-    pVRDEStrmIn->uHz      = iSampleHz;*/
-
     LogFlowFunc(("cbSample=%RU32, iSampleHz=%d, cChannels=%d, cBits=%d, fUnsigned=%RTbool\n",
                  VRDE_AUDIO_FMT_BYTES_PER_SAMPLE(audioFmt), iSampleHz, cChannels, cBits, fUnsigned));
@@ -434 +452 @@
 }
 
+int AudioVRDE::onVRDEInputIntercept(bool fEnabled)
+{
+    return VINF_SUCCESS; /* Never veto. */
+}
+
 /**
  * Construct a VRDE audio driver instance.
@@ -442 +465 @@
 DECLCALLBACK(int) AudioVRDE::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    AssertPtrReturn(pDrvIns, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
+
     PDRVAUDIOVRDE pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVRDE);
+
     LogRel(("Audio: Initializing VRDE driver\n"));
     LogFlowFunc(("fFlags=0x%x\n", fFlags));
@@ -453 +480 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                    = pDrvIns;
+    pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface  = drvAudioVRDEQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvAudioVRDEQueryInterface;
     /* IHostAudioR3 */
-    pThis->IHostAudioR3.pfnInitIn     = drvAudioVRDEInitIn;
-    pThis->IHostAudioR3.pfnInitOut    = drvAudioVRDEInitOut;
-    pThis->IHostAudioR3.pfnControlOut = drvAudioVRDEControlOut;
-    pThis->IHostAudioR3.pfnControlIn  = drvAudioVRDEControlIn;
-    pThis->IHostAudioR3.pfnFiniIn     = drvAudioVRDEFiniIn;
-    pThis->IHostAudioR3.pfnFiniOut    = drvAudioVRDEFiniOut;
-    pThis->IHostAudioR3.pfnCaptureIn  = drvAudioVRDECaptureIn;
-    pThis->IHostAudioR3.pfnPlayOut    = drvAudioVRDEPlayOut;
-    pThis->IHostAudioR3.pfnGetConf    = drvAudioVRDEGetConf;
-    pThis->IHostAudioR3.pfnInit       = drvAudioVRDEInit;
-
-    /* Get VRDPServer pointer. */
+    PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvAudioVRDE);
+
+    /* Init defaults. */
+    pThis->fEnabled = false;
+
+    /*
+     * Get the ConsoleVRDPServer object pointer.
+     */
     void *pvUser;
     int rc = CFGMR3QueryPtr(pCfg, "ObjectVRDPServer", &pvUser);
@@ -480 +503 @@
     pThis->pConsoleVRDPServer = (ConsoleVRDPServer *)pvUser;
 
+    /*
+     * Get the AudioVRDE object pointer.
+     */
     pvUser = NULL;
     rc = CFGMR3QueryPtr(pCfg, "Object", &pvUser);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -808 +808 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                    = pDrvIns;
+    pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface  = drvAudioVideoRecQueryInterface;
-    pThis->IHostAudioR3.pfnInitIn     = drvAudioVideoRecInitIn;
-    pThis->IHostAudioR3.pfnInitOut    = drvAudioVideoRecInitOut;
-    pThis->IHostAudioR3.pfnControlOut = drvAudioVideoRecControlOut;
-    pThis->IHostAudioR3.pfnControlIn  = drvAudioVideoRecControlIn;
-    pThis->IHostAudioR3.pfnFiniIn     = drvAudioVideoRecFiniIn;
-    pThis->IHostAudioR3.pfnFiniOut    = drvAudioVideoRecFiniOut;
-    pThis->IHostAudioR3.pfnCaptureIn  = drvAudioVideoRecCaptureIn;
-    pThis->IHostAudioR3.pfnPlayOut    = drvAudioVideoRecPlayOut;
-    pThis->IHostAudioR3.pfnGetConf    = drvAudioVideoRecGetConf;
-    pThis->IHostAudioR3.pfnInit       = drvAudioVideoRecInit;
+    pDrvIns->IBase.pfnQueryInterface = drvAudioVideoRecQueryInterface;
+    /* IHostAudioR3 */
+    PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvAudioVideoRec);
 
     /* Get VRDPServer pointer. */