Changeset 92210 in vbox for trunk

Timestamp:

Nov 4, 2021 9:39:02 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Renaming. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (9 diffs)
• AudioTest.h (modified) (1 diff)

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

@@ -2348 +2348 @@
     memcpy(&pBeacon->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
 
-    pBeacon->cbToProcess = PDMAudioPropsFramesToBytes(&pBeacon->Props, AUDIOTEST_BEACON_SIZE_FRAMES);
+    pBeacon->cbSize = PDMAudioPropsFramesToBytes(&pBeacon->Props, AUDIOTEST_BEACON_SIZE_FRAMES);
 }
 
@@ -2380 +2380 @@
 uint32_t AudioTestBeaconGetSize(PCAUDIOTESTTONEBEACON pBeacon)
 {
-    return pBeacon->cbToProcess;
+    return pBeacon->cbSize;
 }
 
@@ -2402 +2402 @@
 uint32_t AudioTestBeaconGetRemaining(PCAUDIOTESTTONEBEACON pBeacon)
 {
-    return pBeacon->cbToProcess - pBeacon->cbProcessed;
+    return pBeacon->cbSize - pBeacon->cbUsed;
 }
 
@@ -2413 +2413 @@
 uint32_t AudioTestBeaconGetUsed(PCAUDIOTESTTONEBEACON pBeacon)
 {
-    return pBeacon->cbProcessed;
+    return pBeacon->cbUsed;
 }
 
@@ -2426 +2426 @@
 int AudioTestBeaconWrite(PAUDIOTESTTONEBEACON pBeacon, void *pvBuf, uint32_t cbBuf)
 {
-    AssertReturn(pBeacon->cbProcessed + cbBuf <= pBeacon->cbToProcess, VERR_BUFFER_OVERFLOW);
+    AssertReturn(pBeacon->cbUsed + cbBuf <= pBeacon->cbSize, VERR_BUFFER_OVERFLOW);
 
     memset(pvBuf, AudioTestBeaconByteFromType(pBeacon->enmType), cbBuf);
 
-    pBeacon->cbProcessed += cbBuf;
+    pBeacon->cbUsed += cbBuf;
 
     return VINF_SUCCESS;
@@ -2483 +2483 @@
 
     unsigned const cbStep             = cbFrameSize;
-    uint32_t const cbProcessedInitial = pBeacon->cbProcessed;
+    uint32_t const cbProcessedInitial = pBeacon->cbUsed;
 
     for (size_t i = 0; i < cbBuf; i += cbStep)
@@ -2494 +2494 @@
             if (offGap)
             {
-                pBeacon->cbProcessed = 0;
+                pBeacon->cbUsed = 0;
             }
-            pBeacon->cbProcessed += cbStep;
+            pBeacon->cbUsed += cbStep;
             offGap = 0;
         }
@@ -2503 +2503 @@
     }
 
-    Assert(pBeacon->cbProcessed >= cbProcessedInitial);
-    return pBeacon->cbProcessed - cbProcessedInitial;
+    Assert(pBeacon->cbUsed >= cbProcessedInitial);
+    return pBeacon->cbUsed - cbProcessedInitial;
 }
 
@@ -2517 +2517 @@
 bool AudioTestBeaconIsComplete(PCAUDIOTESTTONEBEACON pBeacon)
 {
-    AssertReturn(pBeacon->cbProcessed <= pBeacon->cbToProcess, true);
-    return (pBeacon->cbProcessed == pBeacon->cbToProcess);
+    AssertReturn(pBeacon->cbUsed <= pBeacon->cbSize, true);
+    return (pBeacon->cbUsed == pBeacon->cbSize);
 }
 

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

@@ -154 +154 @@
      *  When doing test tone playback: Beacon bytes to write.
      *  When doing test tone recording: Beacon bytes to read. */
-    uint32_t                cbToProcess;
+    uint32_t                cbSize;
     /** Beacon bytes already processed.
      *  When doing test tone playback: Beacon bytes written.
      *  When doing test tone recording: Beacon bytes read. */
-    uint32_t                cbProcessed;
+    uint32_t                cbUsed;
 } AUDIOTESTTONEBEACON;
 /** Pointer to audio test tone beacon. */