Changeset 100874 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 14, 2023 4:56:27 PM (19 months ago)

Author:

vboxsync

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

158791

Message:

Audio/WAS: Make sure to invalidate the cached audio interfaces of the device entry configurations. This is needed when the audio interface becomes invalid on a host device switch. See comment for details. bugref:10503.

File:

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

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

@@ -812 +812 @@
 }
 
+/**
+ * Invalidates device cache entry configurations.
+ *
+ * @param   pThis       The WASAPI host audio driver instance data.
+ * @param   pDevEntry   The device entry to invalidate.
+ */
+static void drvHostAudioWasCacheInvalidateDevEntryConfig(PDRVHOSTAUDIOWAS pThis, PDRVHOSTAUDIOWASCACHEDEV pDevEntry)
+{
+    RT_NOREF(pThis);
+
+    Log8Func(("Invalidating cache entry configurations: %p - '%ls'\n", pDevEntry, pDevEntry->wszDevId));
+
+    PDRVHOSTAUDIOWASCACHEDEVCFG pDevCfg, pDevCfgNext;
+    RTListForEachSafe(&pDevEntry->ConfigList, pDevCfg, pDevCfgNext, DRVHOSTAUDIOWASCACHEDEVCFG, ListEntry)
+        pDevCfg->pIAudioClient = NULL;
+}
 
 /**
@@ -1224 +1240 @@
          * The cache has two levels, so first the device entry.
          */
-        PDRVHOSTAUDIOWASCACHEDEV pDevEntry;
+        PDRVHOSTAUDIOWASCACHEDEV pDevEntry, pDevEntryNext;
         RTCritSectEnter(&pThis->CritSectCache);
-        RTListForEach(&pThis->CacheHead, pDevEntry, DRVHOSTAUDIOWASCACHEDEV, ListEntry)
+        RTListForEachSafe(&pThis->CacheHead, pDevEntry, pDevEntryNext, DRVHOSTAUDIOWASCACHEDEV, ListEntry)
         {
             if (   pDevEntry->cwcDevId == cwcDevId
@@ -1232 +1248 @@
                 && RTUtf16Cmp(pDevEntry->wszDevId, pwszDevId) == 0)
             {
+                /*
+                 * Cache hit -- here we now need to also check if the device interface we want to look up
+                 * actually matches the one we have in the cache entry.
+                 *
+                 * If it doesn't, invalidate + remove the cache entry from the cache and bail out.
+                 * Add a new device entry to the cache with the new interface below then.
+                 *
+                 * This is needed when switching audio interfaces and the device interface becomes invalid via
+                 * AUDCLNT_E_DEVICE_INVALIDATED.  See @bugref{10503}
+                 */
+                if (pIDevice != pDevEntry->pIDevice)
+                {
+                    Log2Func(("Cache hit for device '%ls': Stale interface (new: %p, old: %p)\n",
+                              pDevEntry->wszDevId, pIDevice, pDevEntry->pIDevice));
+
+                    drvHostAudioWasCacheInvalidateDevEntryConfig(pThis, pDevEntry);
+                    RTListNodeRemove(&pDevEntry->ListEntry);
+                    drvHostAudioWasCacheDestroyDevEntry(pThis, pDevEntry);
+                    pDevEntry = NULL;
+                    break;
+                }
+
                 CoTaskMemFree(pwszDevId);
                 Log8Func(("Cache hit for device '%ls': %p\n", pDevEntry->wszDevId, pDevEntry));
@@ -1238 +1276 @@
         }
         RTCritSectLeave(&pThis->CritSectCache);
+
+        Log8Func(("Cache miss for device '%ls': %p\n", pDevEntry->wszDevId, pDevEntry));
 
         /*