mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3260 from a-wi:MSMF_file_error

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-27 13:06:18 +00:00
commit 1920232268
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/highgui/src/cap_msmf.cpp
View File

@ -3847,18 +3847,25 @@ bool CvCaptureFile_MSMF::open(const char* filename)
hr = enumerateCaptureFormats(videoFileSource);
}
if (SUCCEEDED(hr))
if( captureFormats.empty() )
{
hr = ImageGrabberThread::CreateInstance(&grabberThread, videoFileSource, (unsigned int)-2, true);
isOpened = false;
}
else
{
if (SUCCEEDED(hr))
{
hr = ImageGrabberThread::CreateInstance(&grabberThread, videoFileSource, (unsigned int)-2, true);
}
isOpened = SUCCEEDED(hr);
}
if (SUCCEEDED(hr))
if (isOpened)
{
grabberThread->start();
}
isOpened = SUCCEEDED(hr);
return isOpened;
}
@ -3990,7 +3997,9 @@ HRESULT CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource)
goto done;
}
MediaType MT = FormatReader::Read(pType.Get());
captureFormats.push_back(MT);
// We can capture only RGB video.
if( MT.MF_MT_SUBTYPE == MFVideoFormat_RGB24 )
captureFormats.push_back(MT);
}
done: