Changeset 4922

Timestamp:

Sep 15, 2014 9:02:15 AM (10 years ago)

Author:

ming

Message:

Fixed #1787: Failure of DShow device to open a certain resolution

File:

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

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

@@ -272 +272 @@
                          const GUID *dshow_fmt,
                          AM_MEDIA_TYPE **pMediatype,
+                         int width,
+                         int height,
                          IPin **pSrcpin,
-                         pj_bool_t *sup_fmt)
+                         pjmedia_vid_dev_info *vdi)
 {
     IEnumPins *pEnum;
     AM_MEDIA_TYPE *mediatype = NULL;
+    pj_bool_t match_wh = PJ_FALSE;
     HRESULT hr;
 
@@ -334 +337 @@
                                 rpcstatus2 == RPC_S_OK)
                             {
+                                VIDEOINFOHEADER *vi;
+
+                                vi = (VIDEOINFOHEADER *)mediatype->pbFormat;
                                 if (!dshow_fmt)
                                     dshow_fmts[j].enabled = PJ_TRUE;
-                                if (sup_fmt)
-                                    sup_fmt[j] = PJ_TRUE;
-                                if (pSrcpin) {
+
+                                if (vdi && vdi->fmt_cnt <
+                                    PJMEDIA_VID_DEV_INFO_FMT_CNT)
+                                {
+                                    unsigned fps_num=DEFAULT_FPS, fps_denum=1;
+                                    
+                                    if (vi->AvgTimePerFrame != 0) {
+                                        fps_num = 10000000;
+                                        fps_denum=(unsigned)vi->AvgTimePerFrame;
+                                    }
+                                        
+                                    pjmedia_format_init_video(
+                                        &vdi->fmt[vdi->fmt_cnt++],
+                                        dshow_fmts[j].pjmedia_format,
+                                        vi->bmiHeader.biWidth,
+                                        vi->bmiHeader.biHeight,
+                                        fps_num, fps_denum);
+                                }
+                                
+                                if (pSrcpin) {
+                                    if ((width == 0 && height == 0 ) ||
+                                        (vi->bmiHeader.biWidth == width &&
+                                         vi->bmiHeader.biHeight == height))
+                                    {
+                                        match_wh = PJ_TRUE;
+                                    }
                                     *pSrcpin = pPin;
                                     *pMediatype = mediatype;
@@ -344 +373 @@
                             }
                         }
-                        if (pSrcpin && *pSrcpin)
+                        if (pSrcpin && *pSrcpin && match_wh)
                             break;
                     }
@@ -378 +407 @@
     }
 
+    for (c = 0; c < sizeof(dshow_fmts) / sizeof(dshow_fmts[0]); c++) {
+        dshow_fmts[c].enabled = PJ_FALSE;
+    }
+    
     df->dev_count = 0;
     df->dev_pool = pj_pool_create(df->pf, "dshow video", 500, 500, NULL);
@@ -447 +480 @@
                     hr = get_cap_device(df, df->dev_count-1, &filter);
                     if (SUCCEEDED(hr)) {
-                        unsigned j;
-                        pj_bool_t sup_fmt[sizeof(dshow_fmts)/sizeof(dshow_fmts[0])];
-
-                        pj_bzero(sup_fmt, sizeof(sup_fmt));
-                        enum_dev_cap(filter, ddi->info.dir, NULL, NULL, NULL, sup_fmt);
-
                         ddi->info.fmt_cnt = 0;
-                        for (j = 0;
-                             j < sizeof(dshow_fmts)/sizeof(dshow_fmts[0]);
-                             j++)
-                        {
-                            if (!sup_fmt[j])
-                                continue;
-                            pjmedia_format_init_video(
-                                &ddi->info.fmt[ddi->info.fmt_cnt++],
-                                dshow_fmts[j].pjmedia_format, 
-                                DEFAULT_WIDTH, DEFAULT_HEIGHT, 
-                                DEFAULT_FPS, 1);
-                        }
+                        enum_dev_cap(filter, ddi->info.dir, NULL, NULL,
+                                     0, 0, NULL, &ddi->info);
                     }
                 }
@@ -736 +753 @@
     enum_dev_cap(graph->source_filter, dir,
                  get_dshow_format_info(strm->param.fmt.id)->dshow_format,
-                 &mediatype, &srcpin, NULL);
+                 &mediatype, (use_def_size? 0: vfd->size.w),
+                 (use_def_size? 0: vfd->size.h), &srcpin, NULL);
     graph->mediatype = mediatype;