diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 16:11:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:33:04 +0200 |
| commit | 27681cba4695355f2a0a6b01b85c429186d11a34 (patch) | |
| tree | f11df2ec52d983b552f2e1b673e0845bc7e3ef05 /src/plugins/directshow/player/directshowiosource.h | |
| parent | f7a93757c709e8b2902bc4707752edb8649d009c (diff) | |
| parent | bc53bb7913bbf68519508a0ab76c513335b3e5bb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Blacklisted a few functions in tst_QAudioInput.
Conflicts:
.qmake.conf
src/plugins/avfoundation/camera/avfcameracontrol.mm
src/plugins/avfoundation/camera/avfcameraservice.h
src/plugins/avfoundation/camera/avfcameraservice.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
src/plugins/avfoundation/camera/avfimageencodercontrol.mm
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
tests/auto/integration/qaudioinput/BLACKLIST
Task-number: QTBUG-54459
Task-number: QTBUG-49736
Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
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 bb90ba398..225cfc1ab 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -117,8 +117,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; @@ -127,9 +125,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; }; |