Skip to content

O
opencv
Commit 8b0e1c7f authored by Peter Jozsa's avatar Peter Jozsa
Browse files
Options

Fix https://github.com/opencv/opencv/issues/12301

parent e3af72bb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/videoio/src/cap_msmf.cpp
View file @ 8b0e1c7f
...@@ -616,7 +616,7 @@ class SourceReaderCB : public IMFSourceReaderCallback ...@@ -616,7 +616,7 @@ class SourceReaderCB : public IMFSourceReaderCallback
{ {
public: public:
SourceReaderCB() : SourceReaderCB() :
m_nRefCount(1), m_hEvent(CreateEvent(NULL, FALSE, FALSE, NULL)), m_bEOS(FALSE), m_hrStatus(S_OK), m_dwStreamIndex(0) m_nRefCount(0), m_hEvent(CreateEvent(NULL, FALSE, FALSE, NULL)), m_bEOS(FALSE), m_hrStatus(S_OK), m_reader(NULL), m_dwStreamIndex(0)
{ {
} }
...@@ -677,7 +677,7 @@ public: ...@@ -677,7 +677,7 @@ public:
BOOL m_bEOS; BOOL m_bEOS;
HRESULT m_hrStatus; HRESULT m_hrStatus;
_ComPtr<IMFSourceReader> m_reader; IMFSourceReader *m_reader;
DWORD m_dwStreamIndex; DWORD m_dwStreamIndex;
_ComPtr<IMFSample> m_lastSample; _ComPtr<IMFSample> m_lastSample;
}; };
...@@ -1140,7 +1140,7 @@ bool CvCapture_MSMF::grabFrame() ...@@ -1140,7 +1140,7 @@ bool CvCapture_MSMF::grabFrame()
if (!reader->m_reader) if (!reader->m_reader)
{ {
// Initiate capturing with async callback // Initiate capturing with async callback
reader->m_reader = videoFileSource; reader->m_reader = videoFileSource.Get();
reader->m_dwStreamIndex = dwStreamIndex; reader->m_dwStreamIndex = dwStreamIndex;
if (FAILED(hr = videoFileSource->ReadSample(dwStreamIndex, 0, NULL, NULL, NULL, NULL))) if (FAILED(hr = videoFileSource->ReadSample(dwStreamIndex, 0, NULL, NULL, NULL, NULL)))
{ {
......
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