Changeset 87586 in vbox

Timestamp:

Feb 3, 2021 4:44:18 PM (4 years ago)

Author:

vboxsync

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

142615

Message:

Audio/HDA: Reverted r142614 (committed too much). ticketoem2ref:36

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (3 diffs)
• HDAStream.cpp (modified) (4 diffs)

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

@@ -938 +938 @@
                pStream->szName, DrvAudioHlpAudDirToStr(pStream->enmDir)));
 
-    /*AssertMsg(DrvAudioHlpBytesIsAligned(cbBuf, &pStream->Guest.Cfg.Props),
-              ("Stream '%s' got a non-frame-aligned write (%RU32 bytes)\n", pStream->szName, cbBuf));*/
+    AssertMsg(DrvAudioHlpBytesIsAligned(cbBuf, &pStream->Guest.Cfg.Props),
+              ("Stream '%s' got a non-frame-aligned write (%RU32 bytes)\n", pStream->szName, cbBuf));
 
     uint32_t cbWrittenTotal = 0;
@@ -1004 +1004 @@
             || !cfGstWritten)
         {
+            AssertMsgFailed(("[%s] Write failed: cbToWrite=%RU32, cfWritten=%RU32, rc=%Rrc\n",
+                             pStream->szName, cbToWrite, cfGstWritten, rc));
             break;
         }
@@ -2332 +2334 @@
 #define QUERY_CONFIG(a_InOut) \
     /* PCM stuff. */ \
-    CFGMR3QueryU8Def (pNode, "xPCMSampleBit"         #a_InOut, &pCfg->Props.cbSample,  0); \
-    CFGMR3QueryU32Def(pNode, "xPCMSampleHz"          #a_InOut, &pCfg->Props.uHz,       0); \
-    CFGMR3QueryU8Def (pNode, "xPCMSampleSigned"      #a_InOut, &pCfg->uSigned,         UINT8_MAX /* No custom value set */); \
-    CFGMR3QueryU8Def (pNode, "xPCMSampleSwapEndian"  #a_InOut, &pCfg->uSwapEndian,     UINT8_MAX /* No custom value set */); \
-    CFGMR3QueryU8Def (pNode, "xPCMSampleChannels"    #a_InOut, &pCfg->Props.cChannels, 0); \
+    CFGMR3QueryU8Def (pNode, "PCMSampleBit"         #a_InOut, &pCfg->Props.cbSample,  0); \
+    CFGMR3QueryU32Def(pNode, "PCMSampleHz"          #a_InOut, &pCfg->Props.uHz,       0); \
+    CFGMR3QueryU8Def (pNode, "PCMSampleSigned"      #a_InOut, &pCfg->uSigned,         UINT8_MAX /* No custom value set */); \
+    CFGMR3QueryU8Def (pNode, "PCMSampleSwapEndian"  #a_InOut, &pCfg->uSwapEndian,     UINT8_MAX /* No custom value set */); \
+    CFGMR3QueryU8Def (pNode, "PCMSampleChannels"    #a_InOut, &pCfg->Props.cChannels, 0); \
     \
     /* Buffering stuff. */ \
-    CFGMR3QueryU32Def(pNode, "xPeriodSizeMs"         #a_InOut, &pCfg->uPeriodSizeMs, 0); \
-    CFGMR3QueryU32Def(pNode, "xBufferSizeMs"         #a_InOut, &pCfg->uBufferSizeMs, 0); \
-    CFGMR3QueryU32Def(pNode, "xPreBufferSizeMs"      #a_InOut, &pCfg->uPreBufSizeMs, UINT32_MAX /* No custom value set */);
+    CFGMR3QueryU32Def(pNode, "PeriodSizeMs"         #a_InOut, &pCfg->uPeriodSizeMs, 0); \
+    CFGMR3QueryU32Def(pNode, "BufferSizeMs"         #a_InOut, &pCfg->uBufferSizeMs, 0); \
+    CFGMR3QueryU32Def(pNode, "PreBufferSizeMs"      #a_InOut, &pCfg->uPreBufSizeMs, UINT32_MAX /* No custom value set */);
 
     if (enmDir == PDMAUDIODIR_IN)

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

@@ -29 +29 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pdmaudioifs.h>
+
+#include <math.h> /* Needed for roundl(). */
 
 #include "DrvAudio.h"
@@ -546 +548 @@
                 const double cTicksPerByte = cTicksPerHz / (double)pStreamShared->State.cbTransferChunk;
 
-#define HDA_ROUND_NEAREST(a_X) ((a_X) >= 0 ? (uint32_t)((a_X) + 0.5) : (uint32_t)((a_X) - 0.5)) /** @todo r=andy Do we have rounding in IPRT? */
-
                 /* Calculate the timer ticks per byte for this stream. */
-                pStreamShared->State.cTicksPerByte = HDA_ROUND_NEAREST(cTicksPerByte);
+                pStreamShared->State.cTicksPerByte = roundl(cTicksPerByte); /** @todo r=andy Do we have rounding in IPRT? */
                 Assert(pStreamShared->State.cTicksPerByte);
 
@@ -555 +555 @@
 
                 /* Calculate timer ticks per transfer. */
-                pStreamShared->State.cTransferTicks = HDA_ROUND_NEAREST(cTransferTicks);
+                pStreamShared->State.cTransferTicks = roundl(cTransferTicks);
                 Assert(pStreamShared->State.cTransferTicks);
-
-#undef HDA_ROUND_NEAREST
 
                 LogRel2(("HDA: Stream #%RU8 is using %uHz device timer (%RU64 virtual ticks / Hz), stream Hz=%RU32, "
@@ -2112 +2110 @@
 
 #endif /* IN_RING3 */
+