Changeset 75962 in vbox for trunk/include

Timestamp:

Dec 5, 2018 9:34:58 AM (6 years ago)

Author:

vboxsync

Message:

Forward ported r127158 (Audio/HDA: Implemented support for Windows 10 Build 1809 default surround speaker setup) + build fixes (r127159, r127160, r127162, r127165, r127167).

File:

• trunk/include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -471 +471 @@
     /** Circular buffer for the channel data. */
     PRTCIRCBUF pCircBuf;
+    /** Amount of audio data (in bytes) acquired for reading. */
     size_t     cbAcq;
     /** Channel data flags. */
@@ -477 +478 @@
 
 /**
- * Structure for a single channel of an audio stream.
- * An audio stream consists of one or multiple channels,
+ * Enumeration for standard speaker channel IDs.
+ * This can cover up to 11.0 surround sound.
+ *
+ * Note: Any of those channels can be marked / used as the LFE channel (played through the subwoofer).
+ */
+typedef enum PDMAUDIOSTREAMCHANNELID
+{
+    /** Unknown / not set channel ID. */
+    PDMAUDIOSTREAMCHANNELID_UNKNOWN = 0,
+    /** Front left channel. */
+    PDMAUDIOSTREAMCHANNELID_FRONT_LEFT,
+    /** Front right channel. */
+    PDMAUDIOSTREAMCHANNELID_FRONT_RIGHT,
+    /** Front center channel. */
+    PDMAUDIOSTREAMCHANNELID_FRONT_CENTER,
+    /** Low frequency effects (subwoofer) channel. */
+    PDMAUDIOSTREAMCHANNELID_LFE,
+    /** Rear left channel. */
+    PDMAUDIOSTREAMCHANNELID_REAR_LEFT,
+    /** Rear right channel. */
+    PDMAUDIOSTREAMCHANNELID_REAR_RIGHT,
+    /** Front left of center channel. */
+    PDMAUDIOSTREAMCHANNELID_FRONT_LEFT_OF_CENTER,
+    /** Front right of center channel. */
+    PDMAUDIOSTREAMCHANNELID_FRONT_RIGHT_OF_CENTER,
+    /** Rear center channel. */
+    PDMAUDIOSTREAMCHANNELID_REAR_CENTER,
+    /** Side left channel. */
+    PDMAUDIOSTREAMCHANNELID_SIDE_LEFT,
+    /** Side right channel. */
+    PDMAUDIOSTREAMCHANNELID_SIDE_RIGHT,
+    /** Left height channel. */
+    PDMAUDIOSTREAMCHANNELID_LEFT_HEIGHT,
+    /** Right height channel. */
+    PDMAUDIOSTREAMCHANNELID_RIGHT_HEIGHT,
+    /** Hack to blow the type up to 32-bit. */
+    PDMAUDIOSTREAMCHANNELID_32BIT_HACK = 0x7fffffff
+} PDMAUDIOSTREAMCHANNELID;
+
+/**
+ * Structure for mapping a single (mono) channel or dual (stereo) channels of 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 PDMAUDIOSTREAMCHANNEL
-{
-    /** Channel ID. */
-    uint8_t                   uChannel;
+typedef struct PDMAUDIOSTREAMMAP
+{
+    /** Array of channel IDs being handled.
+     *  Note: The first (zero-based) index specifies the leftmost channel. */
+    PDMAUDIOSTREAMCHANNELID    aID[2];
     /** Step size (in bytes) to the channel's next frame. */
-    size_t                    cbStep;
+    size_t                     cbSize;
     /** Frame size (in bytes) of this channel. */
-    size_t                    cbFrame;
+    size_t                     cbFrame;
     /** Offset (in bytes) to first frame in the data block. */
-    size_t                    cbFirst;
-    /** Currente offset (in bytes) in the data stream. */
-    size_t                    cbOff;
+    size_t                     cbFirst;
+    /** Offset (in bytes) to the next frame in the data block. */
+    size_t                     cbOff;
     /** Associated data buffer. */
-    PDMAUDIOSTREAMCHANNELDATA Data;
-} PDMAUDIOSTREAMCHANNEL, *PPDMAUDIOSTREAMCHANNEL;
+    PDMAUDIOSTREAMCHANNELDATA  Data;
+} PDMAUDIOSTREAMMAP, *PPDMAUDIOSTREAMMAP;
 
 /**