Changeset 3505 for pjproject

Timestamp:

Apr 7, 2011 7:22:35 AM (14 years ago)

Author:

bennylp

Message:

Re #1213: added printing error message when fails to open DirectShow? device

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/dshow_dev.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/dshow_dev.c

@@ -39 +39 @@
 #pragma comment(lib, "Strmiids.lib")
 #pragma comment(lib, "Rpcrt4.lib")
+#pragma comment(lib, "Quartz.lib")
 
 #define THIS_FILE               "dshow_dev.c"
@@ -702 +703 @@
     if (vi)
         CoTaskMemFree(vi);
-    if (FAILED(hr))
-        return hr;
+    if (FAILED(hr)) {
+        char msg[80];
+        if (AMGetErrorText(hr, msg, sizeof(msg))) {
+            PJ_LOG(4,(THIS_FILE, "Error creating filter graph: %s (hr=0x%x)", 
+                      msg, hr));
+        }
+        return PJ_EUNKNOWN;
+    }
 
     return PJ_SUCCESS;
@@ -771 +778 @@
 on_error:
     dshow_stream_destroy((pjmedia_vid_dev_stream *)strm);
-    return PJ_EUNKNOWN;
+    return status;
 }
 
@@ -850 +857 @@
         hr = IMediaFilter_Run(stream->dgraph[i].media_filter, 0);
         if (FAILED(hr)) {
-            return hr;
+            char msg[80];
+            if (AMGetErrorText(hr, msg, sizeof(msg))) {
+                PJ_LOG(4,(THIS_FILE, "Error starting media: %s", msg));
+            }
+            return PJ_EUNKNOWN;
         }
     }