Changeset 91632 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Oct 8, 2021 6:59:29 AM (3 years ago)

Author:

vboxsync

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

147357

Message:

Audio/Validation Kit: Factored out general I/O options into AUDIOTESTIOOPTS to also support setting the master volume besides the test tone volume, as function parameter lists already were too big. Also uniformed the command line volume arguments a little ("--vol vs. --volume" everywhere). ​bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (14 diffs)
• vkatCmdGeneric.cpp (modified) (39 diffs)
• vkatCmdSelfTest.cpp (modified) (5 diffs)
• vkatCommon.cpp (modified) (20 diffs)
• vkatInternal.h (modified) (5 diffs)

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

@@ -122 +122 @@
     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,
@@ -142 +141 @@
     VKAT_TEST_OPT_TCP_BIND_PORT,
     VKAT_TEST_OPT_TCP_CONNECT_ADDRESS,
-    VKAT_TEST_OPT_TCP_CONNECT_PORT
+    VKAT_TEST_OPT_TCP_CONNECT_PORT,
+    VKAT_TEST_OPT_TONE_DURATION_MS,
+    VKAT_TEST_OPT_TONE_VOL_PERCENT
 };
 
@@ -195 +196 @@
     { "--tag",               VKAT_TEST_OPT_TAG,                 RTGETOPT_REQ_STRING  },
     { "--tempdir",           VKAT_TEST_OPT_TEMPDIR,             RTGETOPT_REQ_STRING  },
-    { "--volume",            VKAT_TEST_OPT_VOL,                 RTGETOPT_REQ_UINT8   },
+    { "--vol",               VKAT_TEST_OPT_VOL,                 RTGETOPT_REQ_UINT8   },
     { "--tcp-bind-addr",     VKAT_TEST_OPT_TCP_BIND_ADDRESS,    RTGETOPT_REQ_STRING  },
     { "--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  },
-    { "--tone-duration",     VKAT_TEST_OPT_TONE_DURATION_MS,    RTGETOPT_REQ_UINT32  }
+    { "--tone-duration",     VKAT_TEST_OPT_TONE_DURATION_MS,    RTGETOPT_REQ_UINT32  },
+    { "--tone-vol",          VKAT_TEST_OPT_TONE_VOL_PERCENT,    RTGETOPT_REQ_UINT8   }
 };
 
@@ -275 +277 @@
 
     pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_PLAY;
-    pTstParmsAcq->Props       = pTstEnv->Props;
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
     pTstParmsAcq->cIterations = pTstEnv->cIterations == 0 ? RTRandU32Ex(1, 10) : pTstEnv->cIterations;
     pTstParmsAcq->idxCurrent  = 0;
 
-    PAUDIOTESTTONEPARMS pToneParms = &pTstParmsAcq->TestTone;
-
-    pToneParms->Props          = pTstParmsAcq->Props;
-    pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
-    pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
-    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! */
+    pTstParmsAcq->TestTone    = pTstEnv->ToneParms;
 
     return rc;
@@ -381 +375 @@
 
     pTstParmsAcq->enmType     = AUDIOTESTTYPE_TESTTONE_RECORD;
-    pTstParmsAcq->Props       = pTstEnv->Props;
     pTstParmsAcq->enmDir      = PDMAUDIODIR_IN;
     pTstParmsAcq->cIterations = pTstEnv->cIterations == 0 ? RTRandU32Ex(1, 10) : pTstEnv->cIterations;
     pTstParmsAcq->idxCurrent  = 0;
 
-    PAUDIOTESTTONEPARMS pToneParms = &pTstParmsAcq->TestTone;
-
-    pToneParms->Props          = pTstParmsAcq->Props;
-    pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
-    pToneParms->msPrequel      = 0; /** @todo Implement analyzing this first! */
-    pToneParms->Props          = pTstParmsAcq->Props;
-    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! */
+    pTstParmsAcq->TestTone    = pTstEnv->ToneParms;
 
     return rc;
@@ -717 +702 @@
         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_TONE_DURATION_MS:    return "Test tone duration to play / record (ms)\n"
+                                                       "    Default: random duration";
+        case VKAT_TEST_OPT_TONE_VOL_PERCENT:    return "Test tone volume (percent)\n"
+                                                       "    Default: 100";
         case VKAT_TEST_OPT_GUEST_ATS_ADDR:      return "Address of guest ATS to connect to\n"
                                                        "    Default: " ATS_TCP_DEF_CONNECT_GUEST_STR;
@@ -727 +714 @@
         case VKAT_TEST_OPT_HOST_ATS_PORT:       return "Port of host ATS to connect to\n"
                                                        "    Default: 6052"; /* ATS_TCP_DEF_BIND_PORT_VALKIT */
-        case VKAT_TEST_OPT_MODE:                return "Specifies the test mode to use when running the tests";
+        case VKAT_TEST_OPT_MODE:                return "Test mode to use when running the tests";
         case VKAT_TEST_OPT_NO_VERIFY:           return "Skips the verification step";
-        case VKAT_TEST_OPT_OUTDIR:              return "Specifies the output directory to use";
+        case VKAT_TEST_OPT_OUTDIR:              return "Output directory to use";
         case VKAT_TEST_OPT_PAUSE:               return "Not yet implemented";
-        case VKAT_TEST_OPT_PCM_HZ:              return "Specifies the PCM Hetz (Hz) rate to use\n"
+        case VKAT_TEST_OPT_PCM_HZ:              return "PCM Hertz (Hz) rate to use\n"
                                                        "    Default: 44100";
-        case VKAT_TEST_OPT_PCM_BIT:             return "Specifies the PCM sample bits (i.e. 16) to use\n"
+        case VKAT_TEST_OPT_PCM_BIT:             return "PCM sample bits (i.e. 16) to use\n"
                                                        "    Default: 16";
-        case VKAT_TEST_OPT_PCM_CHAN:            return "Specifies the number of PCM channels to use\n"
+        case VKAT_TEST_OPT_PCM_CHAN:            return "PCM channels to use\n"
                                                        "    Default: 2";
-        case VKAT_TEST_OPT_PCM_SIGNED:          return "Specifies whether to use signed (true) or unsigned (false) samples\n"
+        case VKAT_TEST_OPT_PCM_SIGNED:          return "PCM samples to use (signed = true, unsigned = false)\n"
                                                        "    Default: true";
-        case VKAT_TEST_OPT_PROBE_BACKENDS:      return "Specifies whether to probe all (available) backends until a working one is found\n"
+        case VKAT_TEST_OPT_PROBE_BACKENDS:      return "Whether to probe all (available) backends until a working one is found\n"
                                                        "    Default: false";
