Changeset 88723 in vbox for trunk/include/VBox

Timestamp:

Apr 27, 2021 10:03:19 AM (4 years ago)

Author:

vboxsync

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

144041

Message:

Audio: The audio device (i.e. AudioMixer.cpp) is now responsible for initiating stream re-initialzation on backend device changes, as it needs to update the peek state with its mixer buffer. bugref:9890

Location:

trunk/include/VBox/vmm

Files:

• pdmaudioifs.h (modified) (4 diffs)
• pdmaudioinline.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -910 +910 @@
  *  that this is an enabled stream! */
 #define PDMAUDIOSTREAMSTS_FLAGS_PAUSED          RT_BIT_32(2)
-/** Whether this stream was marked as being disabled
+/** Indicates that the stream is draining (output only).
+ *  Whether this stream was marked as being disabled
  *  but there are still associated guest output streams
  *  which rely on its data. */
 #define PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE RT_BIT_32(3)
-/** Whether this stream is in re-initialization phase.
- *  All other bits remain untouched to be able to restore
- *  the stream's state after the re-initialization bas been
- *  finished. */
-#define PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT  RT_BIT_32(4)
+/** Whether this stream is in re-initialization phase and requires the device
+ *  to call pfnStreamReInit.
+ *
+ *  All other bits remain untouched to be able to restore the stream's state
+ *  after the re-initialization has been completed. */
+#define PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT     RT_BIT_32(4)
 /** Validation mask. */
 #define PDMAUDIOSTREAMSTS_VALID_MASK            UINT32_C(0x0000001F)
@@ -1080 +1082 @@
                                                 PPDMAUDIOSTREAMCFG pCfgGuest, PPDMAUDIOSTREAM *ppStream));
 
+
     /**
      * Destroys an audio stream.
@@ -1087 +1090 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnStreamDestroy, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
+
+    /**
+     * Re-initializes the stream in response to PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT.
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to this interface.
+     * @param   pStream         The audio stream needing re-initialization.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnStreamReInit, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
 
     /**
@@ -1204 +1216 @@
 
 /** PDMIAUDIOCONNECTOR interface ID. */
-#define PDMIAUDIOCONNECTOR_IID                  "00ee6f8e-16ab-4e9a-977c-d506c163be77"
+#define PDMIAUDIOCONNECTOR_IID                  "ff6788cc-1a4d-4d4b-a2e0-9f56fce9b397"
 
 

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -435 +435 @@
                        | PDMAUDIOSTREAMSTS_FLAGS_ENABLED
                        | PDMAUDIOSTREAMSTS_FLAGS_PAUSED
-                       | PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT ))
+                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT ))
         == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
             | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
@@ -459 +459 @@
                        | PDMAUDIOSTREAMSTS_FLAGS_PAUSED
                        | PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE
-                       | PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT))
+                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT))
         == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
             | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
@@ -479 +479 @@
     return (fStatus & (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
                        | PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-                       | PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT))
+                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT))
         == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
             | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);