Changeset 3934

Timestamp:

Jan 4, 2012 2:39:13 AM (11 years ago)

Author:

ming

Message:

Fixed #1438: CoInitializeEx? by application prevents dshow device from working
Return error if application already initialized COM library with a different concurrency model than what dshow_dev needs.

File:

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

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

@@ -210 +210 @@
 static pj_status_t dshow_factory_init(pjmedia_vid_dev_factory *f)
 {
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    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;
+    }
 
     return dshow_factory_refresh(f);