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

Timestamp:

Jun 9, 2021 2:43:34 PM (4 years ago)

Author:

vboxsync

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

145022

Message:

Audio/ValKit: More code for completely self-contained (self) testing. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkatCommon.cpp (modified) (11 diffs)
• vkatInternal.h (modified) (1 diff)

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

@@ -264 +264 @@
     /** @todo Use .WAV here? */
     PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone-play.pcm", &pObj);
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-play.pcm", &pObj);
     AssertRCReturn(rc, rc);
 
@@ -341 +341 @@
     /** @todo Use .WAV here? */
     PAUDIOTESTOBJ pObj;
-    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "tone-rec.pcm", &pObj);
+    int rc = AudioTestSetObjCreateAndRegister(&pTstEnv->Set, "guest-tone-rec.pcm", &pObj);
     AssertRCReturn(rc, rc);
 
@@ -396 +396 @@
 *********************************************************************************************************************************/
 
-/** @copydoc ATSCALLBACKS::pfnTestSetBegin */
-static DECLCALLBACK(int) audioTestSvcTestSetBeginCallback(void const *pvUser, const char *pszTag)
+/** @copydoc ATSCALLBACKS::pfnTestSetBegin
+ *
+ *  @note Runs as part of the guest ATS.
+ */
+static DECLCALLBACK(int) audioTestGstAtsTestSetBeginCallback(void const *pvUser, const char *pszTag)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
     PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Beginning test set '%s'\n", pszTag);
+    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Beginning test set '%s' in '%s'\n", pszTag, pTstEnv->szPathTemp);
 
     return AudioTestSetCreate(&pTstEnv->Set, pTstEnv->szPathTemp, pszTag);
 }
 
-/** @copydoc ATSCALLBACKS::pfnTestSetEnd */
-static DECLCALLBACK(int) audioTestSvcTestSetEndCallback(void const *pvUser, const char *pszTag)
+/** @copydoc ATSCALLBACKS::pfnTestSetEnd
+ *
+ *  @note Runs as part of the guest ATS.
+ */
+static DECLCALLBACK(int) audioTestGstAtsTestSetEndCallback(void const *pvUser, const char *pszTag)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
@@ -418 +424 @@
 }
 
-/** @copydoc ATSCALLBACKS::pfnTonePlay */
-static DECLCALLBACK(int) audioTestSvcTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
+/** @copydoc ATSCALLBACKS::pfnTonePlay
+ *
+ *  @note Runs as part of the guest ATS.
+ */
+static DECLCALLBACK(int) audioTestGstAtsTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
@@ -462 +471 @@
 
 /** @copydoc ATSCALLBACKS::pfnToneRecord */
-static DECLCALLBACK(int) audioTestSvcToneRecordCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
+static DECLCALLBACK(int) audioTestGstAtsToneRecordCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
@@ -480 +489 @@
 
         PAUDIOTESTENTRY pTst;
-        rc = AudioTestSetTestBegin(&pTstEnv->Set, "Recording test tone", &TstParms, &pTst);
+        rc = AudioTestSetTestBegin(&pTstEnv->Set, "Recording test tone from host", &TstParms, &pTst);
         if (RT_SUCCESS(rc))
         {
@@ -506 +515 @@
 *   Implementation of audio test environment handling                                                                            *
 *********************************************************************************************************************************/
+
+int audioTestEnvConnectToHostAts(PAUDIOTESTENV pTstEnv,
+                                 const char *pszHostTcpAddr, uint32_t uHostTcpPort)
+{
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting to host ATS at %s:%RU32 ...\n",
+                 (pszHostTcpAddr && *pszHostTcpAddr) ? pszHostTcpAddr : ATS_TCP_HOST_DEFAULT_ADDR_STR,
+                 uHostTcpPort ? uHostTcpPort : ATS_TCP_HOST_DEFAULT_PORT);
+
+    int rc = AudioTestSvcClientConnect(&pTstEnv->u.Host.AtsClValKit, pszHostTcpAddr, uHostTcpPort);
+    if (RT_FAILURE(rc))
+    {
+        RTTestFailed(g_hTest, "Connecting to host ATS failed with %Rrc\n", rc);
+        return rc;
+    }
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connected to host ATS\n");
+    return rc;
+}
+
+int audioTestEnvConnectToGuestAts(PAUDIOTESTENV pTstEnv,
+                                  const char *pszGuestTcpAddr, uint32_t uGuestTcpPort)
+{
+    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Connecting to guest ATS at %s:%RU32 ...\n",
+                 (pszGuestTcpAddr && *pszGuestTcpAddr) ? pszGuestTcpAddr : "127.0.0.1",
+                 uGuestTcpPort ? uGuestTcpPort : ATS_TCP_GUEST_DEFAULT_PORT);
+
+    int rc = AudioTestSvcClientConnect(&pTstEnv->u.Host.AtsClGuest, pszGuestTcpAddr, uGuestTcpPort);
+    if (RT_FAILURE(rc))
+    {
+        RTTestFailed(g_hTest, "Connecting to guest ATS failed with %Rrc\n", rc);
+        return rc;
+    }
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connected to guest ATS\n");
+    return rc;
+}
 
 /**
@@ -550 +595 @@
     }
 
-    if (pDrvReg == NULL) /* Go with the platform's default backend if nothing else is set. */
-        pDrvReg = g_aBackends[0].pDrvReg;
+    if (pDrvReg == NULL)
+    {
+        if (pTstEnv->fSelftest)
+            pDrvReg = &g_DrvHostValidationKitAudio;
+        else /* Go with the platform's default backend if nothing else is set. */
+            pDrvReg = g_aBackends[0].pDrvReg;
+    }
 
     if (!uHostTcpPort)