-        case VKAT_TEST_OPT_TAG:                 return "Specifies the test set tag to use";
-        case VKAT_TEST_OPT_TEMPDIR:             return "Specifies the temporary directory to use";
-        case VKAT_TEST_OPT_VOL:                 return "Specifies the audio volume (in percent, 0-100) to use";
-        case VKAT_TEST_OPT_TCP_BIND_ADDRESS:    return "Specifies the TCP address listening to (server mode)";
-        case VKAT_TEST_OPT_TCP_BIND_PORT:       return "Specifies the TCP port listening to (server mode)";
-        case VKAT_TEST_OPT_TCP_CONNECT_ADDRESS: return "Specifies the TCP address to connect to (client mode)";
-        case VKAT_TEST_OPT_TCP_CONNECT_PORT:    return "Specifies the TCP port to connect to (client mode)";
+        case VKAT_TEST_OPT_TAG:                 return "Test set tag to use";
+        case VKAT_TEST_OPT_TEMPDIR:             return "Temporary directory to use";
+        case VKAT_TEST_OPT_VOL:                 return "Audio volume (percent) to use";
+        case VKAT_TEST_OPT_TCP_BIND_ADDRESS:    return "TCP address listening to (server mode)";
+        case VKAT_TEST_OPT_TCP_BIND_PORT:       return "TCP port listening to (server mode)";
+        case VKAT_TEST_OPT_TCP_CONNECT_ADDRESS: return "TCP address to connect to (client mode)";
+        case VKAT_TEST_OPT_TCP_CONNECT_PORT:    return "TCP port to connect to (client mode)";
         default:
             break;
@@ -763 +750 @@
 {
     AUDIOTESTENV TstEnv;
-    RT_ZERO(TstEnv);
+    audioTestEnvInit(&TstEnv);
 
     int         rc;
 
-    PCPDMDRVREG pDrvReg       = AudioTestGetDefaultBackend();
-    bool        fWithDrvAudio = false;
-    uint8_t     cPcmSampleBit = 0;
-    uint8_t     cPcmChannels  = 0;
-    uint32_t    uPcmHz        = 0;
-    bool        fPcmSigned    = true;
+    PCPDMDRVREG pDrvReg        = AudioTestGetDefaultBackend();
+    uint8_t     cPcmSampleBit  = 0;
+    uint8_t     cPcmChannels   = 0;
+    uint32_t    uPcmHz         = 0;
+    bool        fPcmSigned     = true;
     bool        fProbeBackends = false;
 
@@ -798 +784 @@
 
             case 'd':
-                fWithDrvAudio = true;
+                TstEnv.IoOpts.fWithDrvAudio = true;
                 break;
 
@@ -850 +836 @@
 
             case VKAT_TEST_OPT_TONE_DURATION_MS:
-                TstEnv.cMsToneDuration = ValueUnion.u32;
+                TstEnv.ToneParms.msDuration = ValueUnion.u32;
+                break;
+
+            case VKAT_TEST_OPT_TONE_VOL_PERCENT:
+                TstEnv.ToneParms.uVolumePercent = ValueUnion.u8;
                 break;
 
@@ -895 +885 @@
 
             case VKAT_TEST_OPT_VOL:
-                TstEnv.uVolumePercent = ValueUnion.u8;
+                TstEnv.IoOpts.uVolumePercent = ValueUnion.u8;
                 break;
 
@@ -930 +920 @@
     RTTestBanner(g_hTest);
 
-    /* Initialize the custom test parameters with sensible defaults if nothing else is given. */
-    PDMAudioPropsInit(&TstEnv.Props,
-                      cPcmSampleBit ? cPcmSampleBit / 8 : 2 /* 16-bit */, fPcmSigned, cPcmChannels ? cPcmChannels : 2,
-                      uPcmHz ? uPcmHz : 44100);
-
     if (TstEnv.enmMode == AUDIOTESTMODE_UNKNOWN)
         return RTMsgErrorExit(RTEXITCODE_SYNTAX, "No test mode (--mode) specified!\n");
@@ -943 +928 @@
         return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Only one TCP connection mode (connect as client *or* bind as server) can be specified) at a time!\n");
 
+    /* Set new (override standard) I/O PCM properties if set by the user. */
+    if (   cPcmSampleBit
+        || cPcmChannels
+        || uPcmHz)
+    {
+        PDMAudioPropsInit(&TstEnv.IoOpts.Props,
+                          cPcmSampleBit ? cPcmSampleBit / 2 : 2 /* 16-bit */, fPcmSigned /* fSigned */,
+                          cPcmChannels  ? cPcmChannels      : 2 /* Stereo */, uPcmHz ? uPcmHz : 44100);
+    }
+
     AUDIOTESTDRVSTACK DrvStack;
     if (fProbeBackends)
         rc = audioTestDriverStackProbe(&DrvStack, pDrvReg,
-                                       true /* fEnabledIn */, true /* fEnabledOut */, fWithDrvAudio); /** @todo Make in/out configurable, too. */
+                                       true /* fEnabledIn */, true /* fEnabledOut */, TstEnv.IoOpts.fWithDrvAudio); /** @todo Make in/out configurable, too. */
     else
         rc = audioTestDriverStackInitEx(&DrvStack, pDrvReg,
-                                        true /* fEnabledIn */, true /* fEnabledOut */, fWithDrvAudio); /** @todo Make in/out configurable, too. */
+                                        true /* fEnabledIn */, true /* fEnabledOut */, TstEnv.IoOpts.fWithDrvAudio); /** @todo Make in/out configurable, too. */
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unable to init driver stack: %Rrc\n", rc);
@@ -959 +954 @@
 
     /* For now all tests have the same test environment and driver stack. */
-    rc = audioTestEnvInit(&TstEnv, &DrvStack);
+    rc = audioTestEnvCreate(&TstEnv, &DrvStack);
     if (RT_SUCCESS(rc))
         rc = audioTestWorker(&TstEnv);

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

