Changeset 108360 in vbox

Timestamp:

Feb 24, 2025 6:04:12 PM (2 weeks ago)

Author:

vboxsync

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

167720

Message:

Audio/DrvHostAudioWasApi: Extended logging a bit for better analysis within release builds. bugref:10844

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (11 diffs)

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

@@ -340 +340 @@
 
 
+/**
+ * Returns the MMDeviceState as a string.
+ *
+ * @returns Pointer to MMDeviceState string.
+ * @param   dwState             MMDeviceState to return as a string.
+ */
+DECLINLINE(const char *) drvHostAudioWasMMDeviceStateToString(DWORD dwState)
+{
+    switch (dwState)
+    {
+        case DEVICE_STATE_ACTIVE:     return "ACTIVE";
+        case DEVICE_STATE_DISABLED:   return "DISABLED";
+        case DEVICE_STATE_NOTPRESENT: return "NOTPRESENT";
+        case DEVICE_STATE_UNPLUGGED:  return "UNPLUGGED";
+        default:                      break;
+    }
+
+    AssertFailed();
+    return "???";
+}
+
+
 /*********************************************************************************************************************************
 *   IMMNotificationClient implementation
@@ -455 +477 @@
     IFACEMETHODIMP OnDeviceStateChanged(LPCWSTR pwszDeviceId, DWORD dwNewState)
     {
-        RT_NOREF(pwszDeviceId, dwNewState);
-        Log7Func(("pwszDeviceId=%ls dwNewState=%u (%#x)\n", pwszDeviceId, dwNewState, dwNewState));
-
+        LogRelMax(64, ("WasAPI: Device state for '%ls' changed to %s (%#x)\n",
+                       pwszDeviceId, drvHostAudioWasMMDeviceStateToString(dwNewState), dwNewState));
         /*
          * Just trigger device re-enumeration.
@@ -474 +495 @@
     IFACEMETHODIMP OnDeviceAdded(LPCWSTR pwszDeviceId)
     {
-        RT_NOREF(pwszDeviceId);
-        Log7Func(("pwszDeviceId=%ls\n", pwszDeviceId));
+        LogRelMax(64, ("WasAPI: Device '%ls' added\n", pwszDeviceId));
 
         /*
@@ -516 +536 @@
     IFACEMETHODIMP OnDeviceRemoved(LPCWSTR pwszDeviceId)
     {
-        RT_NOREF(pwszDeviceId);
-        Log7Func(("pwszDeviceId=%ls\n", pwszDeviceId));
+        LogRelMax(64, ("WasAPI: Device '%ls' removed\n", pwszDeviceId));
 
         /*
@@ -1243 +1262 @@
             LogRel2(("WasAPI: Checking for cached device '%ls' ...\n", pwszDevId));
 
+#define LOG_STALE_DEVICE(a_LogRel2What) \
+    LogRel2(a_LogRel2What); \
+    LogRel(("WasAPI: Stale audio interface '%ls' detected!\n", pDevEntry->wszDevId));
+
+#define LOG_STALE_DEVICE_BREAK(a_LogRel2What) \
+    { \
+        LOG_STALE_DEVICE(a_LogRel2What); \
+        break; \
+    }
+
             /*
              * The cache has two levels, so first the device entry.
@@ -1264 +1293 @@
                      */
                     if (pDevEntry->pIDevice != pIDevice)
-                    {
-                        LogRel2(("WasAPI: Cache hit for device '%ls': Stale interface (new: %p, old: %p)\n",
-                                  pDevEntry->wszDevId, pIDevice, pDevEntry->pIDevice));
-
-                        LogRel(("WasAPI: Stale audio interface '%ls' detected!\n", pDevEntry->wszDevId));
-                        break;
-                    }
-
-                    LogRel2(("WasAPI: Cache hit for device '%ls' (%p)\n", pwszDevId, pIDevice));
+                        LOG_STALE_DEVICE_BREAK(("WasAPI: Cache hit for device '%ls': Stale interface (new: %p, old: %p)\n",
+                                                pDevEntry->wszDevId, pIDevice, pDevEntry->pIDevice));
+
+                    LogRel2(("WasAPI: Cache hit for device '%ls' (iface %p)\n", pwszDevId, pIDevice));
 
                     CoTaskMemFree(pwszDevId);
@@ -1282 +1306 @@
             RTCritSectLeave(&pThis->CritSectCache);
 
-            LogRel2(("WasAPI: Cache miss for device '%ls' (%p)\n", pwszDevId, pIDevice));
+            LogRel2(("WasAPI: Cache miss for device '%ls' (iface %p)\n", pwszDevId, pIDevice));
+
+#undef LOG_STALE_DEVICE_BREAK
+#undef LOG_STALE_DEVICE
+
         }
         else
-            LogRel2(("WasAPI: Cache disabled for device '%ls' (%p)\n", pwszDevId, pIDevice));
+            LogRel2(("WasAPI: Cache disabled for device '%ls' (iface %p)\n", pwszDevId, pIDevice));
 
         /*
@@ -1329 +1357 @@
                         pDevEntry = NULL;
 
-                        LogRel2(("WasAPI: Lost race adding device '%ls': %p\n", pDevEntry2->wszDevId, pDevEntry2));
+                        LogRel2(("WasAPI: Lost race adding device '%ls' (node %p)\n", pDevEntry2->wszDevId, pDevEntry2));
                         return drvHostAudioWasCacheLookupOrCreateConfig(pThis, pDevEntry2, pCfgReq, fOnWorker, ppDevCfg);
                     }
@@ -1335 +1363 @@
                 RTListPrepend(&pThis->CacheHead, &pDevEntry->ListEntry);
 
-                LogRel2(("WasAPI: Added device '%ls' to cache: %p\n", pDevEntry->wszDevId, pDevEntry));
+                LogRel2(("WasAPI: Added device '%ls' to cache (node %p)\n", pDevEntry->wszDevId, pDevEntry));
             }
 
@@ -3318 +3346 @@
         hrc = pThis->pIEnumerator->GetDefaultAudioEndpoint(eCapture, eMultimedia, &pIDeviceInput);
     if (SUCCEEDED(hrc))
-        LogFlowFunc(("pIDeviceInput=%p\n", pIDeviceInput));
+        LogRel(("WasAPI: Input device is: %ls (iface %p)\n",
+                pThis->pwszInputDevId ? pThis->pwszInputDevId : L"{Default}", pIDeviceInput));
     else
     {
@@ -3332 +3361 @@
         hrc = pThis->pIEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &pIDeviceOutput);
     if (SUCCEEDED(hrc))
-        LogFlowFunc(("pIDeviceOutput=%p\n", pIDeviceOutput));
+        LogRel(("WasAPI: Output device is: %ls (iface %p)\n",
+                pThis->pwszOutputDevId ? pThis->pwszOutputDevId : L"{Default}", pIDeviceOutput));
     else
     {