Merge pull request #11856 from alalek:videoio_msmf_fix_check

5a27f7c8 · Alexander Alekhin · 6ce26b72 · c3a90ccb · 5a27f7c8
Commit 5a27f7c8 authored Jun 30, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

cap_msmf.cpp modules/videoio/src/cap_msmf.cpp +5 -8

No files found.
--- a/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
@@ -1071,17 +1071,14 @@ HRESULT SourceReaderCB::Wait(DWORD dwMilliseconds, _ComPtr<IMFSample>& videoSamp
        return HRESULT_FROM_WIN32(GetLastError());
    }
+    bEOS = m_bEOS;
    if (!bEOS)
    {
        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;