@@ -67 +67 @@
     {
         case 'b':                               return "The audio backend to use.";
-        case VKAT_ENUM_OPT_PROBE_BACKENDS:      return "Specifies whether to probe all (available) backends until a working one is found\n"
+        case VKAT_ENUM_OPT_PROBE_BACKENDS:      return "Whether to probe all (available) backends until a working one is found\n"
                                                        "    Default: false";
         default:  return NULL;
@@ -191 +191 @@
 *   Command: play                                                                                                                *
 *********************************************************************************************************************************/
-
-/**
- * Structure holding additional playback options.
- */
-typedef struct AUDIOTESTPLAYOPTS
-{
-    /** Whether to use the audio connector or not. */
-    bool             fWithDrvAudio;
-    /** Whether to use a mixing buffer or not. */
-    bool             fWithMixer;
-    /** Buffer size (in ms). */
-    uint32_t         cMsBufferSize;
-    /** Pre-buffering size (in ms). */
-    uint32_t         cMsPreBuffer;
-    /** Scheduling (in ms). */
-    uint32_t         cMsSchedulingHint;
-    /** Audio vlume to use (in percent). */
-    uint8_t          uVolumePercent;
-    /** PCM audio properties to use. */
-    PDMAUDIOPCMPROPS Props;
-} AUDIOTESTPLAYOPTS;
-/** Pointer to additional playback options. */
-typedef AUDIOTESTPLAYOPTS *PAUDIOTESTPLAYOPTS;
 
 /**
@@ -304 +281 @@
  */
 static RTEXITCODE audioTestPlayOne(const char *pszFile, PCPDMDRVREG pDrvReg, const char *pszDevId,
-                                   PAUDIOTESTPLAYOPTS pOpts)
+                                   PAUDIOTESTIOOPTS pIoOpts)
 {
     char szTmp[128];
@@ -332 +309 @@
     RTEXITCODE          rcExit = RTEXITCODE_FAILURE;
     AUDIOTESTDRVSTACK   DrvStack;
-    rc = audioTestDriverStackInit(&DrvStack, pDrvReg, pOpts->fWithDrvAudio);
+    rc = audioTestDriverStackInit(&DrvStack, pDrvReg, pIoOpts->fWithDrvAudio);
     if (RT_SUCCESS(rc))
     {
@@ -344 +321 @@
              * Open a stream for the output.
              */
-            uint8_t const cChannels = PDMAudioPropsChannels(&pOpts->Props);
+            uint8_t const cChannels = PDMAudioPropsChannels(&pIoOpts->Props);
 
             PDMAUDIOPCMPROPS ReqProps = WaveFile.Props;
@@ -350 +327 @@
                 PDMAudioPropsSetChannels(&ReqProps, cChannels);
 
-            uint8_t const cbSample = PDMAudioPropsSampleSize(&pOpts->Props);
+            uint8_t const cbSample = PDMAudioPropsSampleSize(&pIoOpts->Props);
             if (cbSample != 0)
                 PDMAudioPropsSetSampleSize(&ReqProps, cbSample);
 
-            uint32_t const uHz = PDMAudioPropsHz(&pOpts->Props);
+            uint32_t const uHz = PDMAudioPropsHz(&pIoOpts->Props);
             if (uHz != 0)
                 ReqProps.uHz = uHz;
@@ -360 +337 @@
             PDMAUDIOSTREAMCFG CfgAcq;
             PPDMAUDIOSTREAM   pStream  = NULL;
-            rc = audioTestDriverStackStreamCreateOutput(&DrvStack, &ReqProps, pOpts->cMsBufferSize,
-                                                        pOpts->cMsPreBuffer, pOpts->cMsSchedulingHint, &pStream, &CfgAcq);
+            rc = audioTestDriverStackStreamCreateOutput(&DrvStack, &ReqProps, pIoOpts->cMsBufferSize,
+                                                        pIoOpts->cMsPreBuffer, pIoOpts->cMsSchedulingHint, &pStream, &CfgAcq);
             if (RT_SUCCESS(rc))
             {
@@ -368 +345 @@
                  * output parameters doesn't match.
                  */
-                if (   !pOpts->fWithMixer
+                if (   !pIoOpts->fWithMixer
                     && (   !PDMAudioPropsAreEqual(&WaveFile.Props, &pStream->Cfg.Props)
-                        || pOpts->uVolumePercent != 100)
+                        || pIoOpts->uVolumePercent != 100)
                    )
                 {
                     RTMsgInfo("Enabling the mixer buffer.\n");
-                    pOpts->fWithMixer = true;
+                    pIoOpts->fWithMixer = true;
                 }
 
@@ -382 +359 @@
                  */
                 AUDIOTESTDRVMIXSTREAM Mix;
-                rc = AudioTestMixStreamInit(&Mix, &DrvStack, pStream, pOpts->fWithMixer ? &WaveFile.Props : NULL, 100 /*ms*/);
+                rc = AudioTestMixStreamInit(&Mix, &DrvStack, pStream, pIoOpts->fWithMixer ? &WaveFile.Props : NULL, 100 /*ms*/);
                 if (RT_SUCCESS(rc))
                 {
@@ -388 +365 @@
                         RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n",
                                   PDMAudioPropsToString(&pStream->Cfg.Props, szTmp, sizeof(szTmp)),
-                                  pStream->cbBackend, pOpts->fWithMixer ? " mixed" : "");
-
-                    if (pOpts->fWithMixer)
-                        AudioTestMixStreamSetVolume(&Mix, pOpts->uVolumePercent);
+                                  pStream->cbBackend, pIoOpts->fWithMixer ? " mixed" : "");
+
+                    if (pIoOpts->fWithMixer)
+                        AudioTestMixStreamSetVolume(&Mix, pIoOpts->uVolumePercent);
 
                     /*
@@ -427 +404 @@
 static RTEXITCODE audioTestPlayTestToneOne(PAUDIOTESTTONEPARMS pToneParms,
                                            PCPDMDRVREG pDrvReg, const char *pszDevId,
-                                           PAUDIOTESTPLAYOPTS pOpts)
+                                           PAUDIOTESTIOOPTS pIoOpts)
 {
     char szTmp[128];
@@ -439 +416 @@
     RTEXITCODE          rcExit = RTEXITCODE_FAILURE;
     AUDIOTESTDRVSTACK   DrvStack;
-    int rc = audioTestDriverStackInit(&DrvStack, pDrvReg, pOpts->fWithDrvAudio);
+    int rc = audioTestDriverStackInit(&DrvStack, pDrvReg, pIoOpts->fWithDrvAudio);
     if (RT_SUCCESS(rc))
     {
@@ -451 +428 @@
              * Open a stream for the output.
              */
-            uint8_t const cChannels = PDMAudioPropsChannels(&pOpts->Props);
+            uint8_t const cChannels = PDMAudioPropsChannels(&pIoOpts->Props);
 
             PDMAUDIOPCMPROPS ReqProps = pToneParms->Props;
@@ -457 +434 @@
                 PDMAudioPropsSetChannels(&ReqProps, cChannels);
 
-            uint8_t const cbSample = PDMAudioPropsSampleSize(&pOpts->Props);
+            uint8_t const cbSample = PDMAudioPropsSampleSize(&pIoOpts->Props);
             if (cbSample != 0)
                 PDMAudioPropsSetSampleSize(&ReqProps, cbSample);
 
-            uint32_t const uHz = PDMAudioPropsHz(&pOpts->Props);
+            uint32_t const uHz = PDMAudioPropsHz(&pIoOpts->Props);
             if (uHz != 0)
                 ReqProps.uHz = uHz;
 
-            rc = audioTestDriverStackStreamCreateOutput(&DrvStack, &ReqProps, pOpts->cMsBufferSize,
-                                                        pOpts->cMsPreBuffer, pOpts->cMsSchedulingHint, &TstStream.pStream, &TstStream.Cfg);
+            rc = audioTestDriverStackStreamCreateOutput(&DrvStack, &ReqProps, pIoOpts->cMsBufferSize,
+                                                        pIoOpts->cMsPreBuffer, pIoOpts->cMsSchedulingHint, &TstStream.pStream, &TstStream.Cfg);
             if (RT_SUCCESS(rc))
             {
@@ -473 +450 @@
                  * output parameters doesn't match.
                  */
-                if (   !pOpts->fWithMixer
+                if (   !pIoOpts->fWithMixer
                     && (   !PDMAudioPropsAreEqual(&pToneParms->Props, &TstStream.pStream->Cfg.Props)
                         || pToneParms->uVolumePercent != 100)
@@ -479 +456 @@
                 {
                     RTMsgInfo("Enabling the mixer buffer.\n");
-                    pOpts->fWithMixer = true;
+                    pIoOpts->fWithMixer = true;
                 }
 
@@ -487 +464 @@
                  */
                 rc = AudioTestMixStreamInit(&TstStream.Mix, &DrvStack, TstStream.pStream,
-                                            pOpts->fWithMixer ? &pToneParms->Props : NULL, 100 /*ms*/);
+                                            pIoOpts->fWithMixer ? &pToneParms->Props : NULL, 100 /*ms*/);
                 if (RT_SUCCESS(rc))
                 {
@@ -493 +470 @@
                         RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n",
                                   PDMAudioPropsToString(&TstStream.pStream->Cfg.Props, szTmp, sizeof(szTmp)),
-                                  TstStream.pStream->cbBackend, pOpts->fWithMixer ? " mixed" : "");
+                                  TstStream.pStream->cbBackend, pIoOpts->fWithMixer ? " mixed" : "");
 
                     /*
@@ -501 +478 @@
                     if (RT_SUCCESS(rc))
                     {
-                        if (pOpts->fWithMixer)
+                        if (pIoOpts->fWithMixer)
                             AudioTestMixStreamSetVolume(&TstStream.Mix, pToneParms->uVolumePercent);
 
-                        rc = audioTestPlayTone(NULL /* pTstEnv */, &TstStream, pToneParms);
+                        rc = audioTestPlayTone(pIoOpts, NULL /* pTstEnv */, &TstStream, pToneParms);
                         if (RT_SUCCESS(rc))
                             rcExit = RTEXITCODE_SUCCESS;
@@ -538 +515 @@
     VKAT_PLAY_OPT_TONE_DUR = 900,
     VKAT_PLAY_OPT_TONE_FREQ,
+    VKAT_PLAY_OPT_TONE_VOL,
     VKAT_PLAY_OPT_VOL
 };
@@ -555 +533 @@
     { "--tone-dur",         VKAT_PLAY_OPT_TONE_DUR,       RTGETOPT_REQ_UINT32 },
     { "--tone-freq",        VKAT_PLAY_OPT_TONE_FREQ,      RTGETOPT_REQ_UINT32 },
+    { "--tone-vol",         VKAT_PLAY_OPT_TONE_VOL,       RTGETOPT_REQ_UINT32 },
     { "--output-device",    'o',                          RTGETOPT_REQ_STRING  },
     { "--with-drv-audio",   'd',                          RTGETOPT_REQ_NOTHING },
@@ -577 +556 @@
         case VKAT_PLAY_OPT_TONE_DUR:    return "Test tone duration (ms)";
         case VKAT_PLAY_OPT_TONE_FREQ:   return "Test tone frequency (Hz)";
-        case VKAT_PLAY_OPT_VOL:         return "Volume (in percent, 0-100) to use";
+        case VKAT_PLAY_OPT_TONE_VOL:    return "Test tone volume (percent)";
+        case VKAT_PLAY_OPT_VOL:         return "Playback volume (percent)";
         default:                        return NULL;
     }
