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

Timestamp:

Jul 2, 2021 9:41:02 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Cleaned up test object API + handling. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp (modified) (8 diffs)

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

@@ -258 +258 @@
 
     /** @todo Use .WAV here? */
-    PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-play.pcm", &pObj);
+    AUDIOTESTOBJ Obj;
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-play.pcm", &Obj);
     AssertRCReturn(rc, rc);
 
@@ -273 +273 @@
         RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Playing %RU32 bytes total\n", cbToPlayTotal);
 
-        AudioTestSetObjAddMetadataStr(pObj, "stream_to_play_bytes=%RU32\n",      cbToPlayTotal);
-        AudioTestSetObjAddMetadataStr(pObj, "stream_period_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPeriod);
-        AudioTestSetObjAddMetadataStr(pObj, "stream_buffer_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesBufferSize);
-        AudioTestSetObjAddMetadataStr(pObj, "stream_prebuf_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPreBuffering);
+        AudioTestObjAddMetadataStr(Obj, "stream_to_play_bytes=%RU32\n",      cbToPlayTotal);
+        AudioTestObjAddMetadataStr(Obj, "stream_period_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPeriod);
+        AudioTestObjAddMetadataStr(Obj, "stream_buffer_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesBufferSize);
+        AudioTestObjAddMetadataStr(Obj, "stream_prebuf_size_frames=%RU32\n", pStream->Cfg.Backend.cFramesPreBuffering);
         /* Note: This mostly is provided by backend (e.g. PulseAudio / ALSA / ++) and
          *       has nothing to do with the device emulation scheduling hint. */
-        AudioTestSetObjAddMetadataStr(pObj, "device_scheduling_hint_ms=%RU32\n", pStream->Cfg.Device.cMsSchedulingHint);
+        AudioTestObjAddMetadataStr(Obj, "device_scheduling_hint_ms=%RU32\n", pStream->Cfg.Device.cMsSchedulingHint);
 
         PAUDIOTESTDRVMIXSTREAM pMix = &pStream->Mix;
@@ -312 +312 @@
                 {
                     /* Write stuff to disk before trying to play it. Help analysis later. */
-                    rc = AudioTestSetObjWrite(pObj, abBuf, cbToPlay);
+                    rc = AudioTestObjWrite(Obj, abBuf, cbToPlay);
                     if (RT_SUCCESS(rc))
                     {
@@ -344 +344 @@
         rc = VERR_AUDIO_STREAM_NOT_READY;
 
-    int rc2 = AudioTestSetObjClose(pObj);
+    int rc2 = AudioTestObjClose(Obj);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -372 +372 @@
 
     /** @todo Use .WAV here? */
-    PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-rec.pcm", &pObj);
+    AUDIOTESTOBJ Obj;
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-rec.pcm", &Obj);
     AssertRCReturn(rc, rc);
 
@@ -385 +385 @@
         RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Recording %RU32 bytes total\n", cbToRecTotal);
 
-        AudioTestSetObjAddMetadataStr(pObj, "stream_to_record_bytes=%RU32\n", cbToRecTotal);
-        AudioTestSetObjAddMetadataStr(pObj, "stream_buffer_size_ms=%RU32\n", pTstEnv->cMsBufferSize);
-        AudioTestSetObjAddMetadataStr(pObj, "stream_prebuf_size_ms=%RU32\n", pTstEnv->cMsPreBuffer);
+        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);
         /* Note: This mostly is provided by backend (e.g. PulseAudio / ALSA / ++) and
          *       has nothing to do with the device emulation scheduling hint. */
-        AudioTestSetObjAddMetadataStr(pObj, "device_scheduling_hint_ms=%RU32\n", pTstEnv->cMsSchedulingHint);
+        AudioTestObjAddMetadataStr(Obj, "device_scheduling_hint_ms=%RU32\n", pTstEnv->cMsSchedulingHint);
 
         uint8_t         abSamples[16384];
@@ -410 +410 @@
                     if (cbRecorded)
                     {
-                        rc = AudioTestSetObjWrite(pObj, abSamples, cbRecorded);
+                        rc = AudioTestObjWrite(Obj, abSamples, cbRecorded);
                         if (RT_SUCCESS(rc))
                         {
@@ -432 +432 @@
     }
 
-    int rc2 = AudioTestSetObjClose(pObj);
+    int rc2 = AudioTestObjClose(Obj);
     if (RT_SUCCESS(rc))
         rc = rc2;