Remove redundant reference counter, MFStartup and CoInitialize has own

Change-Id: I480c337f4c401d1dab3e54af6473c137ea94f0f4
Reviewed-by: André de la Rocha <andre.rocha@qt.io>

2 files changed, 4 insertions, 16 deletions

diff --git a/src/plugins/multimedia/windows/qwindowsintegration.cpp b/src/plugins/multimedia/windows/qwindowsintegration.cpp
index 30642ead3..469e076c8 100644
--- a/src/plugins/multimedia/windows/qwindowsintegration.cpp
+++ b/src/plugins/multimedia/windows/qwindowsintegration.cpp
@@ -69,27 +69,18 @@ public:
     }
 };
 
-static int g_refCount = 0;
-
 QWindowsMediaIntegration::QWindowsMediaIntegration()
 {
-    g_refCount++;
-    if (g_refCount == 1) {
-        CoInitialize(NULL);
-        MFStartup(MF_VERSION);
-    }
+    CoInitialize(NULL);
+    MFStartup(MF_VERSION);
 }
 
 QWindowsMediaIntegration::~QWindowsMediaIntegration()
 {
     delete m_formatInfo;
 
-    g_refCount--;
-    if (g_refCount == 0) {
-        // ### This currently crashes on exit
-//        MFShutdown();
-//        CoUninitialize();
-    }
+    MFShutdown();
+    CoUninitialize();
 }
 
 QPlatformMediaFormatInfo *QWindowsMediaIntegration::formatInfo()
diff --git a/src/plugins/multimedia/windows/qwindowsintegration_p.h b/src/plugins/multimedia/windows/qwindowsintegration_p.h
index a93b9da94..12aed995f 100644
--- a/src/plugins/multimedia/windows/qwindowsintegration_p.h
+++ b/src/plugins/multimedia/windows/qwindowsintegration_p.h
@@ -64,9 +64,6 @@ public:
     QWindowsMediaIntegration();
     ~QWindowsMediaIntegration();
 
-    void addRefCount();
-    void releaseRefCount();
-
     QPlatformMediaFormatInfo *formatInfo() override;
 
     QPlatformMediaCaptureSession *createCaptureSession() override;