@@ -599 +579 @@
     uint32_t    uHz                 = 0;
 
-    AUDIOTESTPLAYOPTS PlayOpts;
-    RT_ZERO(PlayOpts);
-
-    PlayOpts.uVolumePercent = 100; /* Use maximum volume by default. */
+    AUDIOTESTIOOPTS IoOpts;
+    audioTestIoOptsInitDefaults(&IoOpts);
 
     AUDIOTESTTONEPARMS ToneParms;
-    RT_ZERO(ToneParms);
-
-    ToneParms.dbFreqHz   = AudioTestToneGetRandomFreq();
-    ToneParms.msDuration = RTRandU32Ex(0, RT_MS_10SEC); /** @todo Probably a bit too long, but let's see. */
+    audioTestToneParmsInit(&ToneParms);
 
     /* Argument processing loop: */
@@ -628 +603 @@
 
             case 'd':
-                PlayOpts.fWithDrvAudio = true;
+                IoOpts.fWithDrvAudio = true;
                 break;
 
@@ -636 +611 @@
 
             case 'm':
-                PlayOpts.fWithMixer = true;
+                IoOpts.fWithMixer = true;
                 break;
 
@@ -659 +634 @@
                 break;
 
+            case VKAT_PLAY_OPT_TONE_VOL:
+                ToneParms.uVolumePercent = ValueUnion.u8;
+                if (ToneParms.uVolumePercent > 100)
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid tonevolume (0-100)");
+                break;
+
             case VKAT_PLAY_OPT_VOL:
-                PlayOpts.uVolumePercent = ValueUnion.u8;
-                if (PlayOpts.uVolumePercent > 100)
-                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid volume (0-100)");
+                IoOpts.uVolumePercent = ValueUnion.u8;
+                if (IoOpts.uVolumePercent > 100)
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid playback volume (0-100)");
                 break;
 
