Changeset 89435 in vbox

Timestamp:

Jun 1, 2021 1:30:30 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Made buffering / pre-buffering and scheduling hint sizes more flexible. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (8 diffs)

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

@@ -184 +184 @@
     /** Temporary path for this test environment. */
     char                    szPathTemp[RTPATH_MAX];
+    /** Buffer size (in ms). */
+    RTMSINTERVAL            cMsBufferSize;
+    /** Pre-buffering time (in ms). */
+    RTMSINTERVAL            cMsPreBuffer;
+    /** Scheduling hint (in ms). */
+    RTMSINTERVAL            cMsSchedulingHint;
     /** The audio test driver stack. */
     AUDIOTESTDRVSTACK       DrvStack;
@@ -430 +436 @@
         uint8_t  abBuf[_4K];
 
-        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
-        const uint32_t cbPerMs       = PDMAudioPropsMilliToBytes(&pParms->Props, cSchedulingMs);
+        const uint32_t cbPerMs       = PDMAudioPropsMilliToBytes(&pParms->Props, pTstEnv->cMsSchedulingHint);
               uint32_t cbToWrite     = PDMAudioPropsMilliToBytes(&pParms->Props, pParms->msDuration);
 
-        AudioTestSetObjAddMetadataStr(pObj, "schedule_ms=%RU16", cSchedulingMs);
+        AudioTestSetObjAddMetadataStr(pObj, "buffer_size_ms=%RU32", pTstEnv->cMsBufferSize);
+        AudioTestSetObjAddMetadataStr(pObj, "prebuf_size_ms=%RU32", pTstEnv->cMsPreBuffer);
+        AudioTestSetObjAddMetadataStr(pObj, "scheduling_hint_ms=%RU32", pTstEnv->cMsSchedulingHint);
 
         while (cbToWrite)
         {
             uint32_t cbWritten    = 0;
-            uint32_t cbToGenerate = RT_MIN(cbToWrite, RT_MIN(cbPerMs, (uint32_t)sizeof(abBuf)));
+            uint32_t cbToGenerate = RT_MIN(cbToWrite, RT_MIN(cbPerMs, sizeof(abBuf)));
             Assert(cbToGenerate);
 
@@ -455 +462 @@
                 break;
 
-            RTThreadSleep(cSchedulingMs);
+            RTThreadSleep(pTstEnv->cMsSchedulingHint);
 
             Assert(cbToWrite >= cbWritten);
@@ -573 +580 @@
     PDMAudioHostEnumInit(&pTstEnv->DevEnum);
 
+    pTstEnv->cMsBufferSize     = 300; /* ms */ /** @todo Randomize this also? */
+    pTstEnv->cMsPreBuffer      = 150; /* ms */ /** @todo Ditto. */
+    pTstEnv->cMsSchedulingHint = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
+
     /* Only the guest mode needs initializing the driver stack. */
     const bool fUseDriverStack = pTstEnv->enmMode == AUDIOTESTMODE_GUEST;
@@ -858 +869 @@
 {
     pStream->pBackend = NULL;
-    int rc = audioTestDriverStackStreamCreateInput(&pTstEnv->DrvStack, pProps, 300 /*cMsBufferSize*/, 150 /*cMsPreBuffer*/,
-                                                   10 /*cMsSchedulingHint*/, &pStream->pStream, &pStream->Cfg);
+    int rc = audioTestDriverStackStreamCreateInput(&pTstEnv->DrvStack, pProps, pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer,
+                                                   pTstEnv->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
     if (RT_SUCCESS(rc) && !pTstEnv->DrvStack.pIAudioConnector)
         pStream->pBackend = &((PAUDIOTESTDRVSTACKSTREAM)pStream->pStream)->Backend;
@@ -892 +903 @@
 
         const uint64_t tsStartMs     = RTTimeMilliTS();
-        const uint16_t cSchedulingMs = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
 
         do
@@ -907 +917 @@
                 break;
 
-            RTThreadSleep(cSchedulingMs);
+            RTThreadSleep(pTstEnv->cMsSchedulingHint);
 
         } while (RT_SUCCESS(rc));
@@ -933 +943 @@
 {
     pStream->pBackend = NULL;
-    int rc = audioTestDriverStackStreamCreateOutput(&pTstEnv->DrvStack, pProps, 300 /*cMsBufferSize*/, 200 /*cMsPreBuffer*/,
-                                                    10 /*cMsSchedulingHint*/, &pStream->pStream, &pStream->Cfg);
+    int rc = audioTestDriverStackStreamCreateOutput(&pTstEnv->DrvStack, pProps, pTstEnv->cMsBufferSize, pTstEnv->cMsPreBuffer,
+                                                    pTstEnv->cMsSchedulingHint, &pStream->pStream, &pStream->Cfg);
     if (RT_SUCCESS(rc) && !pTstEnv->DrvStack.pIAudioConnector)
         pStream->pBackend = &((PAUDIOTESTDRVSTACKSTREAM)pStream->pStream)->Backend;