Changeset 63534 in vbox for trunk/src

Timestamp:

Aug 16, 2016 10:14:46 AM (8 years ago)

Author:

vboxsync

Message:

Audio: Renaming.

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvAudio.cpp (modified) (3 diffs)
• Devices/Audio/DrvHostALSAAudio.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostCoreAudio.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostDSound.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostDebugAudio.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostNullAudio.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostOSSAudio.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostPulseAudio.cpp (modified) (2 diffs)
• Main/src-client/DrvAudioVRDE.cpp (modified) (2 diffs)
• Main/src-client/DrvAudioVideoRec.cpp (modified) (14 diffs)

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

@@ -545 +545 @@
     AudioMixBufDestroy(&pHstStream->MixBuf);
 
-    if (CfgHostAcq.cSamples)
-    {
-        LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSamples * 4));
-
-        rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSamples * 4);
+    if (CfgHostAcq.cSampleBufferSize)
+    {
+        LogFlowFunc(("[%s] cSamples=%RU32\n", pHstStream->szName, CfgHostAcq.cSampleBufferSize * 4));
+
+        rc2 = AudioMixBufInit(&pHstStream->MixBuf, pHstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize * 4);
         AssertRC(rc2);
     }
@@ -567 +567 @@
     AudioMixBufDestroy(&pGstStream->MixBuf);
 
-    if (CfgHostAcq.cSamples)
-    {
-        LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSamples * 2));
-
-        rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSamples * 2);
+    if (CfgHostAcq.cSampleBufferSize)
+    {
+        LogFlowFunc(("[%s] cSamples=%RU32\n", pGstStream->szName, CfgHostAcq.cSampleBufferSize * 2));
+
+        rc2 = AudioMixBufInit(&pGstStream->MixBuf, pGstStream->szName, &PCMProps, CfgHostAcq.cSampleBufferSize * 2);
         AssertRC(rc2);
     }
@@ -579 +579 @@
 #endif
 
-    if (CfgHostAcq.cSamples)
+    if (CfgHostAcq.cSampleBufferSize)
     {
         if (pCfgGuest->enmDir == PDMAUDIODIR_IN)

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

@@ -1359 +1359 @@
             break;
 
-        pCfgAcq->uHz           = obt.freq;
-        pCfgAcq->cChannels     = obt.nchannels;
-        pCfgAcq->enmFormat     = enmFormat;
-        pCfgAcq->enmEndianness = enmEnd;
-        pCfgAcq->cSamples      = obt.samples * 4;
+        pCfgAcq->uHz               = obt.freq;
+        pCfgAcq->cChannels         = obt.nchannels;
+        pCfgAcq->enmFormat         = enmFormat;
+        pCfgAcq->enmEndianness     = enmEnd;
+        pCfgAcq->cSampleBufferSize = obt.samples * 4;
 
         PDMAUDIOPCMPROPS Props;
@@ -1422 +1422 @@
             break;
 
-        pCfgAcq->uHz           = obt.freq;
-        pCfgAcq->cChannels     = obt.nchannels;
-        pCfgAcq->enmFormat     = enmFormat;
-        pCfgAcq->enmEndianness = enmEnd;
-        pCfgAcq->cSamples      = obt.samples;
+        pCfgAcq->uHz               = obt.freq;
+        pCfgAcq->cChannels         = obt.nchannels;
+        pCfgAcq->enmFormat         = enmFormat;
+        pCfgAcq->enmEndianness     = enmEnd;
+        pCfgAcq->cSampleBufferSize = obt.samples;
 
         PDMAUDIOPCMPROPS Props;

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

@@ -1562 +1562 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = cSamples;
+            pCfgAcq->cSampleBufferSize = cSamples;
     }
     else
@@ -1882 +1882 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = cSamples;
+            pCfgAcq->cSampleBufferSize = cSamples;
     }
     else

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

@@ -1462 +1462 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = pThis->cfg.cbBufferOut >> pDSoundStream->Props.cShift;
+            pCfgAcq->cSampleBufferSize = pThis->cfg.cbBufferOut >> pDSoundStream->Props.cShift;
 
         /* Try to open playback in case the device is already there. */
@@ -1714 +1714 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSamples = pThis->cfg.cbBufferIn >> pDSoundStream->Props.cShift;
+            pCfgAcq->cSampleBufferSize = pThis->cfg.cbBufferIn >> pDSoundStream->Props.cShift;
 
         /* Try to open capture in case the device is already there. */

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

@@ -138 +138 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSamples = _1K;
+            pCfgAcq->cSampleBufferSize = _1K;
     }
 
@@ -183 +183 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSamples = pDbgStream->Out.cMaxSamplesInPlayBuffer;
+            pCfgAcq->cSampleBufferSize = pDbgStream->Out.cMaxSamplesInPlayBuffer;
     }
 

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

