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

Timestamp:

Mar 22, 2011 9:46:04 AM (14 years ago)

Author:

nanang

Message:

Re #1213:

• Added encoding format conversion (only format ID) in video port.
• Fixed few bugs in direct show capture device:
  • VIDEOINFOHEADER.AvgTimePerFrame? calculation overflow which caused failure in opening capture device.
  • AM_MEDIA_TYPE.formattype validation to avoid bad type casting (of VIDEOINFOHEADER).

File:

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

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

@@ -611 +611 @@
 
                     for (i = 0; i < icount; i++) {
-                        RPC_STATUS rpcstatus;
+                        RPC_STATUS rpcstatus, rpcstatus2;
 
                         hr = IAMStreamConfig_GetStreamCaps(streamcaps, i,
@@ -619 +619 @@
                             continue;
 
-                        if (UuidCompare(&mediatype->subtype,
-                                        (UUID *)dshow_format,
-                                        &rpcstatus) == 0 &&
-                            rpcstatus == RPC_S_OK)
+                        if (UuidCompare(&mediatype->subtype, 
+                                        (UUID*)dshow_format,
+                                        &rpcstatus) == 0 && 
+                            rpcstatus == RPC_S_OK &&
+                            UuidCompare(&mediatype->formattype,
+                                        (UUID*)&FORMAT_VideoInfo,
+                                        &rpcstatus2) == 0 &&
+                            rpcstatus2 == RPC_S_OK)
                         {
                             srcpin = pPin;
                             graph->mediatype = mediatype;
-                            break;
+                            break;
                         }
                     }
@@ -674 +678 @@
     if (vfd->fps.num != 0)
         video_info->AvgTimePerFrame = (LONGLONG) (10000000 * 
-                                      vfd->fps.denum /
-                                      (double)vfd->fps.num);
+                                                  (double)vfd->fps.denum /
+                                                  vfd->fps.num);
     video_info->bmiHeader.biSizeImage = DIBSIZE(video_info->bmiHeader);
     mediatype->lSampleSize = DIBSIZE(video_info->bmiHeader);