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

Fixed MSMF file capture error while opening the file containing unsupported video stream format

Browse Source 
Applied in PR3260 to 2.4 branch
This commit is contained in:
Artur Wieczorek 2014-09-25 11:54:15 +02:00
parent 8f334b4e41
commit b91bd6716c
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/videoio/src/cap_msmf.cpp
View File

@ -3848,18 +3848,25 @@ bool CvCaptureFile_MSMF::open(const char* filename)
hr = enumerateCaptureFormats(videoFileSource); 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(); grabberThread->start();
} }
isOpened = SUCCEEDED(hr);
return isOpened; return isOpened;
} }
@ -3991,7 +3998,9 @@ HRESULT CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource)
goto done; goto done;
} }
MediaType MT = FormatReader::Read(pType.Get()); 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: done: