Changeset 89685 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 14, 2021 3:41:09 PM (4 years ago)

Author:

vboxsync

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

145133

Message:

Audio/ValKit: Implemented support for downloading (host) test sets. ​bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTestServiceClient.cpp (modified) (1 diff)
• DrvHostAudioValidationKit.cpp (modified) (8 diffs)

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

@@ -475 +475 @@
         }
         else
-            AssertFailedStmt(rc = VERR_NET_PROTOCOL_ERROR);
+        {
+            AssertMsgFailed(("Got unexpected reply '%s'", Reply.szOp));
+            rc = VERR_NET_PROTOCOL_ERROR;
+        }
 
         audioTestSvcClientReplyDestroy(&Reply);

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

@@ -77 +77 @@
     } u;
     /** The test tone instance to use. */
-    AUDIOTESTTONE      Tone;
+    AUDIOTESTTONE              Tone;
     /** The test tone parameters to use. */
-    AUDIOTESTTONEPARMS Parms;
+    AUDIOTESTTONEPARMS         Parms;
 } VALKITTESTTONEDATA;
 
@@ -140 +140 @@
     /** The Audio Test Service (ATS) instance. */
     ATSSERVER           Srv;
+    /** Absolute path to the packed up test set archive.
+     *  Keep it simple for now and only support one (open) archive at a time. */
+    char                szTestSetArchive[RTPATH_MAX];
+    /** File handle to the (opened) test set archive for reading. */
+    RTFILE              hTestSetArchive;
+
 } DRVHOSTVALKITAUDIO;
 /** Pointer to a Validation Kit host audio driver instance. */
 typedef DRVHOSTVALKITAUDIO *PDRVHOSTVALKITAUDIO;
 
+
+/*********************************************************************************************************************************
+*   Internal test handling code                                                                                                  *
+*********************************************************************************************************************************/
 
 /**
@@ -210 +220 @@
 }
 
+
+/*********************************************************************************************************************************
+*   ATS callback implementations                                                                                                 *
+*********************************************************************************************************************************/
+
 /** @copydoc ATSCALLBACKS::pfnTestSetEnd */
 static DECLCALLBACK(int) drvHostValKitTestSetEnd(void const *pvUser, const char *pszTag)
@@ -224 +239 @@
     /* Before destroying the test environment, pack up the test set so
      * that it's ready for transmission. */
-    char szFileOut[RTPATH_MAX];
-    int rc = AudioTestSetPack(pSet, pThis->szPathOut, szFileOut, sizeof(szFileOut));
-    if (RT_SUCCESS(rc))
-        LogRel(("Audio: Validation Kit: Packed up to '%s'\n", szFileOut));
+    int rc = AudioTestSetPack(pSet, pThis->szPathOut, pThis->szTestSetArchive, sizeof(pThis->szTestSetArchive));
+    if (RT_SUCCESS(rc))
+        LogRel(("Audio: Validation Kit: Packed up to '%s'\n", pThis->szTestSetArchive));
 
     int rc2 = AudioTestSetWipe(pSet);
@@ -236 +250 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("Audio: Validation Kit: Test set prologue failed with %Rrc\n", rc));
+        LogRel(("Audio: Validation Kit: Ending test set failed with %Rrc\n", rc));
 
     return rc;
@@ -312 +326 @@
     return VINF_SUCCESS;
 }
+
+/** @copydoc ATSCALLBACKS::pfnTestSetSendBegin */
+static DECLCALLBACK(int) drvHostValKitTestSetSendBeginCallback(void const *pvUser, const char *pszTag)
+{
+    RT_NOREF(pszTag);
+
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    if (!RTFileExists(pThis->szTestSetArchive)) /* Has the archive successfully been created yet? */
+        return VERR_WRONG_ORDER;
+
+    int rc = RTFileOpen(&pThis->hTestSetArchive, pThis->szTestSetArchive, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    if (RT_SUCCESS(rc))
+    {
+        uint64_t uSize;
+        rc = RTFileQuerySize(pThis->hTestSetArchive, &uSize);
+        if (RT_SUCCESS(rc))
+            LogRel(("Audio: Validation Kit: Sending test set '%s' (%zu bytes)\n", pThis->szTestSetArchive, uSize));
+    }
+
+    return rc;
+}
+
+/** @copydoc ATSCALLBACKS::pfnTestSetSendRead */
+static DECLCALLBACK(int) drvHostValKitTestSetSendReadCallback(void const *pvUser,
+                                                              const char *pszTag, void *pvBuf, size_t cbBuf, size_t *pcbRead)
+{
+    RT_NOREF(pszTag);
+
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    return RTFileRead(pThis->hTestSetArchive, pvBuf, cbBuf, pcbRead);
+}
+
+/** @copydoc ATSCALLBACKS::pfnTestSetSendEnd */
+static DECLCALLBACK(int) drvHostValKitTestSetSendEndCallback(void const *pvUser, const char *pszTag)
+{
+    RT_NOREF(pszTag);
+
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    int rc = RTFileClose(pThis->hTestSetArchive);
+    if (RT_SUCCESS(rc))
+    {
+        pThis->hTestSetArchive = NIL_RTFILE;
+    }
+
+    return rc;
+}
+
+
+/*********************************************************************************************************************************
+*   PDMIHOSTAUDIO interface implementation                                                                                       *
+*********************************************************************************************************************************/
 
 /**
@@ -363 +431 @@
     return rc;
 }
-
 
 /**
@@ -742 +809 @@
 
     ATSCALLBACKS Callbacks;
-    Callbacks.pfnTestSetBegin = drvHostValKitTestSetBegin;
-    Callbacks.pfnTestSetEnd   = drvHostValKitTestSetEnd;
-    Callbacks.pfnTonePlay     = drvHostValKitRegisterGuestRecTest;
-    Callbacks.pfnToneRecord   = drvHostValKitRegisterGuestPlayTest;
-    Callbacks.pvUser          = pThis;
+    RT_ZERO(Callbacks);
+    Callbacks.pfnTestSetBegin     = drvHostValKitTestSetBegin;
+    Callbacks.pfnTestSetEnd       = drvHostValKitTestSetEnd;
+    Callbacks.pfnTonePlay         = drvHostValKitRegisterGuestRecTest;
+    Callbacks.pfnToneRecord       = drvHostValKitRegisterGuestPlayTest;
+    Callbacks.pfnTestSetSendBegin = drvHostValKitTestSetSendBeginCallback;
+    Callbacks.pfnTestSetSendRead  = drvHostValKitTestSetSendReadCallback;
+    Callbacks.pfnTestSetSendEnd   = drvHostValKitTestSetSendEndCallback;
+    Callbacks.pvUser              = pThis;
 
     /** @todo Make this configurable via CFGM. */