Changeset 70864 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Feb 5, 2018 1:13:37 PM (7 years ago)

Author:

vboxsync

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

120690

Message:

Audio/DrvHostDSound.cpp: Compacted dsoundWaveFmtFromCfg().

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (1 diff)

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

@@ -265 +265 @@
     pFmt->wFormatTag      = WAVE_FORMAT_PCM;
     pFmt->nChannels       = pCfg->Props.cChannels;
+    pFmt->wBitsPerSample  = pCfg->Props.cBits;
     pFmt->nSamplesPerSec  = pCfg->Props.uHz;
-    pFmt->nAvgBytesPerSec = pCfg->Props.uHz << (pCfg->Props.cChannels == 2 ? 1: 0);
-    pFmt->nBlockAlign     = 1 << (pCfg->Props.cChannels == 2 ? 1 : 0);
+    pFmt->nBlockAlign     = pFmt->nChannels * pFmt->wBitsPerSample / 8;
+    pFmt->nAvgBytesPerSec = pFmt->nSamplesPerSec * pFmt->nBlockAlign;
     pFmt->cbSize          = 0; /* No extra data specified. */
-
-    switch (pCfg->Props.cBits)
-    {
-        case 8:
-            pFmt->wBitsPerSample = 8;
-            break;
-
-        case 16:
-            pFmt->wBitsPerSample = 16;
-            pFmt->nAvgBytesPerSec <<= 1;
-            pFmt->nBlockAlign <<= 1;
-            break;
-
-        case 32:
-            pFmt->wBitsPerSample = 32;
-            pFmt->nAvgBytesPerSec <<= 2;
-            pFmt->nBlockAlign <<= 2;
-            break;
-
-        default:
-            AssertMsgFailed(("Wave format for %RU8 bits not supported\n", pCfg->Props.cBits));
-            return VERR_NOT_SUPPORTED;
-    }
 
     return VINF_SUCCESS;