diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:35 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:35 +0100 |
commit | 9500aadc219481d89d32e5c2a2de10b0740c50de (patch) | |
tree | 2555f3bf593f772637ecc135b90b8778869e48f2 /src/plugins/common/evr/evrcustompresenter.h | |
parent | 7610f6e9ba8b92df6d18b94fcec982064dffacbd (diff) | |
parent | dd7c19ea9d6be922faca57013b06b0f2b0787169 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: If5d9ea0fb6187bb6f74881289ebb15a57eb82e0c
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 c5593ee41..67ae61991 100644 --- a/src/plugins/common/evr/evrcustompresenter.h +++ b/src/plugins/common/evr/evrcustompresenter.h @@ -137,6 +137,8 @@ public: HRESULT processSample(IMFSample *sample, LONG *nextSleep); HRESULT flush(); + bool areSamplesScheduled(); + // ThreadProc for the scheduler thread. static DWORD WINAPI schedulerThreadProc(LPVOID parameter); @@ -173,13 +175,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 |