Changeset 60353 in vbox for trunk/include

Timestamp:

Apr 6, 2016 11:54:39 AM (9 years ago)

Author:

vboxsync

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

106428

Message:

Audio: Added HDA support for newer Linux guests; more work on surround support (disabled by default).

File:

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

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -109 +109 @@
 } PDMAUDIOENDIANNESS;
 
+/**
+ * Audio direction.
+ */
+typedef enum PDMAUDIODIR
+{
+    PDMAUDIODIR_UNKNOWN    = 0,
+    PDMAUDIODIR_IN         = 1,
+    PDMAUDIODIR_OUT        = 2,
+    PDMAUDIODIR_DUPLEX     = 3,
+    /** Hack to blow the type up to 32-bit. */
+    PDMAUDIODIR_32BIT_HACK = 0x7fffffff
+} PDMAUDIODIR;
+
+/**
+ * Audio playback destinations.
+ */
+typedef enum PDMAUDIOPLAYBACKDEST
+{
+    PDMAUDIOPLAYBACKDEST_UNKNOWN = 0,
+    PDMAUDIOPLAYBACKDEST_FRONT,
+    PDMAUDIOPLAYBACKDEST_CENTER_LFE,
+    PDMAUDIOPLAYBACKDEST_REAR,
+    /** Hack to blow the type up to 32-bit. */
+    PDMAUDIOPLAYBACKDEST_32BIT_HACK = 0x7fffffff
+} PDMAUDIOPLAYBACKDEST;
+
+/**
+ * Audio recording sources.
+ */
+typedef enum PDMAUDIORECSOURCE
+{
+    PDMAUDIORECSOURCE_UNKNOWN = 0,
+    PDMAUDIORECSOURCE_MIC,
+    PDMAUDIORECSOURCE_CD,
+    PDMAUDIORECSOURCE_VIDEO,
+    PDMAUDIORECSOURCE_AUX,
+    PDMAUDIORECSOURCE_LINE,
+    PDMAUDIORECSOURCE_PHONE,
+    /** Hack to blow the type up to 32-bit. */
+    PDMAUDIORECSOURCE_32BIT_HACK = 0x7fffffff
+} PDMAUDIORECSOURCE;
+
+/**
+ * Structure for keeping an audio stream configuration.
+ */
 typedef struct PDMAUDIOSTREAMCFG
 {
+    /** Friendly name of the stream. */
+    char                    *pszName;
+    /** Direction of the stream. */
+    PDMAUDIODIR              enmDir;
+    union
+    {
+        /** Desired playback destination (for an output stream). */
+        PDMAUDIOPLAYBACKDEST Dest;
+        /** Desired recording source (for an input stream). */
+        PDMAUDIORECSOURCE    Source;
+    } DestSource;
     /** Frequency in Hertz (Hz). */
-    uint32_t uHz;
-    /** Number of channels (2 for stereo). */
-    uint8_t cChannels;
+    uint32_t                 uHz;
+    /** Number of channels (2 for stereo, 1 for mono). */
+    uint8_t                  cChannels;
     /** Audio format. */
-    PDMAUDIOFMT enmFormat;
+    PDMAUDIOFMT              enmFormat;
     /** @todo Use RT_LE2H_*? */
-    PDMAUDIOENDIANNESS enmEndianness;
+    PDMAUDIOENDIANNESS       enmEndianness;
 } PDMAUDIOSTREAMCFG, *PPDMAUDIOSTREAMCFG;
 
@@ -130 +186 @@
 
 /**
- * Audio direction.
- */
-typedef enum PDMAUDIODIR
-{
-    PDMAUDIODIR_UNKNOWN    = 0,
-    PDMAUDIODIR_IN         = 1,
-    PDMAUDIODIR_OUT        = 2,
-    PDMAUDIODIR_DUPLEX     = 3,
-    /** Hack to blow the type up to 32-bit. */
-    PDMAUDIODIR_32BIT_HACK = 0x7fffffff
-} PDMAUDIODIR;
-
-/**
  * Audio mixer controls.
  */
@@ -149 +192 @@
     PDMAUDIOMIXERCTL_UNKNOWN = 0,
     PDMAUDIOMIXERCTL_VOLUME,
-    PDMAUDIOMIXERCTL_PCM,
+    PDMAUDIOMIXERCTL_FRONT,
+    PDMAUDIOMIXERCTL_CENTER_LFE,
+    PDMAUDIOMIXERCTL_REAR,
     PDMAUDIOMIXERCTL_LINE_IN,
     PDMAUDIOMIXERCTL_MIC_IN,
@@ -155 +200 @@
     PDMAUDIOMIXERCTL_32BIT_HACK = 0x7fffffff
 } PDMAUDIOMIXERCTL;
-
-/**
- * Audio recording sources.
- */
-typedef enum PDMAUDIORECSOURCE
-{
-    PDMAUDIORECSOURCE_UNKNOWN = 0,
-    PDMAUDIORECSOURCE_MIC,
-    PDMAUDIORECSOURCE_CD,
-    PDMAUDIORECSOURCE_VIDEO,
-    PDMAUDIORECSOURCE_AUX,
-    PDMAUDIORECSOURCE_LINE_IN,
-    PDMAUDIORECSOURCE_PHONE,
-    /** Hack to blow the type up to 32-bit. */
-    PDMAUDIORECSOURCE_32BIT_HACK = 0x7fffffff
-} PDMAUDIORECSOURCE;
 
 /**
@@ -586 +615 @@
      * @returns VBox status code.
      * @param   pInterface           Pointer to the interface structure containing the called function pointer.
-     * @param   pszName              Name of the audio channel.
-     * @param   enmRecSource         Specifies the type of recording source to be opened.
+     * @param   pszName              Friendly name of this input stream.
      * @param   pCfg                 Pointer to PDMAUDIOSTREAMCFG to use.
      * @param   ppGstStrmIn          Pointer where to return the guest guest input stream on success.
      */
     DECLR3CALLBACKMEMBER(int, pfnCreateIn, (PPDMIAUDIOCONNECTOR pInterface, const char *pszName,
-                                            PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOSTREAMCFG pCfg,
-                                            PPDMAUDIOGSTSTRMIN *ppGstStrmIn));
+                                            PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOGSTSTRMIN *ppGstStrmIn));
     /**
      * Creates a guest output stream.
@@ -599 +626 @@
      * @returns VBox status code.
      * @param   pInterface           Pointer to the interface structure containing the called function pointer.
-     * @param   pszName              Name of the audio channel.
+     * @param   pszName              Friendly name of this output stream.
      * @param   pCfg                 Pointer to PDMAUDIOSTREAMCFG to use.
      * @param   ppGstStrmOut         Pointer where to return the guest guest input stream on success.
@@ -639 +666 @@
 
 /** PDMIAUDIOCONNECTOR interface ID. */
-#define PDMIAUDIOCONNECTOR_IID                  "8f8ca10e-9039-423c-9a77-0014aaa98626"
+#define PDMIAUDIOCONNECTOR_IID                  "f0ef4012-ae89-4528-9dad-4ef496894df8"