Changeset 3953

Timestamp:

Feb 16, 2012 8:49:33 AM (12 years ago)

Author:

ming

Message:

Re 1446#: Fix division by zero error caused by DShow if video device does not supply AvgTimePerFrame? information (AvgTimePerFrame?=0).

Location:

pjproject/trunk/pjmedia/src

Files:

• pjmedia-videodev/dshow_dev.c (modified) (1 diff)
• pjmedia/format.c (modified) (1 diff)

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

@@ -770 +770 @@
         video_info->bmiHeader.biHeight = vfd->size.h;
     }
-    if (!use_def_fps && vfd->fps.num != 0)
+    if (video_info->AvgTimePerFrame == 0 ||
+        (!use_def_fps && vfd->fps.num != 0))
+    {
         video_info->AvgTimePerFrame = (LONGLONG) (10000000 * 
                                                   (double)vfd->fps.denum /
                                                   vfd->fps.num);
+    }
     video_info->bmiHeader.biSizeImage = DIBSIZE(video_info->bmiHeader);
     mediatype->lSampleSize = DIBSIZE(video_info->bmiHeader);

pjproject/trunk/pjmedia/src/pjmedia/format.c

@@ -114 +114 @@
                                         unsigned fps_denum)
 {
+    pj_assert(fps_denum);
     fmt->id = fmt_id;
     fmt->type = PJMEDIA_TYPE_VIDEO;