Changeset 90182 in vbox

Timestamp:

Jul 14, 2021 2:13:51 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Use frame size instead of sample size in audioTestToneFileFind(). bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (4 diffs)

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

@@ -398 +398 @@
 
     uint64_t offFound       = 0;
-    int64_t  abSample[_4K];
+    int64_t  abSample[_16K];
 
     size_t   cbRead;
-    uint32_t cConseqSilence = 0;
     for (;;)
     {
@@ -409 +408 @@
             break;
 
-        size_t const cbSample = PDMAudioPropsSampleSize(&pToneParms->Props);
-
-        for (size_t i = 0; i < cbRead / cbSample; i += cbSample) /** @todo Slow as heck, but works for now. */
+        Assert(PDMAudioPropsIsSizeAligned(&pToneParms->Props, cbRead));
+
+        size_t const cbFrame = PDMAudioPropsFrameSize(&pToneParms->Props);
+
+        for (size_t i = 0; i < cbRead / cbFrame; i += cbFrame) /** @todo Slow as heck, but works for now. */
         {
-            bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pToneParms->Props, (const uint8_t *)abSample + i, cbSample);
+            bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pToneParms->Props, (const uint8_t *)abSample + i, cbFrame);
             if (fIsSilence == fFindSilence)
             {
-                offFound += cbSample;
-                cConseqSilence++;
+                offFound += cbFrame;
             }
             else
@@ -2087 +2087 @@
     FileA.hFile     = ObjA.File.hFile;
     FileA.offStart  = audioTestToneFileFind(ObjA.File.hFile, true /* fFindSilence */, 0 /* uOff */, &ToneParmsA);
-    FileA.cbSize    = RT_MIN(audioTestToneFileFind(ObjA.File.hFile, false /* fFindSilence */, FileA.offStart,  &ToneParmsA) + 1,
+    FileA.cbSize    = RT_MIN(audioTestToneFileFind(ObjA.File.hFile, false /* fFindSilence */, FileA.offStart, &ToneParmsA),
                              cbSizeA);
 
@@ -2098 +2098 @@
     FileB.hFile     = ObjB.File.hFile;
     FileB.offStart  = audioTestToneFileFind(ObjB.File.hFile, true /* fFindSilence */, 0 /* uOff */, &ToneParmsB);
-    FileB.cbSize    = RT_MIN(audioTestToneFileFind(ObjB.File.hFile, false /* fFindSilence */, FileB.offStart,  &ToneParmsB),
+    FileB.cbSize    = RT_MIN(audioTestToneFileFind(ObjB.File.hFile, false /* fFindSilence */, FileB.offStart, &ToneParmsB),
                              cbSizeB);
 
     Log2Func(("Test #%RU32\n", pVerJob->idxTest));
-    Log2Func(("File A ('%s'): cbOff=%RU64  cbSize=%RU64, cbFileSize=%RU64\n", ObjA.szName, FileA.offStart, FileA.cbSize - FileA.offStart, cbSizeA));
-    Log2Func(("File B ('%s'): cbOff=%RU64, cbSize=%RU64, cbFileSize=%RU64\n", ObjB.szName, FileB.offStart, FileB.cbSize - FileB.offStart, cbSizeB));
+    Log2Func(("File A ('%s'): cbOff=%RU64  cbSize=%RU64, cbFileSize=%RU64\n", ObjA.szName, FileA.offStart, FileA.cbSize, cbSizeA));
+    Log2Func(("File B ('%s'): cbOff=%RU64, cbSize=%RU64, cbFileSize=%RU64\n", ObjB.szName, FileB.offStart, FileB.cbSize, cbSizeB));
 
     uint32_t const cDiffs = audioTestFilesFindDiffsBinary(&FileA, &FileB, &ToneParmsA);