Skip to content

O
opencv
Commit 10bbcca1 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #3251 from a-wi:MSMF_camera_errors

parents 19b3aab2 3603102c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/highgui/src/cap_msmf.cpp
View file @ 10bbcca1
...@@ -1462,7 +1462,6 @@ void ImageGrabber::stopGrabbing() ...@@ -1462,7 +1462,6 @@ void ImageGrabber::stopGrabbing()
HRESULT ImageGrabber::startGrabbing(void) HRESULT ImageGrabber::startGrabbing(void)
{ {
_ComPtr<IMFMediaEvent> pEvent = NULL;
PROPVARIANT var; PROPVARIANT var;
PropVariantInit(&var); PropVariantInit(&var);
HRESULT hr = ig_pSession->SetTopology(0, ig_pTopology); HRESULT hr = ig_pSession->SetTopology(0, ig_pTopology);
...@@ -1470,6 +1469,7 @@ HRESULT ImageGrabber::startGrabbing(void) ...@@ -1470,6 +1469,7 @@ HRESULT ImageGrabber::startGrabbing(void)
hr = ig_pSession->Start(&GUID_NULL, &var); hr = ig_pSession->Start(&GUID_NULL, &var);
for(;;) for(;;)
{ {
_ComPtr<IMFMediaEvent> pEvent = NULL;
HRESULT hrStatus = S_OK; HRESULT hrStatus = S_OK;
MediaEventType met; MediaEventType met;
if(!ig_pSession) break; if(!ig_pSession) break;
...@@ -2445,11 +2445,12 @@ int videoDevice::findType(unsigned int size, unsigned int frameRate) ...@@ -2445,11 +2445,12 @@ int videoDevice::findType(unsigned int size, unsigned int frameRate)
fmt = vd_CaptureFormats.find(size); fmt = vd_CaptureFormats.find(size);
if( fmt != vd_CaptureFormats.end() ) if( fmt != vd_CaptureFormats.end() )
FRM = fmt->second; FRM = fmt->second;
else if (FRM.empty()) else if(!vd_CaptureFormats.empty())
return -1;
else
FRM = vd_CaptureFormats.rbegin()->second; FRM = vd_CaptureFormats.rbegin()->second;
if (FRM.empty())
return -1;
UINT64 frameRateMax = 0; SUBTYPEMap STMMax; UINT64 frameRateMax = 0; SUBTYPEMap STMMax;
if(frameRate == 0) if(frameRate == 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment