Changeset 67418 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 15, 2017 9:36:52 AM (8 years ago)

Author:

vboxsync

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

116144

Message:

Audio/DevHDA: Fixes for synchronous handling (!VBOX_WITH_AUDIO_HDA_ASYNC_IO).

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -1023 +1023 @@
 static void          hdaStreamLock(PHDASTREAM pStream);
 static void          hdaStreamUnlock(PHDASTREAM pStream);
+static int           hdaStreamRead(PHDASTATE pThis, PHDASTREAM pStream, uint32_t cbToRead, uint32_t *pcbRead);
+//static int           hdaStreamWrite(PHDASTATE pThis, PHDASTREAM pStream, uint32_t cbToWrite, uint32_t *pcbWritten);
 # ifdef HDA_USE_DMA_ACCESS_HANDLER
 static bool          hdaStreamRegisterDMAHandlers(PHDASTATE pThis, PHDASTREAM pStream);
@@ -5049 +5051 @@
 #else
             /* Read audio data from the HDA stream and write to the backends. */
-            rc2 = hdaStreamRead(pThis, pStream, cbToWrite, NULL /* pcbRead */);
+            rc2 = hdaStreamRead(pThis, pStreamFront, cbToWrite, NULL /* pcbRead */);
             AssertRC(rc2);
 #endif
@@ -5055 +5057 @@
     }
 
-#ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
+#ifndef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    /*
+     * Update all mixer sinks here (synchronously).
+     * For async I/O this is done in the stream's specific async I/O thread.
+     */
+    rc2 = AudioMixerSinkUpdate(pThis->SinkFront.pMixSink);
+    AssertRC(rc2);
+
+# ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
     rc2 = AudioMixerSinkUpdate(pThis->SinkCenterLFE.pMixSink);
     AssertRC(rc2);
@@ -5068 +5078 @@
      * out of the Front sink (depending on the mapping layout).
      */
-#endif
+# endif /* VBOX_WITH_AUDIO_HDA_51_SURROUND */
+#endif /* !VBOX_WITH_AUDIO_HDA_ASYNC_IO */
 }
 
@@ -5290 +5301 @@
 }
 
+#if 0
 /**
  * Writes audio data from a mixer sink into an HDA stream's DMA buffer.
@@ -5350 +5362 @@
     return VINF_SUCCESS;
 }
+#endif
 
 /**