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

Timestamp:

May 31, 2021 8:58:14 PM (4 years ago)

Author:

vboxsync

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

144770

Message:

ValKit/AudioTest: DrvAudio doesn't do any push back worth speaking of if the device hasn't finished initializing the stream, so pace ourselves a little when playing. Reduced unnecessary includes in the driver stack file. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (4 diffs)
• vkatDriverStack.cpp (modified) (2 diffs)

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

@@ -1604 +1604 @@
                 if (RT_SUCCESS(rc))
                 {
-                    uint64_t const  nsStarted = RTTimeNanoTS();
+                    uint32_t const  cbPreBuffer = PDMAudioPropsFramesToBytes(&pStream->Props, CfgAcq.Backend.cFramesPreBuffering);
+                    uint64_t const  nsStarted   = RTTimeNanoTS();
 
                     /*
@@ -1611 +1612 @@
                     uint8_t         abSamples[16384];
                     uint32_t const  cbSamplesAligned = PDMAudioPropsFloorBytesToFrame(&pStream->Props, sizeof(abSamples));
+                    uint64_t        offStream        = 0;
                     for (;;)
                     {
@@ -1618 +1620 @@
                         if (RT_SUCCESS(rc) && cbSamples > 0)
                         {
+                            /* Pace ourselves a little. */
+                            if (offStream >= cbPreBuffer)
+                            {
+                                uint64_t const cNsWritten = PDMAudioPropsBytesToNano64(&pStream->Props, offStream);
+                                uint64_t const cNsElapsed = RTTimeNanoTS() - nsStarted;
+                                if (cNsWritten + RT_NS_10MS > cNsElapsed)
+                                    RTThreadSleep((cNsWritten - cNsElapsed - RT_NS_10MS / 2) / RT_NS_1MS);
+                            }
+
                             /* Transfer the data to the audio stream. */
                             for (uint32_t offSamples = 0; offSamples < cbSamples;)
@@ -1631 +1642 @@
                                     {
                                         if (cbPlayed)
+                                        {
                                             offSamples += cbPlayed;
+                                            offStream  += cbPlayed;
+                                        }
                                         else
                                         {

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/buildconfig.h>
-#include <iprt/ctype.h>
-#include <iprt/dir.h>
 #include <iprt/errcore.h>
-#include <iprt/initterm.h>
-#include <iprt/getopt.h>
 #include <iprt/message.h>
-#include <iprt/path.h>
-#include <iprt/process.h>
-#include <iprt/rand.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -44 +36 @@
 #include <iprt/test.h>
 
-#include <package-generated.h>
-#include "product-generated.h"
-
-#include <VBox/version.h>
-#include <VBox/log.h>
-
-#ifdef RT_OS_WINDOWS
-# include <iprt/win/windows.h> /* for CoInitializeEx */
-#endif
 
 /**