Changeset 88269 in vbox for trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp

Timestamp:

Mar 24, 2021 11:45:54 AM (4 years ago)

Author:

vboxsync

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

143474

Message:

Audio: Made sure PDMAUDIOPCMPROPS is initialized using a helper function or the initializer macro, and that vital changes are made using setting helper functions. There are now two derived fields (frame size and shift count) that must be maintained, so this was the sanest way of doing it. Added a raw flag to PDMAUDIOPCMPROPS for VRDE/VRDP, since it wants the raw mixer content and we need a way of expressing this (PDMAUDIOSTREAMLAYOUT isn't the right place). The mixer buffers now uses PDMAUDIOPCMPROPS rather than the weird 32-bit format contraption for picking conversion functions. Simplify the drvAudioStreamPlay code by eliminating the PDMAUDIOSTREAMLAYOUT_RAW special case. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (8 diffs)

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

@@ -149 +149 @@
 static snd_pcm_format_t alsaAudioPropsToALSA(PPDMAUDIOPCMPROPS pProps)
 {
-    switch (pProps->cbSample)
+    switch (PDMAudioPropsSampleSize(pProps))
     {
         case 1:
@@ -155 +155 @@
 
         case 2:
-            return pProps->fSigned ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_U16_LE;
+            if (PDMAudioPropsIsLittleEndian(pProps))
+                return pProps->fSigned ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_U16_LE;
+            return pProps->fSigned ? SND_PCM_FORMAT_S16_BE : SND_PCM_FORMAT_U16_BE;
 
         case 4:
-            return pProps->fSigned ? SND_PCM_FORMAT_S32_LE : SND_PCM_FORMAT_U32_LE;
+            if (PDMAudioPropsIsLittleEndian(pProps))
+                return pProps->fSigned ? SND_PCM_FORMAT_S32_LE : SND_PCM_FORMAT_U32_LE;
+            return pProps->fSigned ? SND_PCM_FORMAT_S32_BE : SND_PCM_FORMAT_U32_BE;
 
         default:
-            break;
-    }
-
-    AssertMsgFailed(("%RU8 bytes not supported\n", pProps->cbSample));
-    return SND_PCM_FORMAT_U8;
+            AssertMsgFailed(("%RU8 bytes not supported\n", PDMAudioPropsSampleSize(pProps)));
+            return SND_PCM_FORMAT_U8;
+    }
 }
 
@@ -173 +175 @@
  *
  * @returns VBox status code.
