Changeset 89293 in vbox for trunk/src/VBox/Devices

Timestamp:

May 26, 2021 2:04:25 PM (4 years ago)

Author:

vboxsync

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

144639

Message:

Audio/ValKit: Made AudioTestToneInit() a bit more flexible; also use it when AudioTestToneInitRandom() is being called. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (4 diffs)
• AudioTest.h (modified) (1 diff)

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

@@ -86 +86 @@
 
 /**
+ * Returns a random test tone frequency.
+ */
+DECLINLINE(double) audioTestGetRandomFreq(void)
+{
+    return s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)];
+}
+
+/**
  * Initializes a test tone with a specific frequency (in Hz).
  *
- * @returns Randomly picked frequency (in Hz).
+ * @returns Used tone frequency (in Hz).
  * @param   pTone               Pointer to test tone to initialize.
  * @param   pProps              PCM properties to use for the test tone.
  * @param   dbFreq              Frequency (in Hz) to initialize tone with.
- */
-void AudioTestToneInit(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps, double dbFreq)
-{
+ *                              When set to 0.0, a random frequency will be chosen.
+ */
+double AudioTestToneInit(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps, double dbFreq)
+{
+    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. */
@@ -104 +116 @@
 
     pTone->enmType = AUDIOTESTTONETYPE_SINE; /* Only type implemented so far. */
+
+    return dbFreq;
 }
 
@@ -109 +123 @@
  * Initializes a test tone by picking a random but well-known frequency (in Hz).
  *
- * @returns Randomly picked frequency (in Hz).
+ * @returns Randomly picked tone frequency (in Hz).
  * @param   pTone               Pointer to test tone to initialize.
  * @param   pProps              PCM properties to use for the test tone.
@@ -115 +129 @@
 double AudioTestToneInitRandom(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps)
 {
-    AudioTestToneInit(pTone, pProps,
-                      /* Pick a frequency from our selection, so that every time a recording starts
-                       * we'll hopfully generate a different note. */
-                      s_aAudioTestToneFreqsHz[RTRandU32Ex(0, RT_ELEMENTS(s_aAudioTestToneFreqsHz) - 1)]);
-
-    return pTone->rdFreqHz;
+    return AudioTestToneInit(pTone, pProps,
+                             /* Pick a frequency from our selection, so that every time a recording starts
+                              * we'll hopfully generate a different note. */
+                             0.0);
 }
 

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

@@ -293 +293 @@
 
 
-void   AudioTestToneInit(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps, double dbFreq);
+double AudioTestToneInit(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps, double dbFreq);
 double AudioTestToneInitRandom(PAUDIOTESTTONE pTone, PPDMAUDIOPCMPROPS pProps);
 int    AudioTestToneGenerate(PAUDIOTESTTONE pTone, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten);