Changeset 73378 in vbox for trunk/src/VBox

Timestamp:

Jul 27, 2018 8:48:37 AM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudioCommon.cpp: Fixes / docs for DrvAudioHlpClearBuf().

File:

• trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (3 diffs)

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

@@ -120 +120 @@
 
 /**
- * Clears a sample buffer by the given amount of audio samples.
- *
- * @return  IPRT status code.
+ * Clears a sample buffer by the given amount of audio frames with silence (according to the format
+ * given by the PCM properties).
+ *
  * @param   pPCMProps               PCM properties to use for the buffer to clear.
  * @param   pvBuf                   Buffer to clear.
  * @param   cbBuf                   Size (in bytes) of the buffer.
- * @param   cSamples                Number of audio samples to clear in the buffer.
- */
-void DrvAudioHlpClearBuf(const PPDMAUDIOPCMPROPS pPCMProps, void *pvBuf, size_t cbBuf, uint32_t cSamples)
+ * @param   cFrames                 Number of audio frames to clear in the buffer.
+ */
+void DrvAudioHlpClearBuf(const PPDMAUDIOPCMPROPS pPCMProps, void *pvBuf, size_t cbBuf, uint32_t cFrames)
 {
     AssertPtrReturnVoid(pPCMProps);
     AssertPtrReturnVoid(pvBuf);
 
-    if (!cbBuf || !cSamples)
+    if (!cbBuf || !cFrames)
         return;
 
     Assert(pPCMProps->cBits);
-    size_t cbToClear = cSamples * (pPCMProps->cBits / 8 /* Bytes */);
+    size_t cbToClear = DrvAudioHlpFramesToBytes(pPCMProps, cFrames);
     Assert(cbBuf >= cbToClear);
 
@@ -143 +143 @@
         cbToClear = cbBuf;
 
-    Log2Func(("pPCMProps=%p, pvBuf=%p, cSamples=%RU32, fSigned=%RTbool, cBits=%RU8\n",
-              pPCMProps, pvBuf, cSamples, pPCMProps->fSigned, pPCMProps->cBits));
+    Log2Func(("pPCMProps=%p, pvBuf=%p, cFrames=%RU32, fSigned=%RTbool, cBits=%RU8\n",
+              pPCMProps, pvBuf, cFrames, pPCMProps->fSigned, pPCMProps->cBits));
+
+    Assert(pPCMProps->fSwapEndian == false); /** @todo Swapping Endianness is not supported yet. */
 
     if (pPCMProps->fSigned)
@@ -163 +165 @@
             {
                 uint16_t *p = (uint16_t *)pvBuf;
-                int16_t   s = INT16_MAX;
-
-                if (pPCMProps->fSwapEndian)
-                    s = RT_BSWAP_U16(s);
-
-                for (uint32_t i = 0; i < cSamples; i++)
+                uint16_t  s = 0x8000;
+
+                for (uint32_t i = 0; i < DrvAudioHlpBytesToFrames(pPCMProps, (uint32_t)cbToClear); i++)
                     p[i] = s;
 
                 break;
             }
+
+            /** @todo Add 24 bit? */
 
             case 32:
             {
                 uint32_t *p = (uint32_t *)pvBuf;
-                int32_t   s = INT32_MAX;
-
-                if (pPCMProps->fSwapEndian)
-                    s = RT_BSWAP_U32(s);
-
-                for (uint32_t i = 0; i < cSamples; i++)
+                uint32_t  s = 0x80000000;
+
+                for (uint32_t i = 0; i < DrvAudioHlpBytesToFrames(pPCMProps, (uint32_t)cbToClear); i++)
                     p[i] = s;