@@ -670 +651 @@
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Playing test tones (-t) cannot be combined with playing files");
 
-                /* Use some sane defaults if no PCM props are set by the user. */
-                PDMAudioPropsInit(&PlayOpts.Props,
+                /* Set new (override standard) I/O PCM properties if set by the user. */
+                PDMAudioPropsInit(&IoOpts.Props,
                                   cbSample  ? cbSample  : 2 /* 16-bit */, true /* fSigned */,
                                   cChannels ? cChannels : 2 /* Stereo */, uHz ? uHz : 44100);
 
-                RTEXITCODE rcExit = audioTestPlayOne(ValueUnion.psz, pDrvReg, pszDevId, &PlayOpts);
+                RTEXITCODE rcExit = audioTestPlayOne(ValueUnion.psz, pDrvReg, pszDevId, &IoOpts);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -695 +676 @@
                           cChannels ? cChannels : 2 /* Stereo */, uHz ? uHz : 44100);
 
-        ToneParms.uVolumePercent = PlayOpts.uVolumePercent;
-
-        RTEXITCODE rcExit = audioTestPlayTestToneOne(&ToneParms, pDrvReg, pszDevId, &PlayOpts);
+        RTEXITCODE rcExit = audioTestPlayTestToneOne(&ToneParms, pDrvReg, pszDevId, &IoOpts);
         if (rcExit != RTEXITCODE_SUCCESS)
             return rcExit;
@@ -800 +779 @@
  */
 static RTEXITCODE audioTestRecOne(const char *pszFile, uint8_t cWaveChannels, uint8_t cbWaveSample, uint32_t uWaveHz,
-                                  PCPDMDRVREG pDrvReg, const char *pszDevId, uint32_t cMsBufferSize,
-                                  uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint,
-                                  uint8_t cChannels, uint8_t cbSample, uint32_t uHz, bool fWithDrvAudio, bool fWithMixer,
+                                  PCPDMDRVREG pDrvReg, const char *pszDevId, PAUDIOTESTIOOPTS pIoOpts,
                                   uint64_t cMaxFrames, uint64_t cNsMaxDuration)
 {
@@ -810 +787 @@
     RTEXITCODE          rcExit = RTEXITCODE_FAILURE;
     AUDIOTESTDRVSTACK   DrvStack;
-    int rc = audioTestDriverStackInit(&DrvStack, pDrvReg, fWithDrvAudio);
+    int rc = audioTestDriverStackInit(&DrvStack, pDrvReg, pIoOpts->fWithDrvAudio);
     if (RT_SUCCESS(rc))
     {
@@ -824 +801 @@
             PDMAUDIOPCMPROPS  ReqProps;
             PDMAudioPropsInit(&ReqProps,
-                              cbSample ? cbSample : cbWaveSample ? cbWaveSample : 2,
-                              true /*fSigned*/,
-                              cChannels ? cChannels : cWaveChannels ? cWaveChannels : 2,
-                              uHz ? uHz : uWaveHz ? uWaveHz : 44100);
+                              pIoOpts->Props.cbSampleX ? pIoOpts->Props.cbSampleX : cbWaveSample ? cbWaveSample : 2,
+                              pIoOpts->Props.fSigned,
+                              pIoOpts->Props.cChannelsX ? pIoOpts->Props.cChannelsX : cWaveChannels ? cWaveChannels : 2,
+                              pIoOpts->Props.uHz ? pIoOpts->Props.uHz : uWaveHz ? uWaveHz : 44100);
+
             PDMAUDIOSTREAMCFG CfgAcq;
             PPDMAUDIOSTREAM   pStream  = NULL;
-            rc = audioTestDriverStackStreamCreateInput(&DrvStack, &ReqProps, cMsBufferSize,
-                                                       cMsPreBuffer, cMsSchedulingHint, &pStream, &CfgAcq);
+            rc = audioTestDriverStackStreamCreateInput(&DrvStack, &ReqProps, pIoOpts->cMsBufferSize,
+                                                       pIoOpts->cMsPreBuffer, pIoOpts->cMsSchedulingHint, &pStream, &CfgAcq);
             if (RT_SUCCESS(rc))
             {
@@ -844 +822 @@
                                   cWaveChannels ? cWaveChannels : PDMAudioPropsChannels(&CfgAcq.Props),
                                   uWaveHz ? uWaveHz : PDMAudioPropsHz(&CfgAcq.Props));
-                if (!fWithMixer && !PDMAudioPropsAreEqual(&WaveProps, &CfgAcq.Props))
+                if (!pIoOpts->fWithMixer && !PDMAudioPropsAreEqual(&WaveProps, &CfgAcq.Props))
                 {
                     RTMsgInfo("Enabling the mixer buffer.\n");
-                    fWithMixer = true;
+                    pIoOpts->fWithMixer = true;
                 }
 
@@ -864 +842 @@
                  */
                 AUDIOTESTDRVMIXSTREAM Mix;
-                rc = AudioTestMixStreamInit(&Mix, &DrvStack, pStream, fWithMixer ? &WaveProps : NULL, 100 /*ms*/);
+                rc = AudioTestMixStreamInit(&Mix, &DrvStack, pStream, pIoOpts->fWithMixer ? &WaveProps : NULL, 100 /*ms*/);
                 if (RT_SUCCESS(rc))
                 {
@@ -871 +849 @@
                         RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n",
                                   PDMAudioPropsToString(&pStream->Cfg.Props, szTmp, sizeof(szTmp)),
-                                  pStream->cbBackend, fWithMixer ? " mixed" : "");
+                                  pStream->cbBackend, pIoOpts->fWithMixer ? " mixed" : "");
 
                     /*
@@ -986 +964 @@
     /* Option values: */
     PCPDMDRVREG pDrvReg             = AudioTestGetDefaultBackend();
-    uint32_t    cMsBufferSize       = UINT32_MAX;
-    uint32_t    cMsPreBuffer        = UINT32_MAX;
-    uint32_t    cMsSchedulingHint   = UINT32_MAX;
     const char *pszDevId            = NULL;
-    bool        fWithDrvAudio       = false;
-    bool        fWithMixer          = false;
     uint8_t     cbSample            = 0;
     uint8_t     cChannels           = 0;
@@ -1001 +974 @@
     uint64_t    cNsMaxDuration      = UINT64_MAX;
 
