mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition

Browse Source
This commit is contained in:
Alexander Alekhin 2018-06-14 09:57:38 +00:00
commit 8f24db048c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videoio/src/cap_msmf.cpp
View File

@ -773,7 +773,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken))) if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken)))
{ {
captureMode = MODE_HW; captureMode = MODE_HW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
D3DMgr.Reset(); D3DMgr.Reset();
} }
@ -789,7 +789,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (D3DDev) if (D3DDev)
D3DDev.Reset(); D3DDev.Reset();
captureMode = MODE_SW; captureMode = MODE_SW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
#else #else
return !enable; return !enable;