Changeset 88278 in vbox

Timestamp:

Mar 24, 2021 1:54:00 PM (4 years ago)

Author:

vboxsync

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

143483

Message:

Audio: Build fix and some cleanups. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (3 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -694 +694 @@
     /** The frame size. */
     uint8_t     cbFrame;
-    /** Sample width (in bytes). */
-    uint8_t     cbSampleX : 4;
-    /** Number of audio channels. */
-    uint8_t     cChannelsX : 4;
     /** Shift count used with PDMAUDIOPCMPROPS_F2B and PDMAUDIOPCMPROPS_B2F.
      * Depends on number of stream channels and the stream format being used, calc
@@ -703 +699 @@
      * @sa   PDMAUDIOSTREAMCFG_B2F, PDMAUDIOSTREAMCFG_F2B */
     uint8_t     cShiftX;
+    /** Sample width (in bytes). */
+    RT_GCC_EXTENSION
+    uint8_t     cbSampleX : 4;
+    /** Number of audio channels. */
+    RT_GCC_EXTENSION
+    uint8_t     cChannelsX : 4;
     /** Signed or unsigned sample. */
     bool        fSigned : 1;
@@ -723 +725 @@
 /** Initializer for PDMAUDIOPCMPROPS. */
 #define PDMAUDIOPCMPROPS_INITIALIZER(a_cbSample, a_fSigned, a_cChannels, a_uHz, a_fSwapEndian) \
-    { (a_cbSample) * (a_cChannels), a_cbSample, a_cChannels, PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(a_cbSample, a_cChannels), \
+    { (a_cbSample) * (a_cChannels), PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(a_cbSample, a_cChannels), a_cbSample, a_cChannels, \
       a_fSigned, a_fSwapEndian, false /*fRaw*/, a_uHz }
 /** Calculates the cShift value of given sample bits and audio channels.

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

@@ -1647 +1647 @@
      * Do the playing if we decided to play something.
      */
-    int rc = VINF_SUCCESS;
+    int rc;
     if (cFramesToPlay)
     {
@@ -1653 +1653 @@
             pThis->pHostDrvAudio->pfnStreamPlayBegin(pThis->pHostDrvAudio, pStream->pvBackend);
 
-        /** @todo r=bird: I don't honestly see any difference in interleaved,
-         *        non-interrleaved, raw, complicate, or whatever frame format we're
-         *        dealing with here.  We'll be formatting a chunk of audio data and feed
-         *        it to the backend, the formatting is taken care of by the mixer and
-         *        we don't really care about the format anywhere here.
-         *
-         *        Raw audio is just stereo S64, btw.  Since drvAudioStreamPlayRaw
-         *        actually copies the mixer data instead of accessing the internal mixer
-         *        buffer directly, there is no advantage to having separate code paths
-         *        here.  It only leads to more incomplete crappy code (I find the code
-         *        quality quite appaling, given the amount of time spent on it).
-         *
-         *        What's more, I think the non-interleaved designation here is wrong
-         *        anyway.  Non-interleaved means a stereo chunk of 8 frames is
-         *        formatted:
-         *              - LLLLLLLLRRRRRRRR
-         *        whereas I'm pretty darn sure we do:
-         *              - LRLRLRLRLRLRLRLR
-         *        given that the mixer doesn't know how to output the former.  See the
-         *        audioMixBufConvTo##a_Name##Stereo() code, it clearly output LR pairs.
-         *
-         *        https://stackoverflow.com/questions/17879933/whats-the-interleaved-audio
-         */
         rc = drvAudioStreamPlayDoIt(pThis, pStream, cFramesToPlay, pcFramesPlayed);
 
@@ -1683 +1660 @@
         pStream->tsLastPlayedCapturedNs = RTTimeNanoTS();
     }
+    else
+        rc = VINF_SUCCESS;
 
     Log3Func(("[%s] Live=%RU32 fr (%RU64 ms) Period=%RU32 fr (%RU64 ms) Writable=%RU32 fr (%RU64 ms) -> ToPlay=%RU32 fr (%RU64 ms) Played=%RU32 fr (%RU64 ms)%s\n",