+    AUDIOTESTIOOPTS IoOpts;
+    audioTestIoOptsInitDefaults(&IoOpts);
+
     /* Argument processing loop: */
     int           ch;
@@ -1023 +999 @@
 
             case 'd':
-                fWithDrvAudio = true;
+                IoOpts.fWithDrvAudio = true;
                 break;
 
@@ -1039 +1015 @@
 
             case 'm':
-                fWithMixer = true;
+                IoOpts.fWithMixer = true;
                 break;
 
@@ -1068 +1044 @@
             case VINF_GETOPT_NOT_OPTION:
             {
+                if (   cbSample
+                    || cChannels
+                    || uHz)
+                {
+                    /* Set new (override standard) I/O PCM properties if set by the user. */
+                    PDMAudioPropsInit(&IoOpts.Props,
+                                      cbSample  ? cbSample  : 2 /* 16-bit */, true /* fSigned */,
+                                      cChannels ? cChannels : 2 /* Stereo */, uHz ? uHz : 44100);
+                }
+
                 RTEXITCODE rcExit = audioTestRecOne(ValueUnion.psz, cWaveChannels, cbWaveSample, uWaveHz,
-                                                    pDrvReg, pszDevId, cMsBufferSize, cMsPreBuffer, cMsSchedulingHint,
-                                                    cChannels, cbSample, uHz, fWithDrvAudio, fWithMixer,
+                                                    pDrvReg, pszDevId, &IoOpts,
                                                     cMaxFrames, cNsMaxDuration);
                 if (rcExit != RTEXITCODE_SUCCESS)

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

@@ -131 +131 @@
     PAUDIOTESTENV pTstEnvGst = &pCtx->Guest.TstEnv;
 
+    audioTestEnvInit(pTstEnvGst);
+
     /* Flag the environment for self test mode. */
     pTstEnvGst->fSelftest = true;
@@ -151 +153 @@
     pTstEnvGst->enmMode = AUDIOTESTMODE_GUEST;
 
-    /** @todo Make this customizable. */
-    PDMAudioPropsInit(&pTstEnvGst->Props,
-                      2 /* 16-bit */, true  /* fSigned */, 2 /* cChannels */, 44100 /* uHz */);
-
-    rc = audioTestEnvInit(pTstEnvGst, &pCtx->DrvStack);
+    rc = audioTestEnvCreate(pTstEnvGst, &pCtx->DrvStack);
     if (RT_SUCCESS(rc))
     {
@@ -183 +181 @@
     PAUDIOTESTENV pTstEnvHst = &pCtx->Host.TstEnv;
 
+    audioTestEnvInit(pTstEnvHst);
+
     /* Flag the environment for self test mode. */
     pTstEnvHst->fSelftest = true;
@@ -195 +195 @@
     rc = AudioTestPathCreateTemp(pTstEnvHst->szPathOut, sizeof(pTstEnvHst->szPathOut), "selftest-out");
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
-
-    /* Initialize the PCM properties to some sane values. */
-    PDMAudioPropsInit(&pTstEnvHst->Props,
-                      2 /* 16-bit */, true /* fPcmSigned */, 2 /* cPcmChannels */, 44100 /* uPcmHz */);
 
     /*
@@ -224 +220 @@
         pTstEnvHst->enmMode = AUDIOTESTMODE_HOST;
 
-        rc = audioTestEnvInit(pTstEnvHst, &pCtx->DrvStack);
+        rc = audioTestEnvCreate(pTstEnvHst, &pCtx->DrvStack);
         if (RT_SUCCESS(rc))
         {

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

@@ -80 +80 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream, PDMAUDIODIR enmDir, PCPDMAUDIOPCMPROPS pProps, bool fWithMixer, uint32_t cMsBufferSize, uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint);
+static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream, PDMAUDIODIR enmDir, PAUDIOTESTIOOPTS pPlayOpt);
 static int audioTestStreamDestroy(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream);
 
@@ -334 +334 @@
 
 static int audioTestStreamInit(PAUDIOTESTDRVSTACK pDrvStack, PAUDIOTESTSTREAM pStream,
-                               PDMAUDIODIR enmDir, PCPDMAUDIOPCMPROPS pProps, bool fWithMixer,
-                               uint32_t cMsBufferSize, uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint)
+                               PDMAUDIODIR enmDir, PAUDIOTESTIOOPTS pIoOpts)
 {
     int rc;
 
     if (enmDir == PDMAUDIODIR_IN)
-        rc = audioTestDriverStackStreamCreateInput(pDrvStack, pProps, cMsBufferSize,
-                                                   cMsPreBuffer, cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
+        rc = audioTestDriverStackStreamCreateInput(pDrvStack, &pIoOpts->Props, pIoOpts->cMsBufferSize,
+                                                   pIoOpts->cMsPreBuffer, pIoOpts->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
     else if (enmDir == PDMAUDIODIR_OUT)
-        rc = audioTestDriverStackStreamCreateOutput(pDrvStack, pProps, cMsBufferSize,
-                                                    cMsPreBuffer, cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
+        rc = audioTestDriverStackStreamCreateOutput(pDrvStack, &pIoOpts->Props, pIoOpts->cMsBufferSize,
+                                                    pIoOpts->cMsPreBuffer, pIoOpts->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
     else
         rc = VERR_NOT_SUPPORTED;
@@ -360 +359 @@
          * Automatically enable the mixer if the PCM properties don't match.
          */
-        if (   !fWithMixer
-            && !PDMAudioPropsAreEqual(pProps, &pStream->Cfg.Props))
+        if (   !pIoOpts->fWithMixer
+            && !PDMAudioPropsAreEqual(&pIoOpts->Props, &pStream->Cfg.Props))
         {
             RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS,  "Enabling stream mixer\n");
-            fWithMixer = true;
+            pIoOpts->fWithMixer = true;
         }
 
         rc = AudioTestMixStreamInit(&pStream->Mix, pDrvStack, pStream->pStream,
-                                    fWithMixer ? pProps : NULL, 100 /* ms */); /** @todo Configure mixer buffer? */
+                                    pIoOpts->fWithMixer ? &pIoOpts->Props : NULL, 100 /* ms */); /** @todo Configure mixer buffer? */
     }
 
@@ -405 +404 @@
 *   Test Primitives                                                                                                              *
 *********************************************************************************************************************************/
