diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-01-15 16:04:09 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-05-20 12:59:25 +0000 |
| commit | d44a327da4a956f62cc0d51095fa4c1d62e130d3 (patch) | |
| tree | b4be5a7460c6891313d423a151f36b1791136d59 /src/plugins/directshow/player/directshowiosource.h | |
| parent | df169ba0aab6e208e1db04654436c0becfd30d02 (diff) | |
DirectShow: fix playing resource files.
Our custom filter that streams the data into the pipeline was incorrectly
negotiating the sample type with the downstream filter.
This also fixes playback when passing a QIODevice to QMediaPlayer.
Task-number: QTBUG-46899
Change-Id: Iea8b8731d5404c416c8ed0d59cb61958b13b61b0
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/directshowiosource.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowiosource.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/directshow/player/directshowiosource.h b/src/plugins/directshow/player/directshowiosource.h index e45c8520d..f5e8ec6d1 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -111,8 +111,6 @@ public: HRESULT STDMETHODCALLTYPE QueryDirection(PIN_DIRECTION *pPinDir); private: - HRESULT tryConnect(IPin *pin, const AM_MEDIA_TYPE *type); - volatile LONG m_ref; FILTER_STATE m_state; DirectShowIOReader *m_reader; @@ -121,9 +119,10 @@ private: IReferenceClock *m_clock; IMemAllocator *m_allocator; IPin *m_peerPin; - DirectShowMediaType m_mediaType; + DirectShowMediaType m_outputType; QString m_filterName; const QString m_pinId; + bool m_queriedForAsyncReader; QMutex m_mutex; }; |