Changeset 4253

Timestamp:

Sep 13, 2012 8:35:24 AM (12 years ago)

Author:

ming

Message:

Re #1562: Add support for multiple GUIDs that represents the same format (such as I420/IYUV) in DShow device.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c (modified) (3 diffs)

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

@@ -66 +66 @@
     pjmedia_format_id    pjmedia_format;
     const GUID          *dshow_format;
+    pj_bool_t            enabled;
 } dshow_fmt_info;
 
 static dshow_fmt_info dshow_fmts[] =
 {
-    {PJMEDIA_FORMAT_YUY2, &MEDIASUBTYPE_YUY2} ,
-    {PJMEDIA_FORMAT_RGB24, &MEDIASUBTYPE_RGB24} ,
-    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
-    {PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV} ,
-    {PJMEDIA_FORMAT_I420, &WMMEDIASUBTYPE_I420}
+    {PJMEDIA_FORMAT_YUY2, &MEDIASUBTYPE_YUY2, PJ_FALSE} ,
+    {PJMEDIA_FORMAT_RGB24, &MEDIASUBTYPE_RGB24, PJ_FALSE} ,
+    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32, PJ_FALSE} ,
+    {PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV, PJ_FALSE} ,
+    {PJMEDIA_FORMAT_I420, &WMMEDIASUBTYPE_I420, PJ_FALSE}
 };
 
@@ -332 +333 @@
                                 rpcstatus2 == RPC_S_OK)
                             {
+                                if (!dshow_fmt)
+                                    dshow_fmts[j].enabled = PJ_TRUE;
                                 if (sup_fmt)
                                     sup_fmt[j] = PJ_TRUE;
@@ -643 +646 @@
 
     for (i = 0; i < sizeof(dshow_fmts)/sizeof(dshow_fmts[0]); i++) {
-        if (dshow_fmts[i].pjmedia_format == id)
+        if (dshow_fmts[i].pjmedia_format == id && dshow_fmts[i].enabled)
             return &dshow_fmts[i];
     }