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

Timestamp:

May 26, 2021 8:23:56 AM (4 years ago)

Author:

vboxsync

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

144632

Message:

Audio/ValKit: Added "--ats-host" to the VKAT selftest command to also enable testing of other ATS instances. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (10 diffs)

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

@@ -279 +279 @@
 {
     VKAT_VERIFY_OPT_TAG = 900
+};
+
+/**
+ * Long option values for the 'selftest' command.
+ */
+enum
+{
+    VKAT_SELFTEST_OPT_ATS_HOST = 900
 };
 
@@ -2569 +2577 @@
 static const RTGETOPTDEF g_aCmdSelftestOptions[] =
 {
+    { "--ats-host",         VKAT_SELFTEST_OPT_ATS_HOST,   RTGETOPT_REQ_STRING },
     { "--backend",          'b',                          RTGETOPT_REQ_STRING  },
     { "--with-drv-audio",   'd',                          RTGETOPT_REQ_NOTHING },
@@ -2645 +2654 @@
  * Tests the Audio Test Service (ATS).
  *
+ * @returns VBox status code.
  * @param   pDrvReg             Backend driver to use.
- * @returns VBox status code.
- */
-static int audioTestDoSelftestSvc(PCPDMDRVREG pDrvReg)
+ * @param   pszAdr              Address of ATS server to connect to.
+ *                              If NULL, an own (local) ATS server will be created.
+ */
+static int audioTestDoSelftestAts(PCPDMDRVREG pDrvReg, const char *pszAdr)
 {
     AUDIOTESTDRVSTACK DrvStack;
@@ -2654 +2665 @@
     if (RT_SUCCESS(rc))
     {
+        /** @todo Make stream parameters configurable. */
         PDMAUDIOPCMPROPS  Props;
         PDMAudioPropsInit(&Props, 16 /* bit */ / 8, true /* fSigned */, 2 /* Channels */, 44100 /* Hz */);
@@ -2676 +2688 @@
                 Callbacks.pvUser      = &Ctx;
 
+                /* Start an own ATS instance if no address to connect was specified. */
                 ATSSERVER Srv;
-                rc = AudioTestSvcInit(&Srv, &Callbacks);
+                if (pszAdr == NULL)
+                {
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Starting ATS ...\n");
+
+                    rc = AudioTestSvcInit(&Srv, &Callbacks);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = AudioTestSvcStart(&Srv);
+                        if (RT_SUCCESS(rc))
+                            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "ATS running\n");
+                    }
+                }
+                else
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting to ATS at '%s' ...\n", pszAdr);
+
                 if (RT_SUCCESS(rc))
                 {
-                    rc = AudioTestSvcStart(&Srv);
+                    ATSCLIENT Conn;
+                    rc = AudioTestSvcClientConnect(&Conn, NULL);
                     if (RT_SUCCESS(rc))
                     {
-                        ATSCLIENT Conn;
-                        rc = AudioTestSvcClientConnect(&Conn, NULL);
-                        if (RT_SUCCESS(rc))
-                        {
-                            /* Do the bare minimum here to get a test tone out. */
-                            AUDIOTESTTONEPARMS ToneParms;
-                            RT_ZERO(ToneParms);
-                            ToneParms.msDuration = 2000;
-                            memcpy(&ToneParms.Props, &CfgAcq.Props, sizeof(PDMAUDIOPCMPROPS));
-
-                            rc = AudioTestSvcClientTonePlay(&Conn, &CfgAcq, &ToneParms);
-
-                            int rc2 = AudioTestSvcClientClose(&Conn);
-                            if (RT_SUCCESS(rc))
-                                rc = rc2;
-                        }
-
-                        int rc2 = AudioTestSvcShutdown(&Srv);
+                        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connected to ATS, testing ...\n");
+
+                        /* Do the bare minimum here to get a test tone out. */
+                        AUDIOTESTTONEPARMS ToneParms;
+                        RT_ZERO(ToneParms);
+                        ToneParms.msDuration = RTRandU32Ex(250, 1000 * 5);
+                        memcpy(&ToneParms.Props, &CfgAcq.Props, sizeof(PDMAUDIOPCMPROPS));
+
+                        rc = AudioTestSvcClientTonePlay(&Conn, &CfgAcq, &ToneParms);
+
+                        int rc2 = AudioTestSvcClientClose(&Conn);
                         if (RT_SUCCESS(rc))
                             rc = rc2;
                     }
-
-                    int rc2 = AudioTestSvcDestroy(&Srv);
+                    else
+                        RTTestFailed(g_hTest, "Connecting to ATS failed, rc=%Rrc\n", rc);
+
+                    int rc2 = AudioTestSvcShutdown(&Srv);
                     if (RT_SUCCESS(rc))
                         rc = rc2;
                 }
+
+                if (pszAdr == NULL)
+                {
+                    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Shutting down ATS ...\n");
+
+                    int rc2 = AudioTestSvcDestroy(&Srv);
+                        if (RT_SUCCESS(rc))
+                            rc = rc2;
+                }
             }
         }
     }
 
+    if (RT_FAILURE(rc))
+        RTTestFailed(g_hTest, "Testing ATS failed with %Rrc\n", rc);
+
     return rc;
 }
@@ -2721 +2756 @@
  * @returns VBox status code.
  * @param   pDrvReg             Backend driver to use.
- */
-static int audioTestDoSelftest(PCPDMDRVREG pDrvReg)
-{
-    int rc = audioTestDoSelftestSvc(pDrvReg);
+ * @param   pszAtsAdr           Address of ATS server to connect to.
+ *                              If NULL, an own (local) ATS server will be created.
+ */
+static int audioTestDoSelftest(PCPDMDRVREG pDrvReg, const char *pszAtsAdr)
+{
+    int rc = audioTestDoSelftestAts(pDrvReg, pszAtsAdr);
     if (RT_FAILURE(rc))
         RTTestFailed(g_hTest, "Self-test failed with: %Rrc", rc);
@@ -2742 +2779 @@
     PCPDMDRVREG pDrvReg           = g_aBackends[0].pDrvReg;
     bool        fWithDrvAudio     = false;
+    char       *pszAtsAddr        = NULL;
 
     /* Argument processing loop: */
@@ -2750 +2788 @@
         switch (rc)
         {
+            case VKAT_SELFTEST_OPT_ATS_HOST:
+            {
+                pszAtsAddr = RTStrDup(ValueUnion.psz);
+                break;
+            }
+
             case 'b':
+            {
                 pDrvReg = NULL;
                 for (uintptr_t i = 0; i < RT_ELEMENTS(g_aBackends); i++)
@@ -2762 +2807 @@
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unknown backend: '%s'", ValueUnion.psz);
                 break;
+            }
 
             case 'd':
+            {
                 fWithDrvAudio = true;
                 break;
+            }
 
             case VINF_GETOPT_NOT_OPTION:
@@ -2779 +2827 @@
     }
 
-    audioTestDoSelftest(pDrvReg);
-        /*
+    audioTestDoSelftest(pDrvReg, pszAtsAddr);
+
+    RTStrFree(pszAtsAddr);
+
+    /*
      * Print summary and exit.
      */