@@ -221 +221 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSamples = _1K;
+            pCfgAcq->cSampleBufferSize = _1K;
     }
 
@@ -244 +244 @@
         {
             if (pCfgAcq)
-                pCfgAcq->cSamples = pNullStream->cMaxSamplesInPlayBuffer;
+                pCfgAcq->cSampleBufferSize = pNullStream->cMaxSamplesInPlayBuffer;
         }
         else

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

@@ -711 +711 @@
                 pStrm->cbBuf = cbBuf;
 
-                pCfgAcq->cSamples = cSamples;
+                pCfgAcq->cSampleBufferSize = cSamples;
             }
         }
@@ -833 +833 @@
             }
 #endif
-            pCfgAcq->cSamples = cSamples;
+            pCfgAcq->cSampleBufferSize = cSamples;
         }
 

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

@@ -684 +684 @@
                 pStrm->pDrv     = pThis;
 
-                pCfgAcq->cSamples = cbBuf >> Props.cShift;
+                pCfgAcq->cSampleBufferSize = cbBuf >> Props.cShift;
             }
             else
@@ -733 +733 @@
         pPAStrm->pu8PeekBuf = NULL;
 
-        pCfgAcq->uHz       = pPAStrm->SampleSpec.rate;
-        pCfgAcq->cChannels = pPAStrm->SampleSpec.channels;
-        pCfgAcq->cSamples  = RT_MIN(pPAStrm->BufAttr.fragsize * 10, pPAStrm->BufAttr.maxlength) >> Props.cShift;
+        pCfgAcq->uHz               = pPAStrm->SampleSpec.rate;
+        pCfgAcq->cChannels         = pPAStrm->SampleSpec.channels;
+        pCfgAcq->cSampleBufferSize = RT_MIN(pPAStrm->BufAttr.fragsize * 10, pPAStrm->BufAttr.maxlength) >> Props.cShift;
     }
 

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

@@ -102 +102 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+            pCfgAcq->cSampleBufferSize = _4K; /** @todo Make this configurable. */
     }
 
@@ -125 +125 @@
     {
         if (pCfgAcq)
-            pCfgAcq->cSamples = _4K; /** @todo Make this configurable. */
+            pCfgAcq->cSampleBufferSize = _4K; /** @todo Make this configurable. */
     }
 

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

@@ -212 +212 @@
         int live = smin;
 
-        if (live < 0 || live > hw->cSamples)
+        if (live < 0 || live > hw->cSampleBufferSize)
         {
-            LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSamples));
+            LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSampleBufferSize));
             return 0;
         }
@@ -228 +228 @@
 
     live = audio_pcm_hw_get_live_out2 (hw, &nb_live);
-    if (live < 0 || live > hw->cSamples)
-    {
-        LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSamples));
+    if (live < 0 || live > hw->cSampleBufferSize)
+    {
+        LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSampleBufferSize));
         return 0;
     }
@@ -257 +257 @@
 {
     int live = hw->cTotalSamplesCaptured - audio_pcm_hw_find_min_in (hw);
-    if (live < 0 || live > hw->cSamples)
-    {
-        LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSamples));
+    if (live < 0 || live > hw->cSampleBufferSize)
+    {
+        LogFlowFunc(("Error: live=%d hw->samples=%d\n", live, hw->cSampleBufferSize));
         return 0;
     }
@@ -383 +383 @@
 
     PVIDEORECAUDIOOUT pVRDEVoiceOut = (PVIDEORECAUDIOOUT)pHostVoiceOut;
-    pHostVoiceOut->cSamples = _4K; /* 4096 samples * 4 = 16K bytes total. */
+    pHostVoiceOut->cSampleBufferSize = _4K; /* 4096 samples * 4 = 16K bytes total. */
 
     return drvAudioVideoRecPcmInitInfo(&pVRDEVoiceOut->pHostVoiceOut.Props, pCfg);
@@ -394 +394 @@
 
     PVIDEORECAUDIOIN pVRDEVoice = (PVIDEORECAUDIOIN)pHostVoiceIn;
-    pHostVoiceIn->cSamples = _4K; /* 4096 samples * 4 = 16K bytes total. */
+    pHostVoiceIn->cSampleBufferSize = _4K; /* 4096 samples * 4 = 16K bytes total. */
 
     return drvAudioVideoRecPcmInitInfo(&pVRDEVoice->pHostVoiceIn.Props, pCfg);
@@ -418 +418 @@
 
     /* How much space is available in the mix buffer. Use the smaller size of the too. */
