Changeset 91413 in vbox for trunk/src/VBox

Timestamp:

Sep 27, 2021 5:04:53 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Added "--tone-duration <ms>" option to specify test tone fixed durations being recorded / played back. ​bugref:10008

Location:

trunk/src/VBox/ValidationKit

Files:

• tests/audio/tdAudioTest.py (modified) (2 diffs)
• utils/audio/vkat.cpp (modified) (6 diffs)
• utils/audio/vkatInternal.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

@@ -114 +114 @@
         reporter.log('  --audio-test-count <number>');
         reporter.log('      Default: 0 (means random)');
+        reporter.log('  --audio-test-tone-duration <ms>');
+        reporter.log('      Default: 0 (means random)');
         reporter.log('  --audio-verify-max-diff-count <number>');
         reporter.log('      Default: 0 (strict)');
@@ -142 +144 @@
                         raise base.InvalidOption('The "--audio-tests" value "%s" is not valid; valid values are: %s'
                                                     % (s, ' '.join(self.asTestsDef)));
-        elif    asArgs[iArg] == '--audio-test-count':
+        elif    asArgs[iArg] == 'audio-test-count' \
+             or asArgs[iArg] == 'audio-test-tone-duration':
             # Strip the "--audio-test-" prefix and keep the options as defined in VKAT,
             # e.g. "--audio-test-count" -> "--count". That way we don't

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

@@ -119 +119 @@
     VKAT_TEST_OPT_COUNT = 900,
     VKAT_TEST_OPT_DEV,
+    VKAT_TEST_OPT_TONE_DURATION_MS,
     VKAT_TEST_OPT_GUEST_ATS_ADDR,
     VKAT_TEST_OPT_GUEST_ATS_PORT,
@@ -195 +196 @@
     { "--tcp-bind-port",     VKAT_TEST_OPT_TCP_BIND_PORT,       RTGETOPT_REQ_UINT16  },
     { "--tcp-connect-addr",  VKAT_TEST_OPT_TCP_CONNECT_ADDRESS, RTGETOPT_REQ_STRING  },
-    { "--tcp-connect-port",  VKAT_TEST_OPT_TCP_CONNECT_PORT,    RTGETOPT_REQ_UINT16  }
+    { "--tcp-connect-port",  VKAT_TEST_OPT_TCP_CONNECT_PORT,    RTGETOPT_REQ_UINT16  },
+    { "--tone-duration",     VKAT_TEST_OPT_TONE_DURATION_MS,    RTGETOPT_REQ_UINT32  }
 };
 
@@ -280 +282 @@
     pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
     pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
-    pToneParms->msDuration     = RTRandU32Ex(200, RT_MS_30SEC); /** @todo Probably a bit too long, but let's see. */
+    pToneParms->msDuration     = pTstEnv->cMsToneDuration == 0 ? RTRandU32Ex(200, RT_MS_30SEC) : pTstEnv->cMsToneDuration;
     pToneParms->msSequel       = 0;   /** @todo Implement analyzing this first! */
     pToneParms->uVolumePercent = 100; /** @todo Implement analyzing this first! */
@@ -387 +389 @@
     pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
     pToneParms->Props          = pTstParmsAcq->Props;
-    pToneParms->msDuration     = RTRandU32Ex(200 /* ms */, RT_MS_30SEC); /** @todo Record even longer? */
+    pToneParms->msDuration     = pTstEnv->cMsToneDuration == 0 ? RTRandU32Ex(200, RT_MS_30SEC) : pTstEnv->cMsToneDuration;
     pToneParms->msSequel       = 0;   /** @todo Implement analyzing this first! */
     pToneParms->uVolumePercent = 100; /** @todo Implement analyzing this first! */
@@ -710 +712 @@
         case VKAT_TEST_OPT_DEV:                 return "Name of the input/output device to use\n"
                                                        "    Default: default device";
+        case VKAT_TEST_OPT_TONE_DURATION_MS:    return "Duration (in ms) of test tone to play / record for selected tests\n"
+                                                       "    Default: random number";
         case VKAT_TEST_OPT_GUEST_ATS_ADDR:      return "Address of guest ATS to connect to\n"
                                                        "    Default: " ATS_TCP_DEF_CONNECT_GUEST_STR;
@@ -840 +844 @@
                 break;
 
+            case VKAT_TEST_OPT_TONE_DURATION_MS:
+                TstEnv.cMsToneDuration = ValueUnion.u32;
+                break;
+
             case VKAT_TEST_OPT_PAUSE:
                 return RTMsgErrorExitFailure("Not yet implemented!");

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -236 +236 @@
      *  When set to 0 (default), a random value (see specific test) will be chosen. */
     uint32_t                cIterations;
+    /** Duration (in ms) to play / record test tone.
+     *  When set to 0 (default), a random value (see specific test) will be chosen. */
+    uint32_t                cMsToneDuration;
     /** Output path for storing the test environment's final test files. */
     char                    szTag[AUDIOTEST_TAG_MAX];