- * @param   fmt                 ALSA PCM format to convert.
- * @param   pProps              Where to store the converted PCM properties on success.
- */
-static int alsaALSAToAudioProps(snd_pcm_format_t fmt, PPDMAUDIOPCMPROPS pProps)
-{
+ * @param   pProps      Where to store the converted PCM properties on success.
+ * @param   fmt         ALSA PCM format to convert.
+ * @param   cChannels   Number of channels.
+ * @param   uHz         Frequency.
+ */
+static int alsaALSAToAudioProps(PPDMAUDIOPCMPROPS pProps, snd_pcm_format_t fmt, int cChannels, unsigned uHz)
+{
+    AssertReturn(cChannels > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cChannels < 16, VERR_INVALID_PARAMETER);
     switch (fmt)
     {
         case SND_PCM_FORMAT_S8:
-            pProps->cbSample    = 1;
-            pProps->fSigned     = true;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInit(pProps, 1 /*8-bit*/,  true /*signed*/, cChannels, uHz);
             break;
 
         case SND_PCM_FORMAT_U8:
-            pProps->cbSample    = 1;
-            pProps->fSigned     = false;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInit(pProps, 1 /*8-bit*/, false /*signed*/, cChannels, uHz);
             break;
 
         case SND_PCM_FORMAT_S16_LE:
-            pProps->cbSample    = 2;
-            pProps->fSigned     = true;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInitEx(pProps, 2 /*16-bit*/,  true /*signed*/, cChannels, uHz, true /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_U16_LE:
-            pProps->cbSample    = 2;
-            pProps->fSigned     = false;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInitEx(pProps, 2 /*16-bit*/, false /*signed*/, cChannels, uHz, true /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_S16_BE:
-            pProps->cbSample    = 2;
-            pProps->fSigned     = true;
-#ifdef RT_LITTLE_ENDIAN
-            pProps->fSwapEndian = true;
-#endif
+            PDMAudioPropsInitEx(pProps, 2 /*16-bit*/,  true /*signed*/, cChannels, uHz, false /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_U16_BE:
-            pProps->cbSample    = 2;
-            pProps->fSigned     = false;
-#ifdef RT_LITTLE_ENDIAN
-            pProps->fSwapEndian = true;
-#endif
+            PDMAudioPropsInitEx(pProps, 2 /*16-bit*/, false /*signed*/, cChannels, uHz, false /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_S32_LE:
-            pProps->cbSample    = 4;
-            pProps->fSigned     = true;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInitEx(pProps, 4 /*32-bit*/,  true /*signed*/, cChannels, uHz, true /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_U32_LE:
-            pProps->cbSample    = 4;
-            pProps->fSigned     = false;
-            pProps->fSwapEndian = false;
+            PDMAudioPropsInitEx(pProps, 4 /*32-bit*/, false /*signed*/, cChannels, uHz, true /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_S32_BE:
-            pProps->cbSample    = 4;
-            pProps->fSigned     = true;
-#ifdef RT_LITTLE_ENDIAN
-            pProps->fSwapEndian = true;
-#endif
+            PDMAudioPropsInitEx(pProps, 4 /*32-bit*/,  true /*signed*/, cChannels, uHz, false /*fLittleEndian*/, false /*fRaw*/);
             break;
 
         case SND_PCM_FORMAT_U32_BE:
-            pProps->cbSample    = 4;
-            pProps->fSigned     = false;
-#ifdef RT_LITTLE_ENDIAN
-            pProps->fSwapEndian = true;
-#endif
+            PDMAudioPropsInitEx(pProps, 4 /*32-bit*/, false /*signed*/, cChannels, uHz, false /*fLittleEndian*/, false /*fRaw*/);
             break;
 
@@ -251 +229 @@
             AssertMsgFailedReturn(("Format %d not supported\n", fmt), VERR_NOT_SUPPORTED);
     }
-
-    AssertReturn(pProps->cbSample > 0,  VERR_NOT_SUPPORTED);
-    AssertReturn(pProps->cChannels > 0, VERR_INVALID_PARAMETER);
-
-    pProps->cShift = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pProps->cbSample, pProps->cChannels);
-
     return VINF_SUCCESS;
 }
@@ -937 +909 @@
         ALSAAUDIOSTREAMCFG req;
         req.fmt         = alsaAudioPropsToALSA(&pCfgReq->Props);
-        req.freq        = pCfgReq->Props.uHz;
-        req.nchannels   = pCfgReq->Props.cChannels;
+        req.freq        = PDMAudioPropsHz(&pCfgReq->Props);
+        req.nchannels   = PDMAudioPropsChannels(&pCfgReq->Props);
         req.period_size = pCfgReq->Backend.cFramesPeriod;
         req.buffer_size = pCfgReq->Backend.cFramesBufferSize;
@@ -948 +920 @@
             break;
 
-        pCfgAcq->Props.uHz       = obt.freq;
-        pCfgAcq->Props.cChannels = obt.nchannels;
-
-        rc = alsaALSAToAudioProps(obt.fmt, &pCfgAcq->Props);
+        rc = alsaALSAToAudioProps(&pCfgAcq->Props, obt.fmt, obt.nchannels, obt.freq);
         if (RT_FAILURE(rc))
             break;
@@ -1000 +969 @@
         ALSAAUDIOSTREAMCFG req;
         req.fmt         = alsaAudioPropsToALSA(&pCfgReq->Props);
-        req.freq        = pCfgReq->Props.uHz;
-        req.nchannels   = pCfgReq->Props.cChannels;
+        req.freq        = PDMAudioPropsHz(&pCfgReq->Props);
+        req.nchannels   = PDMAudioPropsChannels(&pCfgReq->Props);
         req.period_size = PDMAudioPropsMilliToFrames(&pCfgReq->Props, 50 /*ms*/); /** @todo Make this configurable. */
         req.buffer_size = req.period_size * 2; /** @todo Make this configurable. */
@@ -1011 +980 @@
             break;
 
-        pCfgAcq->Props.uHz       = obt.freq;
-        pCfgAcq->Props.cChannels = obt.nchannels;
-
-        rc = alsaALSAToAudioProps(obt.fmt, &pCfgAcq->Props);
+        rc = alsaALSAToAudioProps(&pCfgAcq->Props, obt.fmt, obt.nchannels, obt.freq);
         if (RT_FAILURE(rc))
             break;