+
+/**
+ * Initializes test tone parameters (partly with random values).
+
+ * @param   pToneParms          Test tone parameters to initialize.
+ */
+void audioTestToneParmsInit(PAUDIOTESTTONEPARMS pToneParms)
+{
+    RT_BZERO(pToneParms, sizeof(AUDIOTESTTONEPARMS));
+
+    /**
+     * Set default (randomized) test tone parameters if not set explicitly.
+     */
+    pToneParms->dbFreqHz       = AudioTestToneGetRandomFreq();
+    pToneParms->msDuration     = RTRandU32Ex(200, RT_MS_30SEC);
+    pToneParms->uVolumePercent = 100; /* We always go with maximum volume for now. */
+
+    PDMAudioPropsInit(&pToneParms->Props,
+                      2 /* 16-bit */, true /* fPcmSigned */, 2 /* cPcmChannels */, 44100 /* uPcmHz */);
+}
+
+/**
+ * Initializes I/O options with some sane default values.
+ *
+ * @param   pIoOpts             I/O options to initialize.
+ */
+void audioTestIoOptsInitDefaults(PAUDIOTESTIOOPTS pIoOpts)
+{
+    RT_BZERO(pIoOpts, sizeof(AUDIOTESTIOOPTS));
+
+    /* Initialize the PCM properties to some sane values. */
+    PDMAudioPropsInit(&pIoOpts->Props,
+                      2 /* 16-bit */, true /* fPcmSigned */, 2 /* cPcmChannels */, 44100 /* uPcmHz */);
+
+    pIoOpts->cMsBufferSize     = UINT32_MAX;
+    pIoOpts->cMsPreBuffer      = UINT32_MAX;
+    pIoOpts->cMsSchedulingHint = UINT32_MAX;
+    pIoOpts->uVolumePercent    = 100; /* Use maximum volume by default. */
+}
 
 #if 0 /* Unused */
@@ -430 +468 @@
  *
  * @returns VBox status code.
+ * @param   pIoOpts             I/O options to use.
  * @param   pTstEnv             Test environment to use for running the test.
  *                              Optional and can be NULL (for simple playback only).
@@ -437 +476 @@
  * @note    Blocking function.
  */
-int audioTestPlayTone(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
+int audioTestPlayTone(PAUDIOTESTIOOPTS pIoOpts, PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
 {
     AUDIOTESTTONE TstTone;
@@ -446 +485 @@
         pcszPathOut = pTstEnv->Set.szPathAbs;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms)\n", (uint16_t)pParms->dbFreqHz, pParms->msDuration);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Playing test tone (tone frequency is %RU16Hz, %RU32ms, %RU8%% volume)\n",
+                 (uint16_t)pParms->dbFreqHz, pParms->msDuration, pParms->uVolumePercent);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using %RU32ms stream scheduling hint\n", pStream->Cfg.Device.cMsSchedulingHint);
     if (pcszPathOut)
@@ -462 +502 @@
     }
 
-    /* Try to crank up the system's master volume up to 100% so that we (hopefully) play the test tone always at the same leve.
-     * Not supported on all platforms yet, therefore not critical for overall testing (yet). */
-    unsigned const uVolPercent = 100;
+    uint8_t const uVolPercent = pIoOpts->uVolumePercent;
     int rc2 = audioTestSetMasterVolume(uVolPercent);
     if (RT_FAILURE(rc2))
@@ -666 +704 @@
  *
  * @returns VBox status code.
+ * @param   pIoOpts             I/O options to use.
  * @param   pTstEnv             Test environment to use for running the test.
  * @param   pStream             Stream to use for recording the tone.
@@ -672 +711 @@
  * @note    Blocking function.
  */
