Changeset 65630 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 6, 2017 5:01:11 PM (8 years ago)

Author:

vboxsync

Message:

AudioMixBuffer: Renamed AudioMixBufAcquire() to AudioMixBufPeek() and added parameters for supplying a buffer for returning the audio data.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (2 diffs)
• AudioMixBuffer.h (modified) (2 diffs)

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

@@ -140 +140 @@
 
 /**
- * Acquires (reads) a mutable pointer to the mixing buffer's audio samples without
- * any conversion done.
- ** @todo Rename to AudioMixBufPeek(Mutable/Raw)?
- ** @todo Protect the buffer's data?
+ * Peeks for audio samples without any conversion done.
+ * This will get the raw sample data out of a mixing buffer.
  *
  * @return  IPRT status code. VINF_TRY_AGAIN for getting next pointer at beginning (circular).
  * @param   pMixBuf                 Mixing buffer to acquire audio samples from.
  * @param   cSamplesToRead          Number of audio samples to read.
- * @param   ppvSamples              Returns a mutable pointer to the buffer's audio sample data.
- * @param   pcSamplesRead           Number of audio samples read (acquired).
+ * @param   paSampleBuf             Buffer where to store the returned audio samples.
+ * @param   cSampleBuf              Size (in samples) of the buffer to store audio samples into.
+ * @param   pcSamplesRead           Returns number of read audio samples. Optional.
  *
  * @remark  This function is not thread safe!
  */
-int AudioMixBufAcquire(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToRead,
-                       PPDMAUDIOSAMPLE *ppvSamples, uint32_t *pcSamplesRead)
-{
-    AssertPtrReturn(pMixBuf, VERR_INVALID_POINTER);
-    AssertPtrReturn(ppvSamples, VERR_INVALID_POINTER);
-    AssertPtrReturn(pcSamplesRead, VERR_INVALID_POINTER);
+int AudioMixBufPeek(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToRead,
+                    PPDMAUDIOSAMPLE paSampleBuf, uint32_t cSampleBuf, uint32_t *pcSamplesRead)
+{
+    AssertPtrReturn(pMixBuf,     VERR_INVALID_POINTER);
+    AssertPtrReturn(paSampleBuf, VERR_INVALID_POINTER);
+    AssertReturn(cSampleBuf,     VERR_INVALID_PARAMETER);
+    /* pcRead is optional. */
 
     int rc;
@@ -164 +164 @@
     if (!cSamplesToRead)
     {
-        *pcSamplesRead = 0;
+        if (pcSamplesRead)
+            *pcSamplesRead = 0;
         return VINF_SUCCESS;
     }
 
-    uint32_t cSamplesRead;
+    uint32_t csRead;
     if (pMixBuf->offRead + cSamplesToRead > pMixBuf->cSamples)
     {
-        cSamplesRead = pMixBuf->cSamples - pMixBuf->offRead;
+        csRead = pMixBuf->cSamples - pMixBuf->offRead;
         rc = VINF_TRY_AGAIN;
     }
     else
     {
-        cSamplesRead = cSamplesToRead;
+        csRead = cSamplesToRead;
         rc = VINF_SUCCESS;
     }
 
-    *ppvSamples = &pMixBuf->pSamples[pMixBuf->offRead];
-    AssertPtr(ppvSamples);
-
-    pMixBuf->offRead = (pMixBuf->offRead + cSamplesRead) % pMixBuf->cSamples;
+    memcpy(paSampleBuf, &pMixBuf->pSamples[pMixBuf->offRead], sizeof(PDMAUDIOSAMPLE) * csRead);
+
+    pMixBuf->offRead = (pMixBuf->offRead + csRead) % pMixBuf->cSamples;
     Assert(pMixBuf->offRead <= pMixBuf->cSamples);
-    pMixBuf->cUsed -= RT_MIN(cSamplesRead, pMixBuf->cUsed);
-
-    *pcSamplesRead = cSamplesRead;
+    pMixBuf->cUsed -= RT_MIN(csRead, pMixBuf->cUsed);
+
+    if (pcSamplesRead)
+        *pcSamplesRead = csRead;
 
     return rc;

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

@@ -49 +49 @@
 
 
-int AudioMixBufAcquire(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToRead, PPDMAUDIOSAMPLE *ppvSamples, uint32_t *pcSamplesRead);
 inline uint32_t AudioMixBufBytesToSamples(PPDMAUDIOMIXBUF pMixBuf);
 void AudioMixBufClear(PPDMAUDIOMIXBUF pMixBuf);
@@ -61 +60 @@
 uint32_t AudioMixBufLive(PPDMAUDIOMIXBUF pMixBuf);
 int AudioMixBufMixToParent(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamples, uint32_t *pcProcessed);
+int AudioMixBufPeek(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToRead, PPDMAUDIOSAMPLE paSampleBuf, uint32_t cSampleBuf, uint32_t *pcSamplesRead);
 uint32_t AudioMixBufUsed(PPDMAUDIOMIXBUF pMixBuf);
 int AudioMixBufReadAt(PPDMAUDIOMIXBUF pMixBuf, uint32_t offSamples, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead);