Changeset 73467 in vbox for trunk/include

Timestamp:

Aug 3, 2018 9:49:55 AM (7 years ago)

Author:

vboxsync

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

124094

Message:

DrvAudio: Cleaned up the internal stream organization by not duplicating stuff like the status and the like by having two PDMAUDIOSTREAMs (on for the guest side and one for the host side). Instead, only use PDMAUDIOSTREAM and keep the guest and host specifics in PDMAUDIOSTREAMCTX. Should help simplifying things a lot.

File:

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

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -348 +348 @@
     /** Size (in bytes) of the host backend's audio input stream structure. */
     size_t   cbStreamIn;
-    /** Number of concurrent output streams supported on the host.
+    /** Number of concurrent output (playback) streams supported on the host.
      *  UINT32_MAX for unlimited concurrent streams, 0 if no concurrent input streams are supported. */
     uint32_t cMaxStreamsOut;
-    /** Number of concurrent input streams supported on the host.
+    /** Number of concurrent input (recording) streams supported on the host.
      *  UINT32_MAX for unlimited concurrent streams, 0 if no concurrent input streams are supported. */
     uint32_t cMaxStreamsIn;
@@ -953 +953 @@
 
 /**
- * Audio stream context.
- */
-typedef enum PDMAUDIOSTREAMCTX
-{
-    /** No context set / invalid. */
-    PDMAUDIOSTREAMCTX_UNKNOWN = 0,
-    /** Host stream, connected to a backend. */
-    PDMAUDIOSTREAMCTX_HOST,
-    /** Guest stream, connected to the device emulation. */
-    PDMAUDIOSTREAMCTX_GUEST,
-    /** Hack to blow the type up to 32-bit. */
-    PDMAUDIOSTREAMCTX_32BIT_HACK = 0x7fffffff
-} PDMAUDIOSTREAMCTX;
-
-/**
  * Structure for keeping audio input stream specifics.
  * Do not use directly. Instead, use PDMAUDIOSTREAM.
@@ -1015 +1000 @@
 } PDMAUDIOSTREAMOUT, *PPDMAUDIOSTREAMOUT;
 
+/** Pointer to an audio stream. */
 typedef struct PDMAUDIOSTREAM *PPDMAUDIOSTREAM;
 
 /**
- * Structure for maintaining an nput/output audio stream.
+ * Audio stream context.
+ * Needed for separating data from the guest and host side (per stream).
+ */
+typedef struct PDMAUDIOSTREAMCTX
+{
+    /** The stream's audio configuration. */
+    PDMAUDIOSTREAMCFG      Cfg;
+    /** This stream's mixing buffer. */
+    PDMAUDIOMIXBUF         MixBuf;
+} PDMAUDIOSTREAMCTX;
+
+/** Pointer to an audio stream context. */
+typedef struct PDMAUDIOSTREAM *PPDMAUDIOSTREAMCTX;
+
+/**
+ * Structure for maintaining an input/output audio stream.
  */
 typedef struct PDMAUDIOSTREAM
@@ -1024 +1025 @@
     /** List node. */
     RTLISTNODE             Node;
-    /** Pointer to the other pair of this stream.
-     *  This might be the host or guest side. */
-    PPDMAUDIOSTREAM        pPair;
     /** Name of this stream. */
     char                   szName[64];
@@ -1032 +1030 @@
      *  destroyed if the reference count is reaching 0. */
     uint32_t               cRefs;
-    /** The stream's audio configuration. */
-    PDMAUDIOSTREAMCFG      Cfg;
     /** Stream status flag. */
     PDMAUDIOSTREAMSTS      fStatus;
-    /** This stream's mixing buffer. */
-    PDMAUDIOMIXBUF         MixBuf;
     /** Audio direction of this stream. */
     PDMAUDIODIR            enmDir;
-    /** Context of this stream. */
-    PDMAUDIOSTREAMCTX      enmCtx;
+    /** The guest side of the stream. */
+    PDMAUDIOSTREAMCTX      Guest;
+    /** The host side of the stream. */
+    PDMAUDIOSTREAMCTX      Host;
+    /** Union for input/output specifics (based on enmDir). */
+    union
+    {
+        PDMAUDIOSTREAMIN   In;
+        PDMAUDIOSTREAMOUT  Out;
+    } RT_UNION_NM(u);
     /** Timestamp (in ns) since last iteration. */
     uint64_t               tsLastIteratedNs;
@@ -1054 +1056 @@
      *  data to actually start reading audio. */
     bool                   fThresholdReached;
-    /** Union for input/output specifics. */
-    union
-    {
-        PDMAUDIOSTREAMIN   In;
-        PDMAUDIOSTREAMOUT  Out;
-    } RT_UNION_NM(u);
     /** Data to backend-specific stream data.
      *  This data block will be casted by the backend to access its backend-dependent data.