Changeset 67469 in vbox for trunk/src

Timestamp:

Jun 19, 2017 11:13:52 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Added drvAudioDbgGetFileNameA() + drvAudioDbgPCMDelete(). More PCM debug output.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (10 diffs)

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

@@ -139 +139 @@
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
-static void drvAudioDbgPCMDumpA(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix, const void *pvData, size_t cbData);
+static char *drvAudioDbgGetFileNameA(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix);
+static void  drvAudioDbgPCMDelete(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix);
+static void  drvAudioDbgPCMDump(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix, const void *pvData, size_t cbData);
 #endif
 
@@ -967 +969 @@
                              pGstStream->szName, pszGstSts, pszHstSts, cbBuf, csWritten, rc));
         }
+#endif
+
+#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
+        drvAudioDbgPCMDump(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "StreamWrite.pcm", pvBuf, cbBuf);
 #endif
 
@@ -1321 +1327 @@
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
-                drvAudioDbgPCMDumpA(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "PlayNonInterleaved.pcm",
-                                    auBuf, cbPlayed);
+                drvAudioDbgPCMDump(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "PlayNonInterleaved.pcm",
+                                   auBuf, cbPlayed);
 #endif
                 AssertMsg(cbPlayed <= cbRead, ("Played more than available (%RU32 available but got %RU32)\n", cbRead, cbPlayed));
@@ -1605 +1611 @@
         {
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
-            drvAudioDbgPCMDumpA(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "CaptureNonInterleaved.pcm",
-                                auBuf, cbCaptured);
+            drvAudioDbgPCMDump(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "CaptureNonInterleaved.pcm",
+                               auBuf, cbCaptured);
 #endif
             Assert(cbCaptured <= cbBuf);
@@ -2074 +2080 @@
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
 /**
+ * Returns an unique file name for this given audio connector instance.
+ *
+ * @return  Allocated file name. Must be free'd using RTStrFree().
+ * @param   pThis               Driver instance.
+ * @param   pszPath             Path name of the file to delete. The path must exist.
+ * @param   pszSuffix           File name suffix to use.
+ */
+static char *drvAudioDbgGetFileNameA(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix)
+{
+    char szFileName[64];
+    RTStrPrintf(szFileName, sizeof(szFileName), "drvAudio%RU32-%s", pThis->pDrvIns->iInstance, pszSuffix);
+
+    char szFilePath[RTPATH_MAX];
+    int rc2 = RTStrCopy(szFilePath, sizeof(szFilePath), pszPath);
+    AssertRC(rc2);
+    rc2 = RTPathAppend(szFilePath, sizeof(szFilePath), szFileName);
+    AssertRC(rc2);
+
+    return RTStrDup(szFilePath);
+}
+
+/**
+ * Deletes a PCM audio dump file.
+ *
+ * @param   pThis               Driver instance.
+ * @param   pszPath             Path name of the file to delete. The path must exist.
+ * @param   pszSuffix           File name suffix to use.
+ */
+static void drvAudioDbgPCMDelete(PDRVAUDIO pThis, const char *pszPath, const char *pszSuffix)
+{
+    char *pszFileName = drvAudioDbgGetFileNameA(pThis, pszPath, pszSuffix);
+    AssertPtr(pszFileName);
+
+    RTFileDelete(pszFileName);
+
+    RTStrFree(pszFileName);
+}
+
+/**
  * Dumps (raw) PCM audio data into a file by appending.
  * Every driver instance will have an own prefix to not introduce writing races.
@@ -2083 +2128 @@
  * @param   cbData              Size (in bytes) of PCM data to dump.
  */
-static void drvAudioDbgPCMDumpA(PDRVAUDIO pThis,
-                                const char *pszPath, const char *pszSuffix, const void *pvData, size_t cbData)
+static void drvAudioDbgPCMDump(PDRVAUDIO pThis,
+                               const char *pszPath, const char *pszSuffix, const void *pvData, size_t cbData)
 {
     if (!pvData || !cbData)
@@ -2091 +2136 @@
     AssertPtr(pThis->pDrvIns);
 
-    char szFileName[64];
-    RTStrPrintf(szFileName, sizeof(szFileName), "drvAudio%RU32-%s", pThis->pDrvIns->iInstance, pszSuffix);
-
-    char szFilePath[RTPATH_MAX];
-    int rc2 = RTStrCopy(szFilePath, sizeof(szFilePath), pszPath);
-    AssertRC(rc2);
-    rc2 = RTPathAppend(szFilePath, sizeof(szFilePath), szFileName);
-    AssertRC(rc2);
+    char *pszFileName = drvAudioDbgGetFileNameA(pThis, pszPath, pszSuffix);
+    AssertPtr(pszFileName);
 
     RTFILE fh;
-    rc2 = RTFileOpen(&fh, szFilePath,
-                     RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
+    int rc2 = RTFileOpen(&fh, pszFileName, RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
     AssertRC(rc2);
     if (RT_SUCCESS(rc2))
@@ -2109 +2147 @@
         RTFileClose(fh);
     }
+
+    RTStrFree(pszFileName);
 }
 #endif /* VBOX_AUDIO_DEBUG_DUMP_PCM_DATA */
@@ -2295 +2335 @@
             {
                 cbRead = AUDIOMIXBUF_S2B(&pGstStream->MixBuf, cRead);
+
+#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
+                drvAudioDbgPCMDump(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "StreamRead.pcm", pvBuf, cbRead);
+#endif
 
 #ifdef VBOX_WITH_STATISTICS
@@ -3151 +3195 @@
         PDMDrvHlpSTAMRegProfileAdvEx(pDrvIns, &pThis->Stats.DelayOut,          "DelayOut",
                                      STAMUNIT_NS_PER_CALL, "Profiling of output data processing.");
+#endif
+
+#ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA
+        drvAudioDbgPCMDelete(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "StreamRead.pcm");
+        drvAudioDbgPCMDelete(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "StreamWrite.pcm");
+        drvAudioDbgPCMDelete(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "PlayNonInterleaved.pcm");
+        drvAudioDbgPCMDelete(pThis, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH, "CaptureNonInterleaved.pcm");
 #endif
     }