-static int audioTestRecordTone(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
+static int audioTestRecordTone(PAUDIOTESTIOOPTS pIoOpts, PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms)
 {
     const char *pcszPathOut = pTstEnv->Set.szPathAbs;
@@ -694 +733 @@
 
         AudioTestObjAddMetadataStr(Obj, "stream_to_record_bytes=%RU32\n", cbToRecTotal);
-        AudioTestObjAddMetadataStr(Obj, "stream_buffer_size_ms=%RU32\n", pTstEnv->cMsBufferSize);
-        AudioTestObjAddMetadataStr(Obj, "stream_prebuf_size_ms=%RU32\n", pTstEnv->cMsPreBuffer);
+        AudioTestObjAddMetadataStr(Obj, "stream_buffer_size_ms=%RU32\n", pIoOpts->cMsBufferSize);
+        AudioTestObjAddMetadataStr(Obj, "stream_prebuf_size_ms=%RU32\n", pIoOpts->cMsPreBuffer);
         /* Note: This mostly is provided by backend (e.g. PulseAudio / ALSA / ++) and
          *       has nothing to do with the device emulation scheduling hint. */
-        AudioTestObjAddMetadataStr(Obj, "device_scheduling_hint_ms=%RU32\n", pTstEnv->cMsSchedulingHint);
+        AudioTestObjAddMetadataStr(Obj, "device_scheduling_hint_ms=%RU32\n", pIoOpts->cMsSchedulingHint);
 
         uint8_t         abSamples[16384];
@@ -862 +901 @@
 static DECLCALLBACK(int) audioTestGstAtsTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
-    PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
-    PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
+    PATSCALLBACKCTX  pCtx    = (PATSCALLBACKCTX)pvUser;
+    PAUDIOTESTENV    pTstEnv = pCtx->pTstEnv;
+    PAUDIOTESTIOOPTS pIoOpts = &pTstEnv->IoOpts;
 
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Got request for playing test tone #%RU32 (%RU16Hz, %RU32ms) ...\n",
@@ -874 +914 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_OUT, &pTstEnv->Props, false /* fWithMixer */,
-                                 pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
+    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_OUT, pIoOpts);
     if (RT_SUCCESS(rc))
     {
@@ -888 +927 @@
         if (RT_SUCCESS(rc))
         {
-            rc = audioTestPlayTone(pTstEnv, pTstStream, pToneParms);
+            rc = audioTestPlayTone(&pTstEnv->IoOpts, pTstEnv, pTstStream, pToneParms);
             if (RT_SUCCESS(rc))
             {
@@ -910 +949 @@
 static DECLCALLBACK(int) audioTestGstAtsToneRecordCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
-    PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
-    PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
+    PATSCALLBACKCTX  pCtx    = (PATSCALLBACKCTX)pvUser;
+    PAUDIOTESTENV    pTstEnv = pCtx->pTstEnv;
+    PAUDIOTESTIOOPTS pIoOpts = &pTstEnv->IoOpts;
 
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Got request for recording test tone #%RU32 (%RU32ms) ...\n",
@@ -922 +962 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_IN, &pTstEnv->Props, false /* fWithMixer */,
-                                 pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer, pTstEnv->cMsSchedulingHint);
+    int rc = audioTestStreamInit(pTstEnv->pDrvStack, pTstStream, PDMAUDIODIR_IN, pIoOpts);
     if (RT_SUCCESS(rc))
     {
@@ -930 +969 @@
         TstParms.enmType  = AUDIOTESTTYPE_TESTTONE_RECORD;
         TstParms.enmDir   = PDMAUDIODIR_IN;
-        TstParms.Props    = pToneParms->Props;
         TstParms.TestTone = *pToneParms;
 
@@ -937 +975 @@
         if (RT_SUCCESS(rc))
         {
-            rc = audioTestRecordTone(pTstEnv, pTstStream, pToneParms);
+            rc = audioTestRecordTone(pIoOpts, pTstEnv, pTstStream, pToneParms);
             if (RT_SUCCESS(rc))
             {
@@ -1175 +1213 @@
  * Initializes an audio test environment.
  *
+ * @param   pTstEnv             Audio test environment to initialize.
+ */
+void audioTestEnvInit(PAUDIOTESTENV pTstEnv)
+{
+    RT_BZERO(pTstEnv, sizeof(AUDIOTESTENV));
+
+    audioTestIoOptsInitDefaults(&pTstEnv->IoOpts);
+    audioTestToneParmsInit(&pTstEnv->ToneParms);
+}
+
+/**
+ * Creates an audio test environment.
+ *
  * @returns VBox status code.
- * @param   pTstEnv             Audio test environment to initialize.
+ * @param   pTstEnv             Audio test environment to create.
  * @param   pDrvStack           Driver stack to use.
  */
-int audioTestEnvInit(PAUDIOTESTENV pTstEnv, PAUDIOTESTDRVSTACK pDrvStack)
-{
+int audioTestEnvCreate(PAUDIOTESTENV pTstEnv, PAUDIOTESTDRVSTACK pDrvStack)
+{
+    AssertReturn(PDMAudioPropsAreValid(&pTstEnv->IoOpts.Props), VERR_WRONG_ORDER);
+
     int rc = VINF_SUCCESS;
 
@@ -1210 +1263 @@
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Output directory is '%s'\n", pTstEnv->szPathOut);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Temp directory is '%s'\n", pTstEnv->szPathTemp);
-
-    if (!pTstEnv->cMsBufferSize)
-        pTstEnv->cMsBufferSize     = UINT32_MAX;
-    if (!pTstEnv->cMsPreBuffer)
-        pTstEnv->cMsPreBuffer      = UINT32_MAX;
-    if (!pTstEnv->cMsSchedulingHint)
-        pTstEnv->cMsSchedulingHint = UINT32_MAX;
 
     char szPathTemp[RTPATH_MAX];

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

@@ -197 +197 @@
 
 /**
+ * Structure holding additional I/O options.
+ */
+typedef struct AUDIOTESTIOOPTS
+{
+    /** Whether to use the audio connector or not. */
+    bool             fWithDrvAudio;
+    /** Whether to use a mixing buffer or not. */
+    bool             fWithMixer;
+    /** Buffer size (in ms). */
+    uint32_t         cMsBufferSize;
+    /** Pre-buffering size (in ms). */
+    uint32_t         cMsPreBuffer;
+    /** Scheduling (in ms). */
+    uint32_t         cMsSchedulingHint;
+    /** Audio vlume to use (in percent). */
+    uint8_t          uVolumePercent;
+    /** PCM audio properties to use. */
+    PDMAUDIOPCMPROPS Props;
+} AUDIOTESTIOOPTS;
+/** Pointer to additional playback options. */
+typedef AUDIOTESTIOOPTS *PAUDIOTESTIOOPTS;
+
+/**
  * Structure for keeping a user context for the test service callbacks.
  */
@@ -225 +248 @@
     /** Whether skip the actual verification or not. */
     bool                    fSkipVerify;
-    /** The PCM properties to use. */
-    PDMAUDIOPCMPROPS        Props;
     /** Name of the audio device to use.
      *  If empty the default audio device will be used. */
     char                    szDev[128];
-    /** Audio volume to use (in percent).
-     *  Might not be available on all systems. */
-    uint8_t                 uVolumePercent;
     /** Number of iterations for *all* tests specified.
      *  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;
+    /** I/O options to use. */
+    AUDIOTESTIOOPTS         IoOpts;
+    /** Test tone parameters to use. */
+    AUDIOTESTTONEPARMS      ToneParms;
     /** Output path for storing the test environment's final test files. */
     char                    szTag[AUDIOTEST_TAG_MAX];
@@ -245 +264 @@
     /** Temporary path for this test environment. */
     char                    szPathTemp[RTPATH_MAX];
-    /** Buffer size (in ms). */
-    RTMSINTERVAL            cMsBufferSize;
-    /** Pre-buffering time (in ms). */
-    RTMSINTERVAL            cMsPreBuffer;
-    /** Scheduling hint (in ms). */
-    RTMSINTERVAL            cMsSchedulingHint;
     /** Pointer to audio test driver stack to use. */
     PAUDIOTESTDRVSTACK      pDrvStack;
@@ -454 +467 @@
 /** @name Test environment handling
  * @{ */
-int         audioTestEnvInit(PAUDIOTESTENV pTstEnv, PAUDIOTESTDRVSTACK pDrvStack);
+void        audioTestEnvInit(PAUDIOTESTENV pTstEnv);
+int         audioTestEnvCreate(PAUDIOTESTENV pTstEnv, PAUDIOTESTDRVSTACK pDrvStack);
 void        audioTestEnvDestroy(PAUDIOTESTENV pTstEnv);
 int         audioTestEnvPrologue(PAUDIOTESTENV pTstEnv, bool fPack, char *pszPackFile, size_t cbPackFile);
@@ -465 +479 @@
 
 /** @todo Test tone handling */
-int         audioTestPlayTone(PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms);
-/** @}  */
-
+int         audioTestPlayTone(PAUDIOTESTIOOPTS pIoOpts, PAUDIOTESTENV pTstEnv, PAUDIOTESTSTREAM pStream, PAUDIOTESTTONEPARMS pParms);
+void        audioTestToneParmsInit(PAUDIOTESTTONEPARMS pToneParms);
+/** @}  */
+
+void        audioTestIoOptsInitDefaults(PAUDIOTESTIOOPTS pIoOpts);
 
 /*********************************************************************************************************************************