Changeset 87990 in vbox for trunk/src/VBox/Devices/Audio/testcase

Timestamp:

Mar 7, 2021 2:29:40 PM (4 years ago)

Author:

vboxsync

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

143113

Message:

Audio: Fixed broken DrvAudioHlpBytesToNano and DrvAudioHlpBytesToMicro implementation (overflow), the latter is the only one used. Also fixed silly confusion about 'const' and pointers (you want what they point to to be const, not the pointers themselves. duh) bugref:9890

File:

• trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp (modified) (6 diffs)

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

@@ -33 +33 @@
 
 
-/*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
+static void tstBasics(RTTEST hTest)
+{
+    RTTestSubF(hTest, "Single buffer");
+
+    static const PDMAUDIOPCMPROPS s_Cfg441StereoS16 = PDMAUDIOPCMPROPS_INITIALIZOR(
+        /* a_cb: */             2,
+        /* a_fSigned: */        true,
+        /* a_cChannels: */      2,
+        /* a_uHz: */            44100,
+        /* a_cShift: */         PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(2 /* 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)));
+
+    uint32_t u32;
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(44100, &s_Cfg441StereoS16)) == 44100 * 2 * 2,
+                      ("cb=%RU32\n", u32));
+    RTTESTI_CHECK_MSG((u32 = DrvAudioHlpFramesToBytes(2, &s_Cfg441StereoS16)) == 2 * 2 * 2,
+                      ("cb=%RU32\n", u32));
+
+    uint64_t u64;
+    RTTESTI_CHECK_MSG((u64 = DrvAudioHlpBytesToNano(&s_Cfg441StereoS16, 44100 * 2 * 2)) == RT_NS_1SEC,
+                      ("ns=%RU64\n", u64));
+    RTTESTI_CHECK_MSG((u64 = DrvAudioHlpBytesToMicro(&s_Cfg441StereoS16, 44100 * 2 * 2)) == RT_US_1SEC,
+                      ("us=%RU64\n", u64));
+    RTTESTI_CHECK_MSG((u64 = DrvAudioHlpBytesToMilli(44100 * 2 * 2, &s_Cfg441StereoS16)) == RT_MS_1SEC,
+                      ("ms=%RU64\n", u64));
+
+
+
+}
+
 
 static int tstSingle(RTTEST hTest)
 {
-    RTTestSubF(hTest, "Single buffer");
+    RTTestSub(hTest, "Single buffer");
 
     /* 44100Hz, 2 Channels, S16 */
@@ -232 +263 @@
      * Using AudioMixBufWriteAt for writing to children.
      */
-    RTTestSubF(hTest, "2 Children -> Parent (AudioMixBufWriteAt)");
+    RTTestSub(hTest, "2 Children -> Parent (AudioMixBufWriteAt)");
 
     uint32_t cChildrenSamplesMixedTotal = 0;
@@ -308 +339 @@
     uint32_t         cBufSize = 256;
 
-    RTTestSubF(hTest, "Sample conversion (U8)");
+    RTTestSub(hTest, "Sample conversion (U8)");
 
     /* 44100Hz, 1 Channel, U8 */
@@ -413 +444 @@
     uint32_t         cBufSize = 256;
 
-    RTTestSubF(hTest, "Sample conversion (S16)");
+    RTTestSub(hTest, "Sample conversion (S16)");
 
     /* 44100Hz, 1 Channel, S16 */
@@ -509 +540 @@
     uint32_t         cBufSize = 256;
 
-    RTTestSubF(hTest, "Volume control");
+    RTTestSub(hTest, "Volume control");
 
     /* Same for parent/child. */
@@ -635 +666 @@
     RTTestBanner(hTest);
 
-    rc = tstSingle(hTest);
-    if (RT_SUCCESS(rc))
-        rc = tstParentChild(hTest);
-    if (RT_SUCCESS(rc))
-        rc = tstConversion8(hTest);
-    if (RT_SUCCESS(rc))
-        rc = tstConversion16(hTest);
-    if (RT_SUCCESS(rc))
-        rc = tstVolume(hTest);
+    tstBasics(hTest);
+    tstSingle(hTest);
+    tstParentChild(hTest);
+    tstConversion8(hTest);
+    tstConversion16(hTest);
+    tstVolume(hTest);
 
     /*