Changeset 89890 in vbox for trunk/src/VBox/Devices/Audio/AudioTest.cpp

Timestamp:

Jun 24, 2021 3:56:05 PM (3 years ago)

Author:

vboxsync

Message:

Audio/ValKit: More code for audio verification. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (5 diffs)

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

@@ -128 +128 @@
 
 /**
- * Returns a random test tone frequency.
- */
-DECLINLINE(double) audioTestToneGetRandomFreq(void)
-{
-    return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
-}
-
-/**
  * Initializes a test tone with a specific frequency (in Hz).
  *
@@ -147 +139 @@
 {
     if (dbFreq == 0.0)
-        dbFreq = audioTestToneGetRandomFreq();
+        dbFreq = AudioTestToneGetRandomFreq();
 
     pTone->rdFreqHz = dbFreq;
@@ -290 +282 @@
 
 /**
- * Initializes an audio test tone parameters struct with random values.
- * @param   pToneParams         Test tone parameters to initialize.
- * @param   pProps              PCM properties to use for the test tone.
- */
-int AudioTestToneParamsInitRandom(PAUDIOTESTTONEPARMS pToneParams, PPDMAUDIOPCMPROPS pProps)
-{
-    AssertReturn(PDMAudioPropsAreValid(pProps), VERR_INVALID_PARAMETER);
-
-    memcpy(&pToneParams->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
-
-    /** @todo Make this a bit more sophisticated later, e.g. muting and prequel/sequel are not very balanced. */
-
-    pToneParams->dbFreqHz       = audioTestToneGetRandomFreq();
-    pToneParams->msPrequel      = RTRandU32Ex(0, RT_MS_5SEC);
-#ifdef DEBUG_andy
-    pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_1SEC);
-#else
-    pToneParams->msDuration     = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
-#endif
-    pToneParams->msSequel       = RTRandU32Ex(0, RT_MS_5SEC);
-    pToneParams->uVolumePercent = RTRandU32Ex(0, 100);
-
-    return VINF_SUCCESS;
+ * Returns a random test tone frequency.
+ */
+double AudioTestToneGetRandomFreq(void)
+{
+    return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
 }
 
@@ -1411 +1385 @@
 
 /**
+ * Returns whether a test set has running (active) tests or not.
+ *
+ * @returns \c true if it has running tests, or \c false if not.
+ * @param   pSet                Test set to return status for.
+ */
+bool AudioTestSetIsRunning(PAUDIOTESTSET pSet)
+{
+    return (pSet->cTestsRunning > 0);
+}
+
+/**
  * Unpacks a formerly packed audio test set.
  *
@@ -1713 +1698 @@
     rc = RTFileQuerySize(pObjB->File.hFile, &cbSizeB);
     AssertRCReturn(rc, rc);
-    if (   cbSizeA != cbSizeB
-        || !audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
+
+    if (!cbSizeA)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjA->szName);
+        AssertRC(rc2);
+    }
+
+    if (!cbSizeB)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is empty\n", pObjB->szName);
+        AssertRC(rc2);
+    }
+
+    if (cbSizeA != cbSizeB)
+    {
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "File '%s' is %zu bytes %s than '%s'\n",
+                                        pObjA->szName,
+                                        cbSizeA > cbSizeB ? cbSizeA - cbSizeB : cbSizeB - cbSizeA,
+                                        cbSizeA > cbSizeB ? "bigger" : "smaller",
+                                        pObjB->szName);
+        AssertRC(rc2);
+    }
+    else if (audioTestFilesCompareBinary(pObjA->File.hFile, pObjB->File.hFile, cbSizeA))
     {
         /** @todo Add more sophisticated stuff here. */
 
-        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' don't match\n", szObjA, szObjB);
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' have different content\n",
+                                        pObjA->szName, pObjB->szName);
         AssertRC(rc2);
     }