Merge 5.10 into 5.10.0

Change-Id: Id50796542954ded82fb265b4737d737aff033633

9 files changed, 77 insertions, 13 deletions

diff --git a/examples/multimedia/declarative-radio/Button.qml b/examples/multimedia/declarative-radio/Button.qml
index c01c9d388..c579795e7 100644
--- a/examples/multimedia/declarative-radio/Button.qml
+++ b/examples/multimedia/declarative-radio/Button.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index 214e5ec7e..6e93e150d 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -191,6 +191,10 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::paint(
                 m_imageSize.height(),
                 m_frame.bytesPerLine(),
                 m_imageFormat);
+        // Do not render into ARGB32 images using QPainter.
+        // Using QImage::Format_ARGB32_Premultiplied is significantly faster.
+        if (m_imageFormat == QImage::Format_ARGB32)
+            image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
         const QTransform oldTransform = painter->transform();
         QTransform transform = oldTransform;
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
index a7f0254ee..15aa027e4 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
@@ -697,7 +697,7 @@ void QAndroidCameraSession::onCameraTakePictureFailed()
 
 void QAndroidCameraSession::onCameraPictureExposed()
 {
-    if (m_captureCanceled)
+    if (m_captureCanceled || !m_camera)
         return;
 
     emit imageExposed(m_currentImageCaptureId);
@@ -706,7 +706,7 @@ void QAndroidCameraSession::onCameraPictureExposed()
 
 void QAndroidCameraSession::onLastPreviewFrameFetched(const QVideoFrame &frame)
 {
-    if (m_captureCanceled)
+    if (m_captureCanceled || !m_camera)
         return;
 
     QtConcurrent::run(this, &QAndroidCameraSession::processPreviewImage,
@@ -730,6 +730,9 @@ void QAndroidCameraSession::processPreviewImage(int id, const QVideoFrame &frame
 
 void QAndroidCameraSession::onNewPreviewFrame(const QVideoFrame &frame)
 {
+    if (!m_camera)
+        return;
+
     m_videoProbesMutex.lock();
 
     for (QAndroidMediaVideoProbeControl *probe : qAsConst(m_videoProbes))
@@ -756,7 +759,8 @@ void QAndroidCameraSession::onCameraPictureCaptured(const QByteArray &data)
     m_captureCanceled = false;
 
     // Preview needs to be restarted after taking a picture
-    m_camera->startPreview();
+    if (m_camera)
+        m_camera->startPreview();
 }
 
 void QAndroidCameraSession::onCameraPreviewStarted()
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 9cbb62969..8ee5d67a1 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -402,7 +402,6 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
     } else if (!m_resources.isEmpty()) {
         m_pendingTasks |= SetUrlSource;
     } else {
-        m_pendingTasks = 0;
         m_graphStatus = InvalidMedia;
 
         switch (hr) {
@@ -1688,8 +1687,6 @@ void DirectShowPlayerService::run()
     QMutexLocker locker(&m_mutex);
 
     for (;;) {
-        ::ResetEvent(m_taskHandle);
-
         while (m_pendingTasks == 0) {
             DWORD result = 0;
 
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
index 779978e70..d6b8ad759 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
+++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
@@ -478,6 +478,7 @@ QAudioBuffer QGstreamerAudioDecoderSession::read()
             }
         }
 #if GST_CHECK_VERSION(1,0,0)
+        gst_buffer_unmap(buffer, &mapInfo);
         gst_sample_unref(sample);
 #else
         gst_buffer_unref(buffer);
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index ab0bea24a..4941c6ef6 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -212,6 +212,12 @@ CameraBinSession::~CameraBinSession()
 
     if (m_sourceFactory)
         gst_object_unref(GST_OBJECT(m_sourceFactory));
+
+    if (m_cameraSrc)
+        gst_object_unref(GST_OBJECT(m_cameraSrc));
+
+    if (m_videoSrc)
+        gst_object_unref(GST_OBJECT(m_videoSrc));
 }
 
 #if QT_CONFIG(gstreamer_photography)
@@ -538,11 +544,12 @@ GstElement *CameraBinSession::buildCameraSource()
         }
     }
 
-    if (m_cameraSrc != camSrc)
+    if (m_cameraSrc != camSrc) {
         g_object_set(G_OBJECT(m_camerabin), CAMERA_SOURCE_PROPERTY, m_cameraSrc, NULL);
-
-    if (camSrc)
-        gst_object_unref(GST_OBJECT(camSrc));
+        // Unref only if camSrc is not m_cameraSrc to prevent double unrefing.
+        if (camSrc)
+            gst_object_unref(GST_OBJECT(camSrc));
+    }
 
     return m_cameraSrc;
 }
diff --git a/src/plugins/wasapi/qwasapiutils.cpp b/src/plugins/wasapi/qwasapiutils.cpp
index 727c94c23..0d03982de 100644
--- a/src/plugins/wasapi/qwasapiutils.cpp
+++ b/src/plugins/wasapi/qwasapiutils.cpp
@@ -90,6 +90,26 @@ struct DeviceMapping {
 Q_GLOBAL_STATIC(DeviceMapping, gMapping)
 }
 
+struct CoInitializer
+{
+    CoInitializer()
+    {
+        const bool isGuiThread = QCoreApplication::instance() &&
+                QThread::currentThread() == QCoreApplication::instance()->thread();
+        CoInitializeEx(NULL, isGuiThread ? COINIT_APARTMENTTHREADED : COINIT_MULTITHREADED);
+    }
+
+    ~CoInitializer()
+    {
+        CoUninitialize();
+    }
+};
+
+static void CoInitIfNeeded()
+{
+    static CoInitializer initializer;
+}
+
 AudioInterface::AudioInterface()
 {
     qCDebug(lcMmAudioInterface) << __FUNCTION__;
@@ -182,6 +202,7 @@ QByteArray QWasapiUtils::defaultDevice(QAudio::Mode mode)
 {
     qCDebug(lcMmUtils) << __FUNCTION__ << mode;
 
+    CoInitIfNeeded();
     QList<QByteArray> &deviceNames = mode == QAudio::AudioInput ? gMapping->inputDeviceNames : gMapping->outputDeviceNames;
     QList<QString> &deviceIds = mode == QAudio::AudioInput ? gMapping->inputDeviceIds : gMapping->outputDeviceIds;
     if (deviceNames.isEmpty() || deviceIds.isEmpty()) // Initialize
@@ -214,6 +235,7 @@ QList<QByteArray> QWasapiUtils::availableDevices(QAudio::Mode mode)
 {
     qCDebug(lcMmUtils) << __FUNCTION__ << mode;
 
+    CoInitIfNeeded();
     ComPtr<IDeviceInformationStatics> statics;
     HRESULT hr;
 
@@ -290,6 +312,7 @@ Microsoft::WRL::ComPtr<AudioInterface> QWasapiUtils::createOrGetInterface(const
 {
     qCDebug(lcMmUtils) << __FUNCTION__ << dev << mode;
     Q_ASSERT((mode == QAudio::AudioInput ? gMapping->inputDeviceNames.indexOf(dev) : gMapping->outputDeviceNames.indexOf(dev)) != -1);
+    CoInitIfNeeded();
 
     Microsoft::WRL::ComPtr<AudioInterface> result;
     HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([dev, mode, &result]() {
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
index 412694cc3..f1b7662b5 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
@@ -335,7 +335,14 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode,
             for (QSGVideoNodeFactoryInterface* factory : qAsConst(m_videoNodeFactories)) {
                 // Get a node that supports our frame. The surface is irrelevant, our
                 // QSGVideoItemSurface supports (logically) anything.
-                videoNode = factory->createNode(QVideoSurfaceFormat(m_frame.size(), m_frame.pixelFormat(), m_frame.handleType()));
+                QVideoSurfaceFormat nodeFormat(m_frame.size(), m_frame.pixelFormat(), m_frame.handleType());
+                const QVideoSurfaceFormat surfaceFormat = m_surface->surfaceFormat();
+                nodeFormat.setYCbCrColorSpace(surfaceFormat.yCbCrColorSpace());
+                nodeFormat.setPixelAspectRatio(surfaceFormat.pixelAspectRatio());
+                nodeFormat.setScanLineDirection(surfaceFormat.scanLineDirection());
+                nodeFormat.setViewport(surfaceFormat.viewport());
+                nodeFormat.setFrameRate(surfaceFormat.frameRate());
+                videoNode = factory->createNode(nodeFormat);
                 if (videoNode) {
                     qCDebug(qLcVideo) << "updatePaintNode: Video node created. Handle type:" << m_frame.handleType()
                                      << " Supported formats for the handle by this node:"
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 8e45a2ccb..082e81b34 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -60,6 +60,7 @@ private slots:
     void construction();
     void loadMedia();
     void unloadMedia();
+    void loadMediaInLoadingState();
     void playPauseStop();
     void processEOS();
     void deleteLaterAtEOS();
@@ -304,6 +305,16 @@ void tst_QMediaPlayerBackend::unloadMedia()
     QVERIFY(!positionSpy.isEmpty());
 }
 
+void tst_QMediaPlayerBackend::loadMediaInLoadingState()
+{
+    const QUrl url("http://unavailable.media/");
+    QMediaPlayer player;
+    player.setMedia(QMediaContent(url));
+    player.play();
+    // Sets new media while old has not been finished.
+    player.setMedia(QMediaContent(url));
+    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::InvalidMedia);
+}
 
 void tst_QMediaPlayerBackend::playPauseStop()
 {