Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

9 files changed, 94 insertions, 40 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index 8ec7cb072..7fd6259ea 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -56,6 +56,7 @@
 #include "qaudioprobe.h"
 #include "qaudiorecorder.h"
 #include "qvideoprobe.h"
+#include <QAbstractVideoSurface>
 
 class MediaExample : public QObject {
     Q_OBJECT
@@ -197,6 +198,36 @@ void MediaExample::MediaPlayer()
     player->play();
     //! [Pipeline]
 
+    //! [Pipeline Surface]
+    class Surface : public QAbstractVideoSurface
+    {
+    public:
+        Surface(QObject *p) : QAbstractVideoSurface(p) { }
+        QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType) const override
+        {
+            // Make sure that the driver supports this pixel format.
+            return QList<QVideoFrame::PixelFormat>() << QVideoFrame::Format_YUYV;
+        }
+
+        // Video frames are handled here.
+        bool present(const QVideoFrame &) override { return true; }
+    };
+
+    player = new QMediaPlayer;
+    player->setVideoOutput(new Surface(player));
+    player->setMedia(QUrl("gst-pipeline: videotestsrc ! qtvideosink"));
+    player->play();
+    //! [Pipeline Surface]
+
+    //! [Pipeline Widget]
+    player = new QMediaPlayer;
+    videoWidget = new QVideoWidget;
+    videoWidget->show();
+    player->setVideoOutput(videoWidget);
+    player->setMedia(QUrl("gst-pipeline: videotestsrc ! xvimagesink name=\"qtvideosink\""));
+    player->play();
+    //! [Pipeline Widget]
+
     //! [Pipeline appsrc]
     QImage img("images/qt-logo.png");
     img = img.convertToFormat(QImage::Format_ARGB32);
diff --git a/src/multimedia/doc/src/platform-notes-windows.qdoc b/src/multimedia/doc/src/platform-notes-windows.qdoc
index e86d6a276..a69e96d99 100644
--- a/src/multimedia/doc/src/platform-notes-windows.qdoc
+++ b/src/multimedia/doc/src/platform-notes-windows.qdoc
@@ -42,6 +42,11 @@ was introduced in Windows Vista as a replacement for DirectShow and other
 multimedia APIs. Consequently, WMF plugin in Qt is supported only for
 Windows Vista and later versions of the operating system.
 
+The environment variable \c QT_MULTIMEDIA_PREFERRED_PLUGINS can be used to
+control the priority of the plugins. For example, setting it to
+"windowsmediafoundation" or "directshow" will cause the corresponding plugin
+to be the preferred one.
+
 \section1 Limitations
 
 The WMF plugin in Qt does not currently provide a camera backend. Instead,
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 0ccc18401..3773cfe64 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -1028,8 +1028,17 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
 
     \snippet multimedia-snippets/media.cpp Pipeline
 
