Changeset 89490 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 3, 2021 11:00:04 PM (4 years ago)

Author:

vboxsync

Message:

ValKit/AudioTest: Simplified PDMIAUDIOCONNECTOR::pfnStreamCreate by moving the acquired configuration to the resulting stream (PDMAUDIOSTREAM::Cfg). bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (2 diffs)
• vkatDriverStack.cpp (modified) (9 diffs)
• vkatInternal.h (modified) (1 diff)

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

@@ -1960 +1960 @@
                 {
                     if (g_uVerbosity > 0)
-                        RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n", PDMAudioPropsToString(&pStream->Props, szTmp, sizeof(szTmp)),
+                        RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n",
+                                  PDMAudioPropsToString(&pStream->Cfg.Props, szTmp, sizeof(szTmp)),
                                   pStream->cbBackend, fWithMixer ? " mixed" : "");
 
@@ -2247 +2248 @@
                     char szTmp[128];
                     if (g_uVerbosity > 0)
-                        RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n", PDMAudioPropsToString(&pStream->Props, szTmp, sizeof(szTmp)),
+                        RTMsgInfo("Stream: %s cbBackend=%#RX32%s\n",
+                                  PDMAudioPropsToString(&pStream->Cfg.Props, szTmp, sizeof(szTmp)),
                                   pStream->cbBackend, fWithMixer ? " mixed" : "");
 

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

@@ -579 +579 @@
  *                      success (not used as input).
  */
