Changeset 89308 in vbox

Timestamp:

May 27, 2021 9:36:18 AM (4 years ago)

Author:

vboxsync

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

144655

Message:

Audio/ValKit: Various small bugfixes for writing the test manifest file. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTest.cpp (modified) (8 diffs)
• Devices/Audio/AudioTest.h (modified) (3 diffs)
• Devices/Audio/AudioTestServiceProtocol.h (modified) (1 diff)
• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (1 diff)
• ValidationKit/utils/audio/vkat.cpp (modified) (6 diffs)

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

@@ -88 +88 @@
  * Returns a random test tone frequency.
  */
-DECLINLINE(double) audioTestGetRandomFreq(void)
+DECLINLINE(double) audioTestToneGetRandomFreq(void)
 {
     return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
@@ -105 +105 @@
 {
     if (dbFreq == 0.0)
-        dbFreq = audioTestGetRandomFreq();
-
-    /* Pick a frequency from our selection, so that every time a recording starts
-     * we'll hopfully generate a different note. */
+        dbFreq = audioTestToneGetRandomFreq();
+
     pTone->rdFreqHz = dbFreq;
     pTone->rdFixed  = 2.0 * M_PI * pTone->rdFreqHz / PDMAudioPropsHz(pProps);
@@ -262 +260 @@
     /** @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
@@ -335 +334 @@
     AssertRCReturn(rc, rc);
 
+#ifndef DEBUG /* Makes debugging easier to have a deterministic directory. */
     char szTime[64];
     RTTIMESPEC time;
@@ -347 +347 @@
     rc = RTPathAppend(pszPath, cbPath, szTime);
     AssertRCReturn(rc, rc);
+#endif
 
     return RTDirCreateFullPath(pszPath, RTFS_UNIX_IRWXU);
@@ -431 +432 @@
 
     /** @todo Keep it as simple as possible for now. Improve this later. */
-    int rc = audioTestManifestWrite(pSet, "[%N]", pszSection, &va);
+    int rc = audioTestManifestWrite(pSet, "[%N]\n", pszSection, &va);
 
     va_end(va);
@@ -968 +969 @@
     rc = audioTestManifestWrite(pSet, "test_type=%RU32\n", pParms->enmType);
     AssertRCReturn(rc, rc);
-    rc = audioTestManifestWrite(pSet, "test_iterations=%RU32\n", pParms->cIterations);
-    AssertRCReturn(rc, rc);
     rc = audioTestManifestWrite(pSet, "test_delay_ms=%RU32\n", pParms->msDelay);
     AssertRCReturn(rc, rc);
@@ -977 +976 @@
     switch (pParms->enmType)
     {
-        case AUDIOTESTTYPE_TESTTONE:
+        case AUDIOTESTTYPE_TESTTONE_PLAY:
+            RT_FALL_THROUGH();
+        case AUDIOTESTTYPE_TESTTONE_RECORD:
         {
+            rc = audioTestManifestWrite(pSet, "tone_freq_hz=%RU16\n", (uint16_t)pParms->TestTone.dbFreqHz);
+            AssertRCReturn(rc, rc);
             rc = audioTestManifestWrite(pSet, "tone_prequel_ms=%RU32\n", pParms->TestTone.msPrequel);
             AssertRCReturn(rc, rc);

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

@@ -80 +80 @@
     /** Tone frequency (in Hz) to use.
      *  Will be later converted to a double value. */
-    uint16_t         uFreq;
+    double           dbFreqHz;
     /** Prequel (in ms) to play silence. Optional and can be set to 0. */
     RTMSINTERVAL     msPrequel;
@@ -117 +117 @@
     AUDIOTESTTYPE_INVALID = 0,
     /** Play a test tone. */
-    AUDIOTESTTYPE_TESTTONE,
+    AUDIOTESTTYPE_TESTTONE_PLAY,
+    /** Record a test tone. */
+    AUDIOTESTTYPE_TESTTONE_RECORD,
         /** The usual 32-bit hack. */
     AUDIOTESTTYPE_32BIT_HACK = 0x7fffffff
@@ -131 +133 @@
     /** How many iterations the test should be executed. */
     uint32_t                cIterations;
+    /** PCM audio stream properties to use. */
+    PDMAUDIOPCMPROPS        Props;
     /** Audio device to use. */
     PDMAUDIOHOSTDEV         Dev;

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

@@ -135 +135 @@
     /** Test tone parameters for playback. */
     AUDIOTESTTONEPARMS ToneParms;
-    uint8_t            aPadding[12];
+    uint8_t            aPadding[4];
 } ATSPKTREQTONEPLAY;
 AssertCompileSizeAlignment(ATSPKTREQTONEPLAY, ATSPKT_ALIGNMENT);

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

@@ -149 +149 @@
     memcpy(&pTestData->t.TestTone.Parms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 
-    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pStreamCfg->Props, pTestData->t.TestTone.Parms.uFreq);
+    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pStreamCfg->Props, pTestData->t.TestTone.Parms.dbFreqHz);
 
     pTestData->t.TestTone.cbToWrite = PDMAudioPropsMilliToBytes(&pStreamCfg->Props,

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -1681 +1681 @@
 {
     AUDIOTESTTONE TstTone;
-    AudioTestToneInitRandom(&TstTone, &pParms->Props);
+    AudioTestToneInit(&TstTone, &pParms->Props, pParms->dbFreqHz);
 
     const char *pcszPathOut = pTstEnv->Set.szPathAbs;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms)\n", TstTone.rdFreqHz, pParms->msDuration);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms)\n", (uint16_t)pParms->dbFreqHz, pParms->msDuration);
     RTTestPrintf(g_hTest, RTTESTLVL_DEBUG,  "Writing to '%s'\n", pcszPathOut);
 
@@ -1766 +1766 @@
     RT_NOREF(pTstEnv, pTstDesc, ppvCtx);
 
-    pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE;
-
-    PDMAudioPropsInit(&pTstParmsAcq->TestTone.Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
+    pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_PLAY;
+
+    PDMAudioPropsInit(&pTstParmsAcq->Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
 
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
@@ -1793 +1793 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
+        AudioTestToneParamsInitRandom(&pTstParms->TestTone, &pTstParms->Props);
+
         PAUDIOTESTENTRY pTst;
         rc = AudioTestSetTestBegin(&pTstEnv->Set, "Playing test tone", pTstParms, &pTst);
         if (RT_SUCCESS(rc))
         {
-            AudioTestToneParamsInitRandom(&pTstParms->TestTone, &pTstParms->TestTone.Props);
             rc = audioTestCreateStreamDefaultOut(pTstEnv, pStream, &pTstParms->TestTone.Props);
             if (RT_SUCCESS(rc))
@@ -1840 +1841 @@
     RT_NOREF(pTstEnv, pTstDesc, ppvCtx);
 
-    pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE;
-
+    pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_RECORD;
+
+    RT_ZERO(pTstParmsAcq->TestTone);
     PDMAudioPropsInit(&pTstParmsAcq->TestTone.Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
 
@@ -1864 +1866 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
+        pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, RT_MS_10SEC); /** @todo Record even longer? */
+
         PAUDIOTESTENTRY pTst;
         rc = AudioTestSetTestBegin(&pTstEnv->Set, "Recording test tone", pTstParms, &pTst);
@@ -1871 +1875 @@
             rc = audioTestCreateStreamDefaultIn(pTstEnv, pStream, &pTstParms->TestTone.Props);
             if (RT_SUCCESS(rc))
-            {
-                pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, RT_MS_10SEC); /** @todo Record even longer? */
-
                 rc = audioTestRecordTone(pTstEnv, pStream, &pTstParms->TestTone);
-            }
 
             int rc2 = audioTestStreamDestroy(pTstEnv, pStream);