Changeset 89445 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 1, 2021 8:58:25 PM (4 years ago)

Author:

vboxsync

Message:

DrvAudio: Use pStreamEx->Core.Props instead of pStream->Guest.Cfg.Props and pStream->Host.Cfg.Props. The former is actually very wrong as it's what the mixer requested, not the actual properties of the stream. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (9 diffs)

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

@@ -3425 +3425 @@
 
         /* Make sure to align the writable size to the host's frame size. */
-        cbWritable = PDMAudioPropsFloorBytesToFrame(&pStreamEx->Host.Cfg.Props, cbWritable);
+        cbWritable = PDMAudioPropsFloorBytesToFrame(&pStreamEx->Core.Props, cbWritable);
     }
 
@@ -3431 +3431 @@
     RTCritSectLeave(&pStreamEx->Core.CritSect);
     Log3Func(("[%s] cbWritable=%#RX32 (%RU64ms) enmPlayMode=%s enmBackendState=%s\n",
-              pStreamEx->Core.szName, cbWritable, PDMAudioPropsBytesToMilli(&pStreamEx->Host.Cfg.Props, cbWritable),
+              pStreamEx->Core.szName, cbWritable, PDMAudioPropsBytesToMilli(&pStreamEx->Core.Props, cbWritable),
               drvAudioPlayStateName(enmPlayMode), PDMHostAudioStreamStateGetName(enmBackendState) ));
     return cbWritable;
@@ -3466 +3466 @@
                      pStreamEx->Core.szName, PDMAudioDirGetName(pStreamEx->Core.enmDir)), VERR_ACCESS_DENIED);
 
-    AssertMsg(PDMAudioPropsIsSizeAligned(&pStreamEx->Guest.Cfg.Props, cbBuf),
+    AssertMsg(PDMAudioPropsIsSizeAligned(&pStreamEx->Core.Props, cbBuf),
               ("Stream '%s' got a non-frame-aligned write (%#RX32 bytes)\n", pStreamEx->Core.szName, cbBuf));
 
@@ -3620 +3620 @@
             {
                 uint64_t const cNsStream = RTTimeNanoTS() - pStreamEx->nsStarted;
-                uint64_t const offCur    = PDMAudioPropsNanoToBytes64(&pStreamEx->Guest.Cfg.Props, cNsStream);
+                uint64_t const offCur    = PDMAudioPropsNanoToBytes64(&pStreamEx->Core.Props, cNsStream);
                 if (offCur > pStreamEx->offInternal)
                 {
@@ -3639 +3639 @@
 
         /* Make sure to align the readable size to the host's frame size. */
-        cbReadable = PDMAudioPropsFloorBytesToFrame(&pStreamEx->Host.Cfg.Props, cbReadable);
+        cbReadable = PDMAudioPropsFloorBytesToFrame(&pStreamEx->Core.Props, cbReadable);
     }
 
@@ -3645 +3645 @@
     RTCritSectLeave(&pStreamEx->Core.CritSect);
     Log3Func(("[%s] cbReadable=%#RX32 (%RU64ms) enmCaptureMode=%s enmBackendState=%s\n",
-              pStreamEx->Core.szName, cbReadable, PDMAudioPropsBytesToMilli(&pStreamEx->Host.Cfg.Props, cbReadable),
+              pStreamEx->Core.szName, cbReadable, PDMAudioPropsBytesToMilli(&pStreamEx->Core.Props, cbReadable),
               drvAudioCaptureStateName(enmCaptureState), PDMHostAudioStreamStateGetName(enmBackendState) ));
     return cbReadable;
@@ -3667 +3667 @@
     /** @todo  Does not take paused time into account...  */
     uint64_t const cNsStream = RTTimeNanoTS() - pStreamEx->nsStarted;
-    uint64_t const offCur    = PDMAudioPropsNanoToBytes64(&pStreamEx->Guest.Cfg.Props, cNsStream);
+    uint64_t const offCur    = PDMAudioPropsNanoToBytes64(&pStreamEx->Core.Props, cNsStream);
     if (offCur > pStreamEx->offInternal)
     {
@@ -3675 +3675 @@
         pStreamEx->offInternal  += cbToClear;
         cbBuf                   -= cbToClear;
-        PDMAudioPropsClearBuffer(&pStreamEx->Guest.Cfg.Props, pbBuf, cbToClear,
-                                 PDMAudioPropsBytesToFrames(&pStreamEx->Guest.Cfg.Props, cbToClear));
+        PDMAudioPropsClearBuffer(&pStreamEx->Core.Props, pbBuf, cbToClear,
+                                 PDMAudioPropsBytesToFrames(&pStreamEx->Core.Props, cbToClear));
     }
     else
@@ -3769 +3769 @@
                      pStreamEx->Core.szName, PDMAudioDirGetName(pStreamEx->Core.enmDir)), VERR_ACCESS_DENIED);
 
-    AssertMsg(PDMAudioPropsIsSizeAligned(&pStreamEx->Guest.Cfg.Props, cbBuf),
+    AssertMsg(PDMAudioPropsIsSizeAligned(&pStreamEx->Core.Props, cbBuf),
               ("Stream '%s' got a non-frame-aligned write (%#RX32 bytes)\n", pStreamEx->Core.szName, cbBuf));