generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for WebRTC Issue 1384. Some cameras return 0 fps for all capabilities which causes divide-by-zero.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/1101013

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3558 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
vikasmarwaha@webrtc.org 2013-02-21 20:25:54 +00:00
parent 5140e24037
commit bf3a9b3cce
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/video_capture/windows/device_info_ds.cc
View File

@ -570,7 +570,8 @@ WebRtc_Word32 DeviceInfoDS::CreateCapabilityMap(
if (hrVC == S_OK)
{
LONGLONG *maxFps; // array
LONGLONG *frameDurationList;
LONGLONG maxFps;
long listSize;
SIZE size;
size.cx = capability->width;
@ -584,11 +585,14 @@ WebRtc_Word32 DeviceInfoDS::CreateCapabilityMap(
hrVC = videoControlConfig->GetFrameRateList(outputCapturePin,
tmp, size,
&listSize,
&maxFps);
&frameDurationList);
if (hrVC == S_OK && listSize > 0)
// On some odd cameras, you may get a 0 for duration.
// GetMaxOfFrameArray returns the lowest duration (highest FPS)
if (hrVC == S_OK && listSize > 0 &&
0 != (maxFPS = GetMaxOfFrameArray(frameDurationList,
listSize)))
{
LONGLONG maxFPS = GetMaxOfFrameArray(maxFps, listSize);
capability->maxFPS = static_cast<int> (10000000
/ maxFPS);
capability->supportFrameRateControl = true;