Changeset 68046 in vbox

Timestamp:

Jul 19, 2017 12:54:21 PM (8 years ago)

Author:

vboxsync

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

117070

Message:

Audio/DrvAudioVRDE: Changed internal counter to subtract played samples instead of zeroing all at once; this should fix the rest of the reported stuttering when VRDP is enabled. Renaming + comments.

File:

• trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (8 diffs)

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

@@ -70 +70 @@
         {
             /** Number of samples this stream can handle at once. */
-            uint32_t    cSamplesMax;
+            uint32_t    csMax;
             /** Circular buffer for holding the recorded audio samples from the host. */
             PRTCIRCBUF  pCircBuf;
@@ -76 +76 @@
         struct
         {
-            uint64_t    old_ticks;
+            /** Timestamp (in virtual time ticks) of the last audio playback (of the VRDP server). */
+            uint64_t    ticksPlayedLast;
+            /** Internal counter (in audio samples) to track if and how much we can write to the VRDP server
+             *  for the current time period. */
             uint64_t    csToWrite;
         } Out;
@@ -87 +90 @@
 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 */);
+    pStreamVRDE->In.csMax = _1K; /** @todo Make this configurable. */
+
+    int rc = RTCircBufCreate(&pStreamVRDE->In.pCircBuf, pStreamVRDE->In.csMax * (pCfgReq->Props.cBits / 8) /* Bytes */);
     if (RT_SUCCESS(rc))
     {
@@ -102 +105 @@
              */
             pCfgAcq->enmLayout         = PDMAUDIOSTREAMLAYOUT_RAW;
-            pCfgAcq->cSampleBufferHint = pStreamVRDE->In.cSamplesMax;
+            pCfgAcq->cSampleBufferHint = pStreamVRDE->In.csMax;
         }
     }
@@ -155 +158 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pStreamVRDE, pStreamVRDE->In.cSamplesMax,
+            rc = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pStreamVRDE, pStreamVRDE->In.csMax,
                                                                pStreamVRDE->pCfg->Props.uHz, pStreamVRDE->pCfg->Props.cChannels,
                                                                pStreamVRDE->pCfg->Props.cBits);
@@ -277 +280 @@
                                                  pProps->fSigned);
 
-#ifdef DEBUG
-    uint64_t now              = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-    uint64_t ticks            = now  - pStreamVRDE->Out.old_ticks;
-    uint64_t ticks_per_second = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
-
-    /* Minimize the rounding error: samples = int((ticks * freq) / ticks_per_second + 0.5). */
-    uint32_t csExpected = (int)((2 * ticks * pProps->uHz + ticks_per_second) / ticks_per_second / 2);
-    LogFunc(("csExpected=%RU32\n", csExpected));
-#endif
-
+    /* Use the internal counter to track if we (still) can write to the VRDP server
+     * or if we need to wait another round (time slot). */
     uint32_t csToWrite = pStreamVRDE->Out.csToWrite;
 
-    Log2Func(("uFreq=%RU32, cChan=%RU8, cBits=%RU8 (%d BPP), fSigned=%RTbool, enmFormat=%ld, csLive=%RU32, csToWrite=%RU32\n",
-              pProps->uHz, pProps->cChannels, pProps->cBits, VRDE_AUDIO_FMT_BYTES_PER_SAMPLE(format),
-              pProps->fSigned, format, csLive, csToWrite));
+    Log3Func(("csLive=%RU32, csToWrite=%RU32\n", csLive, csToWrite));
 
     /* Don't play more than available. */
     if (csToWrite > csLive)
-    {
-        LogFunc(("Expected at least %RU32 audio samples, but only got %RU32\n", csToWrite, csLive));
         csToWrite = csLive;
-    }
-
-    /* Reset to-write sample count. */
-    pStreamVRDE->Out.csToWrite = 0;
-
-    /* Remember when samples were consumed. */
-    pStreamVRDE->Out.old_ticks = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
 
     int rc = VINF_SUCCESS;
@@ -335 +319 @@
     if (RT_SUCCESS(rc))
     {
+        /* Subtract written samples from the counter. */
+        Assert(pStreamVRDE->Out.csToWrite >= csWritten);
+        pStreamVRDE->Out.csToWrite      -= csWritten;
+
+        /* Remember when samples were consumed. */
+        pStreamVRDE->Out.ticksPlayedLast = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
+
         /* Return samples instead of bytes here
          * (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout). */
@@ -525 +516 @@
     PVRDESTREAM   pStreamVRDE = (PVRDESTREAM)pStream;
 
-    uint64_t now              = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
-    uint64_t ticks            = now  - pStreamVRDE->Out.old_ticks;
-    uint64_t ticks_per_second = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
+    const uint64_t ticksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
+    const uint64_t ticksElapsed = ticksNow  - pStreamVRDE->Out.ticksPlayedLast;
+    const uint64_t ticksPerSec  = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
 
     PPDMAUDIOPCMPROPS pProps  = &pStreamVRDE->pCfg->Props;
 
     /* Minimize the rounding error: samples = int((ticks * freq) / ticks_per_second + 0.5). */
-    pStreamVRDE->Out.csToWrite = (int)((2 * ticks * pProps->uHz + ticks_per_second) / ticks_per_second / 2);
+    pStreamVRDE->Out.csToWrite = (int)((2 * ticksElapsed * pProps->uHz + ticksPerSec) / ticksPerSec / 2);
 
     /* Return samples instead of bytes here