Changeset 4951 for pjproject

Timestamp:

Oct 17, 2014 3:47:40 AM (10 years ago)

Author:

riza

Message:

Misc (re #1782): Fixed initialize Dshow failed when the COM library already initialized.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c

@@ -215 +215 @@
 {
     HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-    if (hr == RPC_E_CHANGED_MODE) {
-        PJ_LOG(4,(THIS_FILE, "Failed initializing DShow: "
-                             "COM library already initialized with "
-                             "incompatible concurrency model"));
-        return PJMEDIA_EVID_INIT;
+    if (hr == RPC_E_CHANGED_MODE) {     
+        /* When using apartment mode, Dshow object would not be accessible from 
+         * other thread. Take this into consideration when implementing native
+         * renderer using Dshow. 
+         */
+        hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+        if (FAILED(hr)) {
+            PJ_LOG(4,(THIS_FILE, "Failed initializing DShow: "
+                                 "COM library already initialized with "
+                                 "incompatible concurrency model"));
+            return PJMEDIA_EVID_INIT;
+        }
     }