diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:48 +0100 |
| commit | dd7c19ea9d6be922faca57013b06b0f2b0787169 (patch) | |
| tree | ca4b5acad83d1dead545087874af89655b9806b4 /src/plugins/common/evr/evrcustompresenter.h | |
| parent | 3b6de26fe585c586d055ac86c5911cc6df0e3887 (diff) | |
| parent | d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Iafd0dbf7f015e2dc8e5ef987fb247660db41e9fe
Diffstat (limited to 'src/plugins/common/evr/evrcustompresenter.h')
| -rw-r--r-- | src/plugins/common/evr/evrcustompresenter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/common/evr/evrcustompresenter.h b/src/plugins/common/evr/evrcustompresenter.h index e25780140..0e62c747c 100644 --- a/src/plugins/common/evr/evrcustompresenter.h +++ b/src/plugins/common/evr/evrcustompresenter.h @@ -131,6 +131,8 @@ public: HRESULT processSample(IMFSample *sample, LONG *nextSleep); HRESULT flush(); + bool areSamplesScheduled(); + // ThreadProc for the scheduler thread. static DWORD WINAPI schedulerThreadProc(LPVOID parameter); @@ -167,13 +169,11 @@ public: HRESULT getSample(IMFSample **sample); HRESULT returnSample(IMFSample *sample); - BOOL areSamplesPending(); private: QMutex m_mutex; QList<IMFSample*> m_videoSampleQueue; bool m_initialized; - DWORD m_pending; }; class EVRCustomPresenter |