Changeset 89458 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 2, 2021 9:04:06 AM (4 years ago)

Author:

vboxsync

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

144812

Message:

Audio/ValKit: Simplified code a bit by removing unnecessary parameters. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -609 +609 @@
 
     PATSPKTREQTONEPLAY pReq = (PATSPKTREQTONEPLAY)pPktHdr;
-    rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
+    rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->ToneParms);
 
     int rc2 = atsReplyAck(pThis, pClient, pPktHdr);
@@ -640 +640 @@
 
     PATSPKTREQTONEREC pReq = (PATSPKTREQTONEREC)pPktHdr;
-    rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->StreamCfg, &pReq->ToneParms);
+    rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->ToneParms);
 
     int rc2 = atsReplyAck(pThis, pClient, pPktHdr);

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

@@ -56 +56 @@
      * @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));
+    DECLR3CALLBACKMEMBER(int, pfnTonePlay, (void const *pvUser, PAUDIOTESTTONEPARMS pToneParms));
 
     /**
@@ -66 +65 @@
      * @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.
+     * @param   pToneParms      Tone parameters to use for recording.
      */
-    DECLR3CALLBACKMEMBER(int, pfnToneRecord, (void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms));
+    DECLR3CALLBACKMEMBER(int, pfnToneRecord, (void const *pvUser, PAUDIOTESTTONEPARMS pToneParms));
 
     /** Pointer to opaque user-provided context data. */

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

@@ -355 +355 @@
  * @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 AudioTestSvcClientTonePlay(PATSCLIENT pClient, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+int AudioTestSvcClientTonePlay(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms)
 {
     ATSPKTREQTONEPLAY Req;
 
-    memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
     memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 
@@ -380 +378 @@
  * @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)
+int AudioTestSvcClientToneRecord(PATSCLIENT pClient, PAUDIOTESTTONEPARMS pToneParms)
 {
     ATSPKTREQTONEREC Req;
 
-    memcpy(&Req.StreamCfg, pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
     memcpy(&Req.ToneParms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 

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

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

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

@@ -162 +162 @@
     /** Embedded packet header. */
     ATSPKTHDR          Hdr;
-    /** 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;
-#if HC_ARCH_BITS == 64
-    uint8_t            aPadding[4+8];
-#else
-    uint8_t            aPadding[6+8];
-#endif
+    uint8_t            aPadding[8];
 } ATSPKTREQTONEPLAY;
 AssertCompileSizeAlignment(ATSPKTREQTONEPLAY, ATSPKT_ALIGNMENT);
@@ -186 +179 @@
     /** 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
+    uint8_t            aPadding[8];
 } ATSPKTREQTONEREC;
 AssertCompileSizeAlignment(ATSPKTREQTONEREC, ATSPKT_ALIGNMENT);

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

@@ -116 +116 @@
  * Note: Called within server (client serving) thread.
  */
-static DECLCALLBACK(int) drvHostValKitAudioSvcTonePlayCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+static DECLCALLBACK(int) drvHostValKitAudioSvcTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
     PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
@@ -123 +123 @@
     AssertPtrReturn(pTestData, VERR_NO_MEMORY);
 
-    memcpy(&pTestData->StreamCfg,        pStreamCfg, sizeof(PDMAUDIOSTREAMCFG));
     memcpy(&pTestData->t.TestTone.Parms, pToneParms, sizeof(AUDIOTESTTONEPARMS));
 
-    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pStreamCfg->Props, pTestData->t.TestTone.Parms.dbFreqHz);
-
-    pTestData->t.TestTone.cbToWrite = PDMAudioPropsMilliToBytes(&pStreamCfg->Props,
+    AudioTestToneInit(&pTestData->t.TestTone.Tone, &pToneParms->Props, pTestData->t.TestTone.Parms.dbFreqHz);
+
+    pTestData->t.TestTone.cbToWrite = PDMAudioPropsMilliToBytes(&pToneParms->Props,
                                                                 pTestData->t.TestTone.Parms.msDuration);
     int rc = RTCritSectEnter(&pThis->CritSect);