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

Timestamp:

Jun 2, 2021 8:43:16 AM (4 years ago)

Author:

vboxsync

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

144810

Message:

Audio/ValKit: More code for recording tests. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -588 +588 @@
 
 /**
- * Verifies and processes a "TONE PLAY" request.
+ * Verifies and processes a "TN PLY" request.
  *
  * @returns IPRT status code.
@@ -610 +610 @@
     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;
+}
+
+/**
+ * Verifies and processes a "TN REC" request.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               The ATS instance.
+ * @param   pClient             The ATS client structure.
+ * @param   pPktHdr             The packet header.
+ */
+static int atsDoToneRecord(PATSSERVER pThis, PATSCLIENTINST pClient, PCATSPKTHDR pPktHdr)
+{
+    int rc = VINF_SUCCESS;
+
+    if (pPktHdr->cb < sizeof(ATSPKTREQTONEREC))
+        return atsReplyBadSize(pThis, pClient, pPktHdr, sizeof(ATSPKTREQTONEREC));
+
+    if (pClient->enmState != ATSCLIENTSTATE_READY)
+        return atsReplyInvalidState(pThis, pClient, pPktHdr);
+
+    if (!pThis->Callbacks.pfnToneRecord)
+        return atsReplyRC(pThis, pClient, pPktHdr, VERR_NOT_SUPPORTED, "Recording tones not supported");
+
+    PATSPKTREQTONEREC pReq = (PATSPKTREQTONEREC)pPktHdr;
+    rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
 
     int rc2 = atsReplyAck(pThis, pClient, pPktHdr);
@@ -651 +682 @@
     else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_TONE_PLAY))
         rc = atsDoTonePlay(pThis, pClient, pPktHdr);
+    else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_TONE_RECORD))
+        rc = atsDoToneRecord(pThis, pClient, pPktHdr);
     /* Misc: */
     else

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

@@ -60 +60 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnTonePlay, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
+
+    /**
+     * Records 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   cMsDelay        Delay (in ms) before start recording.
+     * @param   cMsDuration     Duration (in ms) to record.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnToneRecord, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
+
     /** Pointer to opaque user-provided context data. */
     void const *pvUser;

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

@@ -376 +376 @@
 
 /**
+ * Tells the server to record a (test) tone.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to issue command for.
+ * @param   pStreamCfg          Audio stream configuration to use.
+ * @param   pToneParms          Tone parameters to use.
+ * @note    How (and if) the server plays a tone depends on the actual implementation side.
+ */
+int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+{
+    ATSPKTREQTONEREC Req;
+
+    memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
+    memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
+
+    audioTestSvcClientReqHdrInit(&Req.Hdr, sizeof(Req), ATSPKT_OPCODE_TONE_RECORD, 0);
+
+    int rc = audioTestSvcClientSendMsg(pClient, &Req, sizeof(Req), NULL, 0);
+    if (RT_SUCCESS(rc))
+        rc = audioTestSvcClientRecvAck(pClient);
+
+    return rc;
+}
+
+/**
  * Disconnects from an ATS server.
  *

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

@@ -34 +34 @@
 int AudioTestSvcClientTestSetEnd(PATSCLIENT pClient, const char *pszTag);
 int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms);
+int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms);
 int AudioTestSvcClientClose(PATSCLIENT pClient);
 

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

@@ -153 +153 @@
 typedef ATSPKTREQTSETEND *PATSPKTREQTSETEND;
 
-#define ATSPKT_OPCODE_TONE_PLAY         "TNPLY   "
-
-/**
- * The TONE PLAY request structure.
+#define ATSPKT_OPCODE_TONE_PLAY         "TN PLY  "
+
+/**
+ * The TN PLY request structure.
  */
 typedef struct ATSPKTREQTONEPLAY
@@ -177 +177 @@
 typedef ATSPKTREQTONEPLAY *PATSPKTREQTONEPLAY;
 
+#define ATSPKT_OPCODE_TONE_RECORD       "TN REC  "
+
+/**
+ * The TN REC request structure.
+ */
+typedef struct ATSPKTREQTONEREC
+{
+    /** Embedded packet header. */
+    ATSPKTHDR          Hdr;
+    /** Stream configuration to use for recording 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;
+#if HC_ARCH_BITS == 64
+    uint8_t            aPadding[4+8];
+#else
+    uint8_t            aPadding[6+8];
+#endif
+} ATSPKTREQTONEREC;
+AssertCompileSizeAlignment(ATSPKTREQTONEREC, ATSPKT_ALIGNMENT);
+/** Pointer to a ATSPKTREQTONEREC structure. */
+typedef ATSPKTREQTONEREC *PATSPKTREQTONEREC;
+
 /* No additional structure for the reply (just standard STATUS packet). */