Changeset 75962 in vbox for trunk/src/VBox/Devices/Audio/HDAStreamMap.h

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/src/VBox/Devices/Audio/HDAStreamMap.h (modified) (3 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * HDAStreamMap.h - Stream mapping functions for HD Audio.
+ * HDAStreamMap.h - Stream map functions for HD Audio.
  */
 
 /*
- * Copyright (C) 2017 Oracle Corporation
+ * Copyright (C) 2017-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
  * Structure for keeping an audio stream data mapping.
  */
-typedef struct HDASTREAMMAPPING
+typedef struct HDASTREAMMAP
 {
     /** The stream's layout. */
-    PDMAUDIOSTREAMLAYOUT              enmLayout;
-    /** Number of audio channels in this stream. */
-    uint8_t                           cChannels;
-    /** Array of audio channels. */
-    R3PTRTYPE(PPDMAUDIOSTREAMCHANNEL) paChannels;
+    PDMAUDIOSTREAMLAYOUT               enmLayout;
+    uint8_t                            cbFrameSize;
+    /** Number of mappings in paMappings. */
+    uint8_t                            cMappings;
+    uint8_t                            aPadding[2];
+    /** Array of stream mappings.
+     *  Note: The mappings *must* be layed out in an increasing order, e.g.
+     *        how the data appears in the given data block. */
+    R3PTRTYPE(PPDMAUDIOSTREAMMAP)      paMappings;
+#if HC_ARCH_BITS == 32
+    RTR3PTR                            Padding1;
+#endif
+#ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
     /** Circular buffer holding for holding audio data for this mapping. */
-    R3PTRTYPE(PRTCIRCBUF)             pCircBuf;
-} HDASTREAMMAPPING;
-AssertCompileSizeAlignment(HDASTREAMMAPPING, 8);
-typedef HDASTREAMMAPPING *PHDASTREAMMAPPING;
+    R3PTRTYPE(PRTCIRCBUF)              pCircBuf;
+#endif
+} HDASTREAMMAP;
+AssertCompileSizeAlignment(HDASTREAMMAP, 8);
+typedef HDASTREAMMAP *PHDASTREAMMAP;
 
 /** @name Stream mapping functions.
@@ -40 +49 @@
  */
 #ifdef IN_RING3
-int  hdaR3StreamMapInit(PHDASTREAMMAPPING pMapping, PPDMAUDIOPCMPROPS pProps);
-void hdaR3StreamMapDestroy(PHDASTREAMMAPPING pMapping);
-void hdaR3StreamMapReset(PHDASTREAMMAPPING pMapping);
+int  hdaR3StreamMapInit(PHDASTREAMMAP pMapping, PPDMAUDIOPCMPROPS pProps);
+void hdaR3StreamMapDestroy(PHDASTREAMMAP pMapping);
+void hdaR3StreamMapReset(PHDASTREAMMAP pMapping);
 #endif /* IN_RING3 */
 /** @} */