Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7

1 files changed, 13 insertions, 3 deletions

diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index a266e2226..9e1be9606 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -1098,9 +1098,19 @@ void DSCameraSession::disconnectGraph()
         pPin = NULL;
     }
 
-    m_filterGraph->RemoveFilter(m_nullRendererFilter);
-    m_filterGraph->RemoveFilter(m_previewFilter);
-    m_filterGraph->RemoveFilter(m_sourceFilter);
+    // To avoid increasing the memory usage every time the graph is re-connected it's
+    // important that all filters are released; also the ones added by the "Intelligent Connect".
+    IEnumFilters *enumFilters = NULL;
+    hr = m_filterGraph->EnumFilters(&enumFilters);
+    if (SUCCEEDED(hr))  {
+        IBaseFilter *filter = NULL;
+        while (enumFilters->Next(1, &filter, NULL) == S_OK) {
+                m_filterGraph->RemoveFilter(filter);
+                enumFilters->Reset();
+                filter->Release();
+        }
+        enumFilters->Release();
+    }
 }
 
 static bool qt_frameRateRangeGreaterThan(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2)