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

Timestamp:

Jul 15, 2011 4:36:06 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1320):

• Updated (again) vs2005 projects setting for other newly added files (pjmedia-videodev/errno.c).
• Disabled VMR/DirectShow renderer temporarily.

File:

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

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

@@ -47 +47 @@
 #define DEFAULT_FPS             25
 
+/* Temporarily disable DirectShow renderer (VMR) */
+#define HAS_VMR                 0
+
 typedef void (*input_callback)(void *user_data, IMediaSample *pMediaSample);
 typedef struct NullRenderer NullRenderer;
@@ -231 +234 @@
     struct dshow_dev_info *ddi;
     int dev_count = 0;
-    unsigned c, i;
+    unsigned c;
     ICreateDevEnum *dev_enum = NULL;
     IEnumMoniker *enum_cat = NULL;
@@ -322 +325 @@
     }
 
+#if HAS_VMR
     ddi = &df->dev_info[df->dev_count++];
     pj_bzero(ddi, sizeof(*ddi));
@@ -334 +338 @@
 
     for (c = 0; c < df->dev_count; c++) {
+        unsigned i;
+
         ddi = &df->dev_info[c];
         ddi->info.fmt_cnt = sizeof(dshow_fmts)/sizeof(dshow_fmts[0]);
@@ -350 +356 @@
         }
     }
+#endif
+
 
 //    TODO: