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

Timestamp:

May 21, 2021 3:02:10 PM (4 years ago)

Author:

vboxsync

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

144569

Message:

Audio/ValKit: Initial support for the audio test execution service (ATS) to support playing test tones. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTestService.cpp (modified) (3 diffs)
• AudioTestService.h (modified) (3 diffs)
• AudioTestServiceClient.cpp (modified) (1 diff)
• AudioTestServiceClient.h (modified) (1 diff)
• AudioTestServiceProtocol.h (modified) (1 diff)

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

@@ -536 +536 @@
         return atsReplyInvalidState(pThis, pClient, pPktHdr);
 
+    if (!pThis->Callbacks.pfnTonePlay)
+        return atsReplyRC(pThis, pClient, pPktHdr, VERR_NOT_SUPPORTED, "Playing tones not supported");
+
+    PATSPKTREQTONEPLAY pReq = (PATSPKTREQTONEPLAY)pPktHdr;
+    rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
+
+    int rc2 = atsReplyAck(pThis, pClient, pPktHdr);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
     return rc;
 }
@@ -564 +574 @@
     else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_BYE))
         rc = atsDoBye(pThis, pClient, pPktHdr);
-    /* Gadget API. */
+    /* Audio testing: */
     else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_TONE_PLAY))
         rc = atsDoTonePlay(pThis, pClient, pPktHdr);
@@ -762 +772 @@
  * @param   pThis               The ATS instance.
  *  */
-int AudioTestSvcInit(PATSSERVER pThis)
-{
+int AudioTestSvcInit(PATSSERVER pThis, PCATSCALLBACKS pCallbacks)
+{
+    memcpy(&pThis->Callbacks, pCallbacks, sizeof(ATSCALLBACKS));
+
     pThis->fStarted   = false;
     pThis->fTerminate = false;

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

@@ -26 +26 @@
 
 /**
+ * Structure for keeping an Audio Test Server (ATS) callback table.
+ */
+typedef struct ATSCALLBACKS
+{
+    /**
+     * Plays a test tone.
+     *
+     * @returns VBox status code.
+     * @param   pvUser          User-supplied pointer to context data. Optional.
+     * @param   pStreamCfg      Audio stream configuration to use for stream to play tone on.
+     * @param   pToneParms      Tone parameters to use for playback.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnTonePlay, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
+    /** Pointer to opaque user-provided context data. */
+    void const *pvUser;
+} ATSCALLBACKS;
+/** Pointer to a const ATS callbacks table. */
+typedef const struct ATSCALLBACKS *PCATSCALLBACKS;
+
+/**
  * Structure for keeping an Audio Test Server (ATS) instance.
  */
@@ -32 +52 @@
     /** The selected transport layer. */
     PCATSTRANSPORT       pTransport;
+    /** The callbacks table. */
+    ATSCALLBACKS         Callbacks;
     /** Whether server is in started state or not. */
     bool volatile        fStarted;
@@ -55 +77 @@
 
 
-int AudioTestSvcInit(PATSSERVER pThis);
+int AudioTestSvcInit(PATSSERVER pThis, PCATSCALLBACKS pCallbacks);
 int AudioTestSvcDestroy(PATSSERVER pThis);
 int AudioTestSvcStart(PATSSERVER pThis);

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

@@ -227 +227 @@
 }
 
+int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+{
+    ATSPKTREQTONEPLAY Req;
+
+    memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
+    memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
+
+    audioTestSvcClientReqHdrInit(&Req.Hdr, sizeof(Req), ATSPKT_OPCODE_TONE_PLAY, 0);
+
+    int rc = audioTestSvcClientSendMsg(pClient, &Req, sizeof(Req), NULL, 0);
+    if (RT_SUCCESS(rc))
+        rc = audioTestSvcClientRecvAck(pClient);
+
+    return rc;
+}
+
 int AudioTestSvcClientClose(PATSCLIENT pClient)
 {

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

@@ -31 +31 @@
 
 int AudioTestSvcClientConnect(PATSCLIENT pClient, const char *pszAddr);
+int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms);
 int AudioTestSvcClientClose(PATSCLIENT pClient);
 

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

@@ -130 +130 @@
     /** Embedded packet header. */
     ATSPKTHDR          Hdr;
-    AUDIOTESTTONEPARMS Parms;
-    uint8_t            au8Padding[8];
+    /** Stream configuration to use for playing the tone.
+     *  Note: Depending on the actual implementation this configuration might or might not be available / supported. */
+    PDMAUDIOSTREAMCFG  StreamCfg;
+    /** Test tone parameters for playback. */
+    AUDIOTESTTONEPARMS ToneParms;
 } ATSPKTREQTONEPLAY;
 AssertCompileSizeAlignment(ATSPKTREQTONEPLAY, ATSPKT_ALIGNMENT);