-static int audioTestDriverStackStreamCreate(PAUDIOTESTDRVSTACK pDrvStack, PPDMAUDIOSTREAMCFG pCfgReq,
+static int audioTestDriverStackStreamCreate(PAUDIOTESTDRVSTACK pDrvStack, PCPDMAUDIOSTREAMCFG pCfgReq,
                                             PPDMAUDIOSTREAM *ppStream, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
@@ -591 +591 @@
          * DrvAudio does most of the work here.
          */
-        PDMAUDIOSTREAMCFG CfgGst = *pCfgReq;
-        rc = pDrvStack->pIAudioConnector->pfnStreamCreate(pDrvStack->pIAudioConnector, PDMAUDIOSTREAM_CREATE_F_NO_MIXBUF,
-                                                          pCfgReq, &CfgGst, ppStream);
+        rc = pDrvStack->pIAudioConnector->pfnStreamCreate(pDrvStack->pIAudioConnector, 0 /*fFlags*/, pCfgReq, ppStream);
         if (RT_SUCCESS(rc))
         {
-            *pCfgAcq = *pCfgReq; /** @todo PDMIAUDIOCONNECTOR::pfnStreamCreate only does one utterly pointless change to the two configs (enmLayout) from what I can tell... */
-            pCfgAcq->Props = (*ppStream)->Props;
+            *pCfgAcq = (*ppStream)->Cfg;
             RTMsgInfo("Created backend stream: %s\n", PDMAudioStrmCfgToString(pCfgReq, szTmp, sizeof(szTmp)));
             return rc;
@@ -623 +620 @@
                 {
                     pStreamAt->Core.uMagic     = PDMAUDIOSTREAM_MAGIC;
-                    pStreamAt->Core.enmDir     = pCfgReq->enmDir;
+                    pStreamAt->Core.Cfg        = *pCfgReq;
                     pStreamAt->Core.cbBackend  = cbStream;
-                    pStreamAt->Core.Props      = pCfgReq->Props;
-                    RTStrPrintf(pStreamAt->Core.szName, sizeof(pStreamAt->Core.szName), pCfgReq->szName);
 
                     pStreamAt->Backend.uMagic  = PDMAUDIOBACKENDSTREAM_MAGIC;
@@ -634 +629 @@
                      * Call the backend to create the stream.
                      */
-                    pStreamAt->Cfg = *pCfgReq;
-
                     rc = pDrvStack->pIHostAudio->pfnStreamCreate(pDrvStack->pIHostAudio, &pStreamAt->Backend,
-                                                                 pCfgReq, &pStreamAt->Cfg);
+                                                                 pCfgReq, &pStreamAt->Core.Cfg);
                     if (RT_SUCCESS(rc))
                     {
-                        pStreamAt->Core.Props = pStreamAt->Cfg.Props;
                         if (g_uVerbosity > 1)
                             RTMsgInfo("Created backend stream: %s\n",
-                                      PDMAudioStrmCfgToString(&pStreamAt->Cfg, szTmp, sizeof(szTmp)));
+                                      PDMAudioStrmCfgToString(&pStreamAt->Core.Cfg, szTmp, sizeof(szTmp)));
 
                         /* Return if stream is ready: */
@@ -649 +641 @@
                         {
                             *ppStream = &pStreamAt->Core;
-                            *pCfgAcq  = pStreamAt->Cfg;
+                            *pCfgAcq  = pStreamAt->Core.Cfg;
                             return VINF_SUCCESS;
                         }
@@ -662 +654 @@
                             {
                                 *ppStream = &pStreamAt->Core;
-                                *pCfgAcq  = pStreamAt->Cfg;
+                                *pCfgAcq  = pStreamAt->Core.Cfg;
                                 return VINF_SUCCESS;
                             }
@@ -1144 +1136 @@
     if (!pProps)
     {
-        pMix->pProps = &pStream->Props;
+        pMix->pProps = &pStream->Cfg.Props;
         return VINF_SUCCESS;
     }
@@ -1158 +1150 @@
         pMix->pProps = &pMix->MixBuf.Props;
 
-        if (pStream->enmDir == PDMAUDIODIR_IN)
+        if (pStream->Cfg.enmDir == PDMAUDIODIR_IN)
         {
             rc = AudioMixBufInitPeekState(&pMix->MixBuf, &pMix->PeekState, &pMix->MixBuf.Props);
             if (RT_SUCCESS(rc))
             {
-                rc = AudioMixBufInitWriteState(&pMix->MixBuf, &pMix->WriteState, &pStream->Props);
+                rc = AudioMixBufInitWriteState(&pMix->MixBuf, &pMix->WriteState, &pStream->Cfg.Props);
                 if (RT_SUCCESS(rc))
                     return rc;
             }
         }
-        else if (pStream->enmDir == PDMAUDIODIR_OUT)
+        else if (pStream->Cfg.enmDir == PDMAUDIODIR_OUT)
         {
             rc = AudioMixBufInitWriteState(&pMix->MixBuf, &pMix->WriteState, &pMix->MixBuf.Props);
             if (RT_SUCCESS(rc))
             {
-                rc = AudioMixBufInitPeekState(&pMix->MixBuf, &pMix->PeekState, &pStream->Props);
+                rc = AudioMixBufInitPeekState(&pMix->MixBuf, &pMix->PeekState, &pStream->Cfg.Props);
                 if (RT_SUCCESS(rc))
                     return rc;
@@ -1216 +1208 @@
 {
     uint8_t abBuf[16384];
-    if (pMix->pStream->enmDir == PDMAUDIODIR_IN)
-    {
-        //uint32_t const cbBuf = PDMAudioPropsFloorBytesToFrame(&pMix->pStream->Props, sizeof(abBuf));
+    if (pMix->pStream->Cfg.enmDir == PDMAUDIODIR_IN)
+    {
+        //uint32_t const cbBuf = PDMAudioPropsFloorBytesToFrame(&pMix->pStream->Cfg.Props, sizeof(abBuf));
 
     }

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -68 +68 @@
     /** The public stream data. */
     PDMAUDIOSTREAM          Core;
-    /** The acquired config. */
-    PDMAUDIOSTREAMCFG       Cfg;
     /** The backend data (variable size). */
     PDMAUDIOBACKENDSTREAM   Backend;