Changeset 87997 in vbox for trunk

Timestamp:

Mar 8, 2021 1:06:36 AM (4 years ago)

Author:

vboxsync

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

143120

Message:

Audio: Fixed the 16-bit and 32-bit signed cases of DrvAudioHlpClearBuf. Also, eliminated repeated calls to DrvAudioHlpBytesToFrames for each for-loop iteration. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudioCommon.cpp (modified) (3 diffs)
• testcase/tstAudioMixBuffer.cpp (modified) (5 diffs)

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

@@ -130 +130 @@
 void DrvAudioHlpClearBuf(PCPDMAUDIOPCMPROPS pPCMProps, void *pvBuf, size_t cbBuf, uint32_t cFrames)
 {
+    /*
+     * Validate input
+     */
     AssertPtrReturnVoid(pPCMProps);
-    AssertPtrReturnVoid(pvBuf);
-
+    Assert(pPCMProps->cbSample);
     if (!cbBuf || !cFrames)
         return;
-
-    Assert(pPCMProps->cbSample);
+    AssertPtrReturnVoid(pvBuf);
+
+    Assert(pPCMProps->fSwapEndian == false); /** @todo Swapping Endianness is not supported yet. */
+
+    /*
+     * Decide how much needs clearing.
+     */
     size_t cbToClear = DrvAudioHlpFramesToBytes(pPCMProps, cFrames);
-    Assert(cbBuf >= cbToClear);
-
-    if (cbBuf < cbToClear)
-        cbToClear = cbBuf;
+    AssertStmt(cbToClear <= cbBuf, cbToClear = cbBuf);
 
     Log2Func(("pPCMProps=%p, pvBuf=%p, cFrames=%RU32, fSigned=%RTbool, cBytes=%RU8\n",
               pPCMProps, pvBuf, cFrames, pPCMProps->fSigned, pPCMProps->cbSample));
 
-    Assert(pPCMProps->fSwapEndian == false); /** @todo Swapping Endianness is not supported yet. */
-
+    /*
+     * Do the job.
+     */
     if (pPCMProps->fSigned)
-    {
         RT_BZERO(pvBuf, cbToClear);
-    }
     else /* Unsigned formats. */
     {
@@ -157 +160 @@
         {
             case 1: /* 8 bit */
-            {
                 memset(pvBuf, 0x80, cbToClear);
                 break;
-            }
 
             case 2: /* 16 bit */
             {
-                uint16_t *p = (uint16_t *)pvBuf;
-                uint16_t  s = 0x0080;
-
-                for (uint32_t i = 0; i < DrvAudioHlpBytesToFrames((uint32_t)cbToClear, pPCMProps); i++)
-                    p[i] = s;
-
+                uint16_t *pu16Dst = (uint16_t *)pvBuf;
+                size_t    cLeft   = cbToClear / sizeof(uint16_t);
+                while (cLeft-- > 0)
+                    *pu16Dst++ = 0x80;
                 break;
             }
@@ -176 +175 @@
 
             case 4: /* 32 bit */
-            {
-                uint32_t *p = (uint32_t *)pvBuf;
-                uint32_t  s = 0x00000080;
-
-                for (uint32_t i = 0; i < DrvAudioHlpBytesToFrames((uint32_t)cbToClear, pPCMProps); i++)
-                    p[i] = s;
-
+                ASMMemFill32(pvBuf, cbToClear & ~(size_t)3, 0x80);
                 break;
-            }
 
             default:
-            {
                 AssertMsgFailed(("Invalid bytes per sample: %RU8\n", pPCMProps->cbSample));
-                break;
-            }
         }
     }

trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp

@@ -35 +35 @@
 static void tstBasics(RTTEST hTest)
 {
-    RTTestSubF(hTest, "Single buffer");
+    RTTestSub(hTest, "Single buffer");
 
     static const PDMAUDIOPCMPROPS s_Cfg441StereoS16 = PDMAUDIOPCMPROPS_INITIALIZOR(
@@ -45 +45 @@
         /* a_fSwapEndian: */    false
     );
+    static const PDMAUDIOPCMPROPS s_Cfg441StereoU16 = PDMAUDIOPCMPROPS_INITIALIZOR(
+        /* a_cb: */             2,
+        /* a_fSigned: */        false,
+        /* a_cChannels: */      2,
+        /* a_uHz: */            44100,
+        /* a_cShift: */         PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(2 /* cb */, 2 /* cChannels */),
+        /* a_fSwapEndian: */    false
+    );
+    static const PDMAUDIOPCMPROPS s_Cfg441StereoU32 = PDMAUDIOPCMPROPS_INITIALIZOR(
+        /* a_cb: */             4,
+        /* a_fSigned: */        false,
+        /* a_cChannels: */      2,
+        /* a_uHz: */            44100,
+        /* a_cShift: */         PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(4 /* cb */, 2 /* cChannels */),
+        /* a_fSwapEndian: */    false
+    );
 
     RTTESTI_CHECK_MSG(PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoS16, 1) == 4,
                       ("got %x, expected 4\n", PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoS16, 1)));
