Changeset 82463 in vbox

Timestamp:

Dec 6, 2019 2:29:16 PM (5 years ago)

Author:

vboxsync

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

135313

Message:

pdmaudioifs.h,Devices/Audio: Corrected the size alignment of PDMAUDIOSTREAMCFG to 8 bytes. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (6 diffs)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/HDAStream.h (modified) (1 diff)
• src/VBox/Devices/Audio/HDAStreamMap.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -627 +627 @@
 
 /**
- * Structure for mapping a single (mono) channel or dual (stereo) channels onto
- * an audio stream (aka stream profile).
- *
- * An audio stream consists of one or multiple channels (e.g. 1 for mono, 2 for
- * stereo), depending on the configuration.
+ * Mappings channels onto an audio stream.
+ *
+ * The mappings are either for a single (mono) or dual (stereo) channels onto an
+ * audio stream (aka stream profile).  An audio stream consists of one or
+ * multiple channels (e.g. 1 for mono, 2 for stereo), depending on the
+ * configuration.
  */
 typedef struct PDMAUDIOSTREAMMAP
@@ -637 +638 @@
     /** Array of channel IDs being handled.
      * @note The first (zero-based) index specifies the leftmost channel. */
-    PDMAUDIOSTREAMCHANNELID     aID[2];
+    PDMAUDIOSTREAMCHANNELID     aenmIDs[2];
     /** Step size (in bytes) to the channel's next frame. */
     uint32_t                    cbStep;
@@ -701 +702 @@
 
 /**
- * Structure for keeping an audio stream configuration.
+ * An audio stream configuration.
  */
 typedef struct PDMAUDIOSTREAMCFG
@@ -751 +752 @@
         uint32_t            cFramesPreBuffering;
     } Backend;
+    uint32_t                u32Padding;
     /** Friendly name of the stream. */
     char                    szName[64];
 } PDMAUDIOSTREAMCFG;
-AssertCompileSizeAlignment(PDMAUDIOPCMPROPS, 8);
+AssertCompileSizeAlignment(PDMAUDIOSTREAMCFG, 8);
 /** Pointer to audio stream configuration keeper. */
 typedef PDMAUDIOSTREAMCFG *PPDMAUDIOSTREAMCFG;
@@ -1200 +1202 @@
 
 /**
- * Structure for maintaining an input/output audio stream.
+ * An input or output audio stream.
  */
 typedef struct PDMAUDIOSTREAM
@@ -1249 +1251 @@
 
 /**
- * Enumeration for an audio callback source.
+ * Audio callback source.
  */
 typedef enum PDMAUDIOCBSOURCE
 {
     /** Invalid, do not use. */
-    PDMAUDIOCBSOURCE_INVALID    = 0,
+    PDMAUDIOCBSOURCE_INVALID = 0,
     /** Device emulation. */
     PDMAUDIOCBSOURCE_DEVICE,

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

@@ -360 +360 @@
 #endif
     /** The stream's current configuration. */
-    PDMAUDIOSTREAMCFG       Cfg; //+104
-    uint32_t                Padding2;
+    PDMAUDIOSTREAMCFG       Cfg; //+108
 #ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
     /** Asynchronous I/O state members. */

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

@@ -951 +951 @@
     AssertPtrReturnVoid(pCfg);
 
-    RT_BZERO(pCfg, sizeof(PDMAUDIOSTREAMCFG));
+    RT_ZERO(*pCfg);
 
     pCfg->Backend.cFramesPreBuffering = UINT32_MAX; /* Explicitly set to "undefined". */

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

@@ -114 +114 @@
 {
     /** The stream's acquired configuration. */
-    PDMAUDIOSTREAMCFG  Cfg;
+    PDMAUDIOSTREAMCFG   Cfg;
     /** Buffer alignment. */
-    uint8_t            uAlign;
+    uint8_t             uAlign;
     /** Whether this stream is in an enable state on the DirectSound side. */
-    bool               fEnabled;
+    bool                fEnabled;
+    bool                afPadding[2];
+    /** Size (in bytes) of the DirectSound buffer.
+     *  @note This in *not* the size of the circular buffer above! */
+    DWORD               cbBufSize;
     /** The stream's critical section for synchronizing access. */
-    RTCRITSECT         CritSect;
+    RTCRITSECT          CritSect;
     /** The internal playback / capturing buffer. */
-    PRTCIRCBUF         pCircBuf;
-    /** Size (in bytes) of the DirectSound buffer.
-     *  Note: This in *not* the size of the circular buffer above! */
-    DWORD              cbBufSize;
+    PRTCIRCBUF          pCircBuf;
     union
     {

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

@@ -166 +166 @@
      *  Should match SDFMT. */
     PDMAUDIOSTREAMCFG       Cfg;
-    uint32_t                Padding4;
     /** Timestamp (in ns) of last stream update. */
     uint64_t                tsLastUpdateNs;

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

@@ -156 +156 @@
         PPDMAUDIOSTREAMMAP pMapLR = &pMap->paMappings[0];
 
-        pMapLR->aID[0]   = PDMAUDIOSTREAMCHANNELID_FRONT_LEFT;
-        pMapLR->aID[1]   = PDMAUDIOSTREAMCHANNELID_FRONT_RIGHT;
-        pMapLR->cbFrame  = pProps->cbSample * pProps->cChannels;
-        pMapLR->cbStep   = pProps->cbSample * 2 /* Front left + Front right channels */;
-        pMapLR->offFirst = 0;
-        pMapLR->offNext  = pMapLR->offFirst;
+        pMapLR->aenmIDs[0]  = PDMAUDIOSTREAMCHANNELID_FRONT_LEFT;
+        pMapLR->aenmIDs[1]  = PDMAUDIOSTREAMCHANNELID_FRONT_RIGHT;
+        pMapLR->cbFrame     = pProps->cbSample * pProps->cChannels;
+        pMapLR->cbStep      = pProps->cbSample * 2 /* Front left + Front right channels */;
+        pMapLR->offFirst    = 0;
+        pMapLR->offNext     = pMapLR->offFirst;
 
         rc = hdaR3StreamChannelDataInit(&pMapLR->Data, PDMAUDIOSTREAMCHANNELDATA_FLAGS_NONE);