@@ -571 +621 @@
 
     /* Only the guest mode needs initializing the driver stack. */
-    const bool fUseDriverStack =    pTstEnv->enmMode == AUDIOTESTMODE_GUEST
-                                 /* The self test mode drives the ValKit audio driver locally,
-                                  * so also use the driver stack here. */
-                                 || (   pTstEnv->enmMode == AUDIOTESTMODE_HOST
-                                     && pTstEnv->fSelftest);
+    const bool fUseDriverStack = pTstEnv->enmMode == AUDIOTESTMODE_GUEST;
     if (fUseDriverStack)
     {
@@ -612 +658 @@
 
         ATSCALLBACKS Callbacks;
-        Callbacks.pfnTestSetBegin = audioTestSvcTestSetBeginCallback;
-        Callbacks.pfnTestSetEnd   = audioTestSvcTestSetEndCallback;
-        Callbacks.pfnTonePlay     = audioTestSvcTonePlayCallback;
-        Callbacks.pfnToneRecord   = audioTestSvcToneRecordCallback;
+        Callbacks.pfnTestSetBegin = audioTestGstAtsTestSetBeginCallback;
+        Callbacks.pfnTestSetEnd   = audioTestGstAtsTestSetEndCallback;
+        Callbacks.pfnTonePlay     = audioTestGstAtsTonePlayCallback;
+        Callbacks.pfnToneRecord   = audioTestGstAtsToneRecordCallback;
         Callbacks.pvUser          = &Ctx;
 
@@ -632 +678 @@
 
         if (RT_FAILURE(rc))
-        {
             RTTestFailed(g_hTest, "Starting ATS failed with %Rrc\n", rc);
-            return rc;
-        }
     }
     else /* Host mode */
     {
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting to host ATS at %s:%RU32 ...\n",
-                     (pszHostTcpAddr && *pszHostTcpAddr) ? pszHostTcpAddr : ATS_TCP_HOST_DEFAULT_ADDR_STR,
-                     uHostTcpPort ? uHostTcpPort : ATS_TCP_HOST_DEFAULT_PORT);
-
-        rc = AudioTestSvcClientConnect(&pTstEnv->u.Host.AtsClValKit, pszHostTcpAddr, uHostTcpPort);
-        if (RT_FAILURE(rc))
-        {
-            RTTestFailed(g_hTest, "Connecting to host ATS failed with %Rrc\n", rc);
-            return rc;
-        }
-
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connected to host ATS\n");
-
-        RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Connecting to guest ATS at %s:%RU32 ...\n",
-                     (pszGuestTcpAddr && *pszGuestTcpAddr) ? pszGuestTcpAddr : "127.0.0.1",
-                     uGuestTcpPort ? uGuestTcpPort : ATS_TCP_GUEST_DEFAULT_PORT);
-
-        rc = AudioTestSvcClientConnect(&pTstEnv->u.Host.AtsClGuest, pszGuestTcpAddr, uGuestTcpPort);
-        if (RT_FAILURE(rc))
-        {
-            RTTestFailed(g_hTest, "Connecting to guest ATS failed with %Rrc\n", rc);
-            return rc;
-        }
-
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connected to guest ATS\n");
+        rc = audioTestEnvConnectToHostAts(pTstEnv, pszHostTcpAddr, uHostTcpPort);
+        if (RT_SUCCESS(rc))
+            rc = audioTestEnvConnectToGuestAts(pTstEnv, pszGuestTcpAddr, uGuestTcpPort);
     }
 

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

@@ -410 +410 @@
 /** @}  */
 
+/** @name ATS routines
+ * @{ */
+int         audioTestEnvConnectToHostAts(PAUDIOTESTENV pTstEnv,
+                                         const char *pszHostTcpAddr, uint32_t uHostTcpPort);
+/** @}  */
+
 /** @name Test environment handling
  * @{ */