Changeset 73039 in vbox for trunk

Timestamp:

Jul 10, 2018 4:06:45 PM (7 years ago)

Author:

vboxsync

Message:

Audio/Mixer: Added .WAV output support for mixer sinks (when VBOX_AUDIO_MIXER_DEBUG is set).

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (4 diffs)
• AudioMixer.h (modified) (1 diff)

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

@@ -811 +811 @@
     }
 
+#ifdef VBOX_AUDIO_MIXER_DEBUG
+    DrvAudioHlpFileDestroy(pSink->Dbg.pFile);
+    pSink->Dbg.pFile = NULL;
+#endif
+
     if (pSink->pszName)
     {
@@ -1157 +1162 @@
 # error "Implement me!"
 #else
+        Assert(cbRead <= cbBuf);
         if (cbRead)
             memcpy(pvBuf, pvMixBuf, cbRead);
 #endif
+
+#ifdef VBOX_AUDIO_MIXER_DEBUG
+        int rc2 = DrvAudioHlpFileWrite(pSink->Dbg.pFile, pvBuf, cbRead, 0 /* fFlags */);
+        AssertRC(rc2);
+#endif
         if (pcbRead)
             *pcbRead = cbRead;
@@ -1167 +1178 @@
     RTMemFree(pvMixBuf);
 #endif
-
 
 #ifdef LOG_ENABLED
@@ -1401 +1411 @@
     }
 #endif /* VBOX_AUDIO_MIXER_WITH_MIXBUF */
+
+#ifdef VBOX_AUDIO_MIXER_DEBUG
+    if (RT_SUCCESS(rc))
+    {
+        DrvAudioHlpFileClose(pSink->Dbg.pFile);
+
+        char szTemp[RTPATH_MAX];
+        int rc2 = RTPathTemp(szTemp, sizeof(szTemp));
+        if (RT_SUCCESS(rc2))
+        {
+            /** @todo Sanitize sink name. */
+
+            char szName[64];
+            RTStrPrintf(szName, sizeof(szName), "MixerSink-%s", pSink->pszName);
+
+            char szFile[RTPATH_MAX + 1];
+            rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, szName,
+                                         0 /* Instance */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
+            if (RT_SUCCESS(rc2))
+            {
+                rc2 = DrvAudioHlpFileCreate(PDMAUDIOFILETYPE_WAV, szFile, PDMAUDIOFILE_FLAG_NONE,
+                                            &pSink->Dbg.pFile);
+                if (RT_SUCCESS(rc2))
+                    rc2 = DrvAudioHlpFileOpen(pSink->Dbg.pFile, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS, &pSink->PCMProps);
+            }
+        }
+    }
+#endif
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);

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

@@ -192 +192 @@
     /** Timestamp (in ms) since last update. */
     uint64_t                tsLastUpdatedMS;
+#ifdef VBOX_AUDIO_MIXER_DEBUG
+    struct
+    {
+        PPDMAUDIOFILE       pFile;
+    } Dbg;
+#endif
 } AUDMIXSINK, *PAUDMIXSINK;