-    If the pipeline contains a video sink element named \c qtvideosink,
-    current QVideoWidget can be used to render the video.
+    If QAbstractVideoSurface is used as the video output,
+    \c qtvideosink can be used as a video sink element directly in the pipeline.
+    After that the surface will receive the video frames in QAbstractVideoSurface::present().
+
+    \snippet multimedia-snippets/media.cpp Pipeline Surface
+
+    If QVideoWidget is used as the video output
+    and the pipeline contains a video sink element named \c qtvideosink,
+    current QVideoWidget will be used to render the video.
+
+    \snippet multimedia-snippets/media.cpp Pipeline Widget
 
     If the pipeline contains appsrc element, it will be used to push data from \a stream.
 
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
index 5c8ae171c..ee5aee989 100644
--- a/src/plugins/alsa/qalsaaudiooutput.cpp
+++ b/src/plugins/alsa/qalsaaudiooutput.cpp
@@ -707,7 +707,7 @@ bool QAlsaAudioOutput::deviceReady()
 
         if(l > 0) {
             // Got some data to output
-            if(deviceState != QAudio::ActiveState)
+            if (deviceState != QAudio::ActiveState && deviceState != QAudio::IdleState)
                 return true;
             qint64 bytesWritten = write(audioBuffer,l);
             if (bytesWritten != l)
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
index 0359f5d0a..9e1bf3f84 100644
--- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
@@ -297,11 +297,9 @@ void AVFCameraRendererControl::setSurface(QAbstractVideoSurface *surface)
 {
     if (m_surface != surface) {
         m_surface = surface;
-#ifdef Q_OS_IOS
         m_supportsTextures = m_surface
-                ? m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGRA32)
+                ? !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).isEmpty()
                 : false;
-#endif
         Q_EMIT surfaceChanged(surface);
     }
 }
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
index 0f7a0560b..dd0393f96 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
@@ -341,7 +341,10 @@ bool AVFCameraViewfinderSettingsControl2::convertPixelFormatIfSupported(QVideoFr
 
     if (m_service->videoOutput()->surface()) {
         const QAbstractVideoSurface *surface = m_service->videoOutput()->surface();
-        if (!surface->supportedPixelFormats().contains(qtFormat))
+        QAbstractVideoBuffer::HandleType h = m_service->videoOutput()->supportsTextures()
+                                           ? QAbstractVideoBuffer::GLTextureHandle
+                                           : QAbstractVideoBuffer::NoHandle;
+        if (!surface->supportedPixelFormats(h).contains(qtFormat))
             return false;
     }
 
@@ -389,21 +392,19 @@ bool AVFCameraViewfinderSettingsControl2::applySettings(const QCameraViewfinderS
             // format, or if no surface is set, the preferred capture device format
 
             const QVector<QVideoFrame::PixelFormat> deviceFormats = viewfinderPixelFormats();
-            QVideoFrame::PixelFormat pickedFormat = deviceFormats.first();
-
             QAbstractVideoSurface *surface = m_service->videoOutput()->surface();
+            QVideoFrame::PixelFormat pickedFormat = deviceFormats.first();
             if (surface) {
-                if (m_service->videoOutput()->supportsTextures()) {
-                    pickedFormat = QVideoFrame::Format_ARGB32;
-                } else {
-                    QList<QVideoFrame::PixelFormat> surfaceFormats = surface->supportedPixelFormats();
-
-                    for (int i = 0; i < surfaceFormats.count(); ++i) {
-                        const QVideoFrame::PixelFormat surfaceFormat = surfaceFormats.at(i);
-                        if (deviceFormats.contains(surfaceFormat)) {
-                            pickedFormat = surfaceFormat;
-                            break;
-                        }
+                pickedFormat = QVideoFrame::Format_Invalid;
+                QAbstractVideoBuffer::HandleType h = m_service->videoOutput()->supportsTextures()
+                                                   ? QAbstractVideoBuffer::GLTextureHandle
+                                                   : QAbstractVideoBuffer::NoHandle;
+                QList<QVideoFrame::PixelFormat> surfaceFormats = surface->supportedPixelFormats(h);
+                for (int i = 0; i < surfaceFormats.count(); ++i) {
+                    const QVideoFrame::PixelFormat surfaceFormat = surfaceFormats.at(i);
+                    if (deviceFormats.contains(surfaceFormat)) {
+                        pickedFormat = surfaceFormat;
+                        break;
                     }
                 }
             }
@@ -411,13 +412,15 @@ bool AVFCameraViewfinderSettingsControl2::applySettings(const QCameraViewfinderS
             CVPixelFormatFromQtFormat(pickedFormat, avfPixelFormat);
         }
 
-        if (avfPixelFormat != 0) {
-            NSMutableDictionary *videoSettings = [NSMutableDictionary dictionaryWithCapacity:1];
-            [videoSettings setObject:[NSNumber numberWithUnsignedInt:avfPixelFormat]
-                                      forKey:(id)kCVPixelBufferPixelFormatTypeKey];
+        NSMutableDictionary *videoSettings = [NSMutableDictionary dictionaryWithCapacity:1];
+        [videoSettings setObject:[NSNumber numberWithUnsignedInt:avfPixelFormat]
+                                  forKey:(id)kCVPixelBufferPixelFormatTypeKey];
 
-            videoOutput.videoSettings = videoSettings;
-        }
+        const AVFConfigurationLock lock(captureDevice);
+        if (!lock)
+            qWarning("Failed to set active format (lock failed)");
+
+        videoOutput.videoSettings = videoSettings;
     }
 
     qt_set_framerate_limits(captureDevice, videoConnection(), settings.minimumFrameRate(), settings.maximumFrameRate());
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
index be349710c..0987342b4 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
@@ -38,12 +38,9 @@
 ****************************************************************************/
 
 #include "avfvideowidget.h"
-#include <QtCore/QDebug>
 
-#include <AVFoundation/AVFoundation.h>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
+#import <AVFoundation/AVFoundation.h>
+#import <QuartzCore/CATransaction.h>
 
 #if defined(Q_OS_MACOS)
 #import <AppKit/AppKit.h>
@@ -51,6 +48,11 @@
 #import <UIKit/UIKit.h>
 #endif
 
+#include <QtCore/QDebug>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+
 QT_USE_NAMESPACE
 
 AVFVideoWidget::AVFVideoWidget(QWidget *parent)
@@ -178,5 +180,8 @@ void AVFVideoWidget::updateAspectRatio()
 
 void AVFVideoWidget::updatePlayerLayerBounds(const QSize &size)
 {
-    m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, (float)size.width(), (float)size.height());
+    [CATransaction begin];
+    [CATransaction setDisableActions: YES]; // disable animation/flicks
+    m_playerLayer.bounds = QRect(QPoint(0, 0), size).toCGRect();
+    [CATransaction commit];
 }
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm b/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm
index 7fa41fdc2..d61129ec9 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm
@@ -40,6 +40,7 @@
 #include "avfvideowindowcontrol.h"
 
 #include <AVFoundation/AVFoundation.h>
+#import <QuartzCore/CATransaction.h>
 
 #if QT_HAS_INCLUDE(<AppKit/AppKit.h>)
 #include <AppKit/AppKit.h>
@@ -244,10 +245,10 @@ void AVFVideoWindowControl::updateAspectRatio()
 void AVFVideoWindowControl::updatePlayerLayerBounds()
 {
     if (m_playerLayer) {
-        CGRect newBounds = CGRectMake(0, 0,
-                                      m_displayRect.width(), m_displayRect.height());
-        m_playerLayer.bounds = newBounds;
-        m_playerLayer.position = CGPointMake(m_displayRect.x(), m_displayRect.y());
+        [CATransaction begin];
+        [CATransaction setDisableActions: YES]; // disable animation/flicks
+        m_playerLayer.frame = m_displayRect.toCGRect();
+        [CATransaction commit];
     }
 }
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index 3e505a413..9445bd9d0 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -347,10 +347,12 @@ void CameraBinSession::setupCaptureResolution()
     // If capture resolution is specified, use it also for the viewfinder to avoid caps negotiation
     // to fail.
     if (m_usingWrapperCameraBinSrc) {
-        if (m_captureMode == QCamera::CaptureStillImage && !imageResolution.isEmpty())
-            viewfinderResolution = imageResolution;
-        else if (m_captureMode == QCamera::CaptureVideo && !videoResolution.isEmpty())
-            viewfinderResolution = videoResolution;
+        if (viewfinderResolution.isEmpty()) {
+            if (m_captureMode == QCamera::CaptureStillImage && !imageResolution.isEmpty())
+                viewfinderResolution = imageResolution;
+            else if (m_captureMode == QCamera::CaptureVideo && !videoResolution.isEmpty())
+                viewfinderResolution = videoResolution;
+        }
 
         // Make sure we don't use incompatible frame rate and pixel format with the new resolution
         if (viewfinderResolution != m_viewfinderSettings.resolution() &&