mirror of
https://github.com/opencv/opencv.git
synced 2025-06-08 01:53:19 +08:00
videoio(msmf): fix reopen condition in configureHW()
`camid` value is always -1 after close().
This commit is contained in:
parent
8221f57c26
commit
09c63e4f00
@ -805,7 +805,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
|
||||
if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken)))
|
||||
{
|
||||
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();
|
||||
}
|
||||
@ -821,7 +821,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
|
||||
if (D3DDev)
|
||||
D3DDev.Reset();
|
||||
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
|
||||
return !enable;
|
||||
|
Loading…
Reference in New Issue
Block a user