Commit 19202322 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #3260 from a-wi:MSMF_file_error

parents 467f5fc9 5bf1a4c0
......@@ -3847,18 +3847,25 @@ bool CvCaptureFile_MSMF::open(const char* filename)
hr = enumerateCaptureFormats(videoFileSource);
}
if (SUCCEEDED(hr))
if( captureFormats.empty() )
{
isOpened = false;
}
else
{
hr = ImageGrabberThread::CreateInstance(&grabberThread, videoFileSource, (unsigned int)-2, true);
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:
......
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