Changeset 91451 in vbox for trunk/src/VBox

Timestamp:

Sep 29, 2021 8:59:35 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Implemented optional volume argument (--vol [0-100]) for playing back .WAV files and test tones. ​bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkatCmdGeneric.cpp (modified) (12 diffs)
• vkatDriverStack.cpp (modified) (1 diff)
• vkatInternal.h (modified) (1 diff)

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

@@ -283 +283 @@
 static RTEXITCODE audioTestPlayOne(const char *pszFile, PCPDMDRVREG pDrvReg, const char *pszDevId, uint32_t cMsBufferSize,
                                    uint32_t cMsPreBuffer, uint32_t cMsSchedulingHint,
-                                   uint8_t cChannels, uint8_t cbSample, uint32_t uHz,
+                                   uint8_t cChannels, uint8_t cbSample, uint32_t uHz, uint8_t uVolumePercent,
                                    bool fWithDrvAudio, bool fWithMixer)
 {
@@ -343 +343 @@
                  */
                 if (   !fWithMixer
-                    && !PDMAudioPropsAreEqual(&WaveFile.Props, &pStream->Cfg.Props))
+                    && (   !PDMAudioPropsAreEqual(&WaveFile.Props, &pStream->Cfg.Props)
+                        || uVolumePercent != 100)
+                   )
                 {
                     RTMsgInfo("Enabling the mixer buffer.\n");
@@ -361 +363 @@
                                   PDMAudioPropsToString(&pStream->Cfg.Props, szTmp, sizeof(szTmp)),
                                   pStream->cbBackend, fWithMixer ? " mixed" : "");
+
+                    if (fWithMixer)
+                        AudioTestMixStreamSetVolume(&Mix, uVolumePercent);
 
                     /*
@@ -439 +444 @@
                  */
                 if (   !fWithMixer
-                    && !PDMAudioPropsAreEqual(&pToneParms->Props, &TstStream.pStream->Cfg.Props))
+                    && (   !PDMAudioPropsAreEqual(&pToneParms->Props, &TstStream.pStream->Cfg.Props)
+                        || pToneParms->uVolumePercent != 100)
+                    )
                 {
                     RTMsgInfo("Enabling the mixer buffer.\n");
@@ -463 +470 @@
                     if (RT_SUCCESS(rc))
                     {
+                        if (fWithMixer)
+                            AudioTestMixStreamSetVolume(&TstStream.Mix, pToneParms->uVolumePercent);
+
                         rc = audioTestPlayTone(NULL /* pTstEnv */, &TstStream, pToneParms);
                         if (RT_SUCCESS(rc))
@@ -491 +501 @@
 
 /**
+ * Long option values for the 'play' command.
+ */
+enum
+{
+    VKAT_PLAY_OPT_VOL = 900
+};
+
+
+/**
  * Options for 'play'.
  */
@@ -504 +523 @@
     { "--with-drv-audio",   'd',                          RTGETOPT_REQ_NOTHING },
     { "--with-mixer",       'm',                          RTGETOPT_REQ_NOTHING },
+    { "--vol",              VKAT_PLAY_OPT_VOL,            RTGETOPT_REQ_UINT8 },
 };
 
@@ -512 +532 @@
     switch (pOpt->iShort)
     {
-        case 'b': return "The audio backend to use";
-        case 'c': return "Number of backend output channels";
-        case 'd': return "Go via DrvAudio instead of directly interfacing with the backend";
-        case 'f': return "Output frequency (Hz)";
-        case 'z': return "Output sample size (bits)";
-        case 't': return "Plays a test tone. Can be specified multiple times";
-        case 'm': return "Go via the mixer";
-        case 'o': return "The ID of the output device to use";
-        default:  return NULL;
+        case 'b':               return "The audio backend to use";
+        case 'c':               return "Number of backend output channels";
+        case 'd':               return "Go via DrvAudio instead of directly interfacing with the backend";
+        case 'f':               return "Output frequency (Hz)";
+        case 'z':               return "Output sample size (bits)";
+        case 't':               return "Plays a test tone. Can be specified multiple times";
+        case 'm':               return "Go via the mixer";
+        case 'o':               return "The ID of the output device to use";
+        case VKAT_PLAY_OPT_VOL: return "Volume (in percent, 0-100) to use";
+        default:                return NULL;
     }
 }
@@ -545 +566 @@
     uint8_t     cChannels           = 0;
     uint32_t    uHz                 = 0;
+    uint8_t     uVolumePercent      = 100; /* Use maximum volume by default. */
 
     /* Argument processing loop: */
@@ -587 +609 @@
                 break;
 
+            case VKAT_PLAY_OPT_VOL:
+                uVolumePercent = ValueUnion.u8;
+                if (uVolumePercent > 100)
+                    return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Invalid volume (0-100)");
+                break;
+
             case VINF_GETOPT_NOT_OPTION:
             {
@@ -593 +621 @@
 
                 RTEXITCODE rcExit = audioTestPlayOne(ValueUnion.psz, pDrvReg, pszDevId, cMsBufferSize, cMsPreBuffer,
-                                                     cMsSchedulingHint, cChannels, cbSample, uHz, fWithDrvAudio, fWithMixer);
+                                                     cMsSchedulingHint, cChannels, cbSample, uHz, uVolumePercent,
+                                                     fWithDrvAudio, fWithMixer);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -624 +653 @@
 #endif
         ToneParms.msSequel       = 0;   /** @todo Implement analyzing this first! */
-        ToneParms.uVolumePercent = 100; /** @todo Implement analyzing this first! */
+        ToneParms.uVolumePercent = uVolumePercent;
 
         RTEXITCODE rcExit = audioTestPlayTestToneOne(&ToneParms, pDrvReg, pszDevId, cMsBufferSize, cMsPreBuffer,

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

@@ -1557 +1557 @@
     return VINF_SUCCESS;
 }
+
+/**
+ * Sets the volume of a mixing stream.
+ *
+ * @param   pMix                Mixing stream to set volume for.
+ * @param   uVolumePercent      Volume to set (in percent, 0-100).
+ */
+void AudioTestMixStreamSetVolume(PAUDIOTESTDRVMIXSTREAM pMix, uint8_t uVolumePercent)
+{
+    AssertReturnVoid(pMix->fDoMixing);
+
+    PDMAUDIOVOLUME Vol;
+    RT_ZERO(Vol);
+    for (size_t i = 0; i < RT_ELEMENTS(Vol.auChannels); i++)
+        Vol.auChannels[i] = (PDMAUDIO_VOLUME_MAX / 100) * uVolumePercent;
+    AudioMixBufSetVolume(&pMix->MixBuf, &Vol);
+}
+

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

@@ -435 +435 @@
 uint32_t    AudioTestMixStreamGetReadable(PAUDIOTESTDRVMIXSTREAM pMix);
 int         AudioTestMixStreamCapture(PAUDIOTESTDRVMIXSTREAM pMix, void *pvBuf, uint32_t cbBuf, uint32_t *pcbCaptured);
+void        AudioTestMixStreamSetVolume(PAUDIOTESTDRVMIXSTREAM pMix, uint8_t uVol);
 /** @}  */