Skip to content

O
opencv
Commit c3a90ccb authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

videoio(MSMF): remove "always true" check

parent 6c196d30
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
modules/videoio/src/cap_msmf.cpp
View file @ c3a90ccb
...@@ -1056,17 +1056,14 @@ HRESULT SourceReaderCB::Wait(DWORD dwMilliseconds, _ComPtr<IMFSample>& videoSamp ...@@ -1056,17 +1056,14 @@ HRESULT SourceReaderCB::Wait(DWORD dwMilliseconds, _ComPtr<IMFSample>& videoSamp
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
bEOS = m_bEOS;
if (!bEOS) if (!bEOS)
{ {
cv::AutoLock lock(m_mutex); cv::AutoLock lock(m_mutex);
bEOS = m_bEOS; videoSample = m_lastSample;
if (!bEOS) CV_Assert(videoSample);
{ m_lastSample.Release();
videoSample = m_lastSample; ResetEvent(m_hEvent); // event is auto-reset, but we need this forced reset due time gap between wait() and mutex hold.
CV_Assert(videoSample);
m_lastSample.Release();
ResetEvent(m_hEvent); // event is auto-reset, but we need this forced reset due time gap between wait() and mutex hold.
}
} }
return m_hrStatus; return m_hrStatus;
......
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