-    cSamplesRingBuffer = RT_MIN(cSamplesRingBuffer, (uint32_t)(pVRDEVoice->pHostVoiceIn.cSamples -
+    cSamplesRingBuffer = RT_MIN(cSamplesRingBuffer, (uint32_t)(pVRDEVoice->pHostVoiceIn.cSampleBufferSize -
                                 audio_pcm_hw_get_live_in (&pVRDEVoice->pHostVoiceIn)));
 
@@ -430 +430 @@
         /* How much is left? Split request at the end of our samples buffer. */
         size_t cSamplesToRead = RT_MIN(cSamplesRingBuffer - cSamplesRead,
-                                       (uint32_t)(pVRDEVoice->pHostVoiceIn.cSamples - pVRDEVoice->pHostVoiceIn.offSamplesWritten));
+                                       (uint32_t)(pVRDEVoice->pHostVoiceIn.cSampleBufferSize - pVRDEVoice->pHostVoiceIn.offSamplesWritten));
         size_t cbToRead = cSamplesToRead * sizeof(PDMAUDIOSAMPLE);
         LogFlowFunc(("Try reading %zu samples (%zu bytes)\n", cSamplesToRead, cbToRead));
@@ -462 +462 @@
 
         pVRDEVoice->pHostVoiceIn.offSamplesWritten = (pVRDEVoice->pHostVoiceIn.offSamplesWritten + cSamplesToRead)
-                                              % pVRDEVoice->pHostVoiceIn.cSamples;
+                                              % pVRDEVoice->pHostVoiceIn.cSampleBufferSize;
 
         /* How much have we reads so far. */
@@ -502 +502 @@
                  pHostVoiceOut->Props.uHz, pHostVoiceOut->Props.cChannels,
                  pHostVoiceOut->Props.cBits, pHostVoiceOut->Props.fSigned,
-                 pHostVoiceOut->cSamples, format));
+                 pHostVoiceOut->cSampleBufferSize, format));
 
     pVRDEVoiceOut->old_ticks = now;
     int cSamplesToSend = RT_MIN(live, cSamplesPlayed);
 
-    if (pHostVoiceOut->cOffSamplesRead + cSamplesToSend > pHostVoiceOut->cSamples)
+    if (pHostVoiceOut->cOffSamplesRead + cSamplesToSend > pHostVoiceOut->cSampleBufferSize)
     {
         /* send the samples till the end of pHostStereoSampleBuf */
         pDrv->pConsoleVRDPServer->SendAudioSamples(&pHostVoiceOut->paSamples[pHostVoiceOut->cOffSamplesRead],
-                                                   (pHostVoiceOut->cSamples - pHostVoiceOut->cOffSamplesRead), format);
+                                                   (pHostVoiceOut->cSampleBufferSize - pHostVoiceOut->cOffSamplesRead), format);
         /*pHostStereoSampleBuff already has the samples which exceeded its space. They have overwriten the old
          * played sampled starting from offset 0. So based on the number of samples that we had to play,
@@ -517 +517 @@
          */
         pDrv->pConsoleVRDPServer->SendAudioSamples(&pHostVoiceOut->paSamples[0],
-                                                   (cSamplesToSend - (pHostVoiceOut->cSamples -
+                                                   (cSamplesToSend - (pHostVoiceOut->cSampleBufferSize -
                                                                       pHostVoiceOut->cOffSamplesRead)),
                                                    format);
@@ -527 +527 @@
     }
 
-    pHostVoiceOut->cOffSamplesRead = (pHostVoiceOut->cOffSamplesRead + cSamplesToSend) % pHostVoiceOut->cSamples;
+    pHostVoiceOut->cOffSamplesRead = (pHostVoiceOut->cOffSamplesRead + cSamplesToSend) % pHostVoiceOut->cSampleBufferSize;
 
     *pcSamplesPlayed = cSamplesToSend;
@@ -584 +584 @@
         pVRDEVoice->cbRateBufferAllocated = 0;
 
-        pVRDEVoice->pHostVoiceIn.cSamples = 2048;
+        pVRDEVoice->pHostVoiceIn.cSampleBufferSize = 2048;
         /* Initialize the hardware info section with the audio settings */
 
@@ -591 +591 @@
         /* Create the internal ring buffer. */
         RTCircBufCreate(&pVRDEVoice->pRecordedVoiceBuf,
-                        pVRDEVoice->pHostVoiceIn.cSamples * sizeof(PDMAUDIOSAMPLE));
+                        pVRDEVoice->pHostVoiceIn.cSampleBufferSize * sizeof(PDMAUDIOSAMPLE));
 
         if (!RT_VALID_PTR(pVRDEVoice->pRecordedVoiceBuf))
@@ -600 +600 @@
 
         ASMAtomicWriteU32(&pVRDEVoice->status, CA_STATUS_INIT);
-        return pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEVoice, pHostVoiceIn->cSamples,
+        return pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEVoice, pHostVoiceIn->cSampleBufferSize,
                                                              pHostVoiceIn->Props.uHz,
                                                              pHostVoiceIn->Props.cChannels, pHostVoiceIn->Props.cBits);