Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12393 from peterjozsa:issue_12301

Browse Source
pull/12402/head
Alexander Alekhin 6 years ago
parent fc71316690 8b0e1c7fcb
commit aa5c45339c
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/videoio/src/cap_msmf.cpp

6
modules/videoio/src/cap_msmf.cpp
Unescape View File

@ -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:
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()
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)))
{ {

Write Preview
Loading…
Cancel
Save