+    RTTESTI_CHECK_MSG(PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoU16, 1) == 4,
+                      ("got %x, expected 4\n", PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoU16, 1)));
+    RTTESTI_CHECK_MSG(PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoU32, 1) == 8,
+                      ("got %x, expected 4\n", PDMAUDIOPCMPROPS_F2B(&s_Cfg441StereoU32, 1)));
 
     uint32_t u32;
@@ -53 +73 @@
                       ("cb=%RU32\n", u32));
     RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(&s_Cfg441StereoS16, 2)) == 2 * 2 * 2,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(&s_Cfg441StereoS16, 1)) == 4,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(&s_Cfg441StereoU16, 1)) == 4,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(&s_Cfg441StereoU32, 1)) == 8,
+                      ("cb=%RU32\n", u32));
+
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpBytesToFrames(4, &s_Cfg441StereoS16)) == 1,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpBytesToFrames(4, &s_Cfg441StereoU16)) == 1,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpBytesToFrames(8, &s_Cfg441StereoU32)) == 1,
                       ("cb=%RU32\n", u32));
 
@@ -62 +95 @@
     RTTESTI_CHECK_MSG((u64 = DrvAudioHlpBytesToMilli(&s_Cfg441StereoS16, 44100 * 2 * 2)) == RT_MS_1SEC,
                       ("ms=%RU64\n", u64));
-
 
     RTTESTI_CHECK_MSG((u64 = DrvAudioHlpFramesToNano(&s_Cfg441StereoS16, 44100)) == RT_NS_1SEC, ("ns=%RU64\n", u64));
@@ -73 +105 @@
     RTTESTI_CHECK_MSG((u64 = DrvAudioHlpFramesToMilli(&s_Cfg441StereoS16,   255)) == 5,          ("ms=%RU64\n", u64));
 
+    /* DrvAudioHlpClearBuf: */
+    uint8_t *pbPage;
+    int rc = RTTestGuardedAlloc(hTest, PAGE_SIZE, 0, false /*fHead*/, (void **)&pbPage);
+    RTTESTI_CHECK_RC_OK_RETV(rc);
+
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoS16, pbPage, PAGE_SIZE, PAGE_SIZE / 4);
+    RTTESTI_CHECK(ASMMemIsZero(pbPage, PAGE_SIZE));
+
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoU16, pbPage, PAGE_SIZE, PAGE_SIZE / 4);
+    for (uint32_t off = 0; off < PAGE_SIZE; off += 2)
+        RTTESTI_CHECK_MSG(pbPage[off] == 0x80 && pbPage[off + 1] == 0, ("off=%#x: %#x %x\n", off, pbPage[off], pbPage[off + 1]));
+
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoU32, pbPage, PAGE_SIZE, PAGE_SIZE / 8);
+    for (uint32_t off = 0; off < PAGE_SIZE; off += 4)
+        RTTESTI_CHECK(pbPage[off] == 0x80 && pbPage[off + 1] == 0 && pbPage[off + 2] == 0 && pbPage[off + 3] == 0);
+
+
+    RTTestDisableAssertions(hTest);
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoS16, pbPage, PAGE_SIZE, PAGE_SIZE); /* should adjust down the frame count. */
+    RTTESTI_CHECK(ASMMemIsZero(pbPage, PAGE_SIZE));
+
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoU16, pbPage, PAGE_SIZE, PAGE_SIZE); /* should adjust down the frame count. */
+    for (uint32_t off = 0; off < PAGE_SIZE; off += 2)
+        RTTESTI_CHECK_MSG(pbPage[off] == 0x80 && pbPage[off + 1] == 0, ("off=%#x: %#x %x\n", off, pbPage[off], pbPage[off + 1]));
+
+    memset(pbPage, 0x42, PAGE_SIZE);
+    DrvAudioHlpClearBuf(&s_Cfg441StereoU32, pbPage, PAGE_SIZE, PAGE_SIZE); /* should adjust down the frame count. */
+    for (uint32_t off = 0; off < PAGE_SIZE; off += 4)
+        RTTESTI_CHECK(pbPage[off] == 0x80 && pbPage[off + 1] == 0 && pbPage[off + 2] == 0 && pbPage[off + 3] == 0);
+    RTTestRestoreAssertions(hTest);
+
+    RTTestGuardedFree(hTest, pbPage);
 }