From 860f458ddb1fac8fc003d2ec46b0209a1e0dbeda Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Mon, 30 Apr 2018 07:23:12 +0200 Subject: QMediaPlayer: remove else after return The else was also missing the curly braces, but as we usually omit else after return, let's just remove it. Change-Id: Ia91261bbe6edf4e9b0d454d1fdf91c5cfa62e4cc Reviewed-by: Christian Stromme --- src/multimedia/playback/qmediaplayer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 01c91babc..19d4ec42c 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -564,8 +564,9 @@ static QMediaService *playerService(QMediaPlayer::Flags flags) return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER, QMediaServiceProviderHint(features)); - } else - return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER); + } + + return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER); } -- cgit v1.2.3 From e1e98c81face4066c8893835b02f6f622aaf1a58 Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Thu, 3 May 2018 15:06:55 +0200 Subject: WinRT: Keep camera as uninitialized when error If initialization of camera finished with an error no need to report that camera is initialized successfully. Using camera in this case might lead to some segfaults and other errors. Task-number: QTBUG-68054 Change-Id: I6a197989c2b44454a8594ff19b8c03fb08f57c7e Reviewed-by: Oliver Wolff --- src/plugins/winrt/qwinrtcameracontrol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index 99d754289..008f4b985 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -1345,7 +1345,7 @@ HRESULT QWinRTCameraControl::onInitializationCompleted(IAsyncAction *, AsyncStat if (status != Completed) { d->initializing = false; - d->initialized = true; + d->initialized = false; return S_OK; } -- cgit v1.2.3 From 5b7bd00d2c03f7035b21534003662e931bd04eb8 Mon Sep 17 00:00:00 2001 From: Val Doroshchuk Date: Fri, 4 May 2018 11:44:45 +0200 Subject: WinRT: Add ref to prevent seg fault If IMFMediaSink is returned from IMFStreamSink needs to add ref because caller will release it. Task-number: QTBUG-68054 Change-Id: I6d1732f7873e09f742c072380673a08ad86fe73a Reviewed-by: Maurice Kalinowski Reviewed-by: Oliver Wolff --- src/plugins/winrt/qwinrtcameracontrol.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index 008f4b985..0eec4a2ca 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -283,6 +283,7 @@ public: HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) override { + m_sink->AddRef(); *mediaSink = m_sink; return S_OK; } -- cgit v1.2.3