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

20 files changed, 489 insertions, 32 deletions

diff --git a/src/plugins/avfoundation/camera/avfcameraservice.h b/src/plugins/avfoundation/camera/avfcameraservice.h
index 2969882b0..ec2884217 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.h
+++ b/src/plugins/avfoundation/camera/avfcameraservice.h
@@ -70,6 +70,7 @@ class AVFMediaRecorderControlIOS;
 class AVFAudioEncoderSettingsControl;
 class AVFVideoEncoderSettingsControl;
 class AVFMediaContainerControl;
+class AVFCameraWindowControl;
 
 class AVFCameraService : public QMediaService
 {
@@ -120,6 +121,7 @@ private:
     AVFAudioEncoderSettingsControl *m_audioEncoderSettingsControl;
     AVFVideoEncoderSettingsControl *m_videoEncoderSettingsControl;
     AVFMediaContainerControl *m_mediaContainerControl;
+    AVFCameraWindowControl *m_captureWindowControl;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm
index 33b4b72aa..627ecf67c 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.mm
+++ b/src/plugins/avfoundation/camera/avfcameraservice.mm
@@ -61,6 +61,7 @@
 #include "avfaudioencodersettingscontrol.h"
 #include "avfvideoencodersettingscontrol.h"
 #include "avfmediacontainercontrol.h"
+#include "avfcamerawindowcontrol.h"
 
 #ifdef Q_OS_IOS
 #include "avfcamerazoomcontrol.h"
@@ -74,7 +75,8 @@ QT_USE_NAMESPACE
 
 AVFCameraService::AVFCameraService(QObject *parent):
     QMediaService(parent),
-    m_videoOutput(nullptr)
+    m_videoOutput(nullptr),
+    m_captureWindowControl(nullptr)
 {
     m_session = new AVFCameraSession(this);
     m_cameraControl = new AVFCameraControl(this);
@@ -119,6 +121,12 @@ AVFCameraService::~AVFCameraService()
     delete m_recorderControl;
 #endif
 
+    if (m_captureWindowControl) {
+        m_session->setCapturePreviewOutput(nullptr);
+        delete m_captureWindowControl;
+        m_captureWindowControl = nullptr;
+    }
+
     if (m_videoOutput) {
         m_session->setVideoOutput(nullptr);
         delete m_videoOutput;
@@ -210,6 +218,14 @@ QMediaControl *AVFCameraService::requestControl(const char *name)
         return m_cameraZoomControl;
 #endif
 
+    if (!m_captureWindowControl) {
+        if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
+            m_captureWindowControl = new AVFCameraWindowControl(this);
+            m_session->setCapturePreviewOutput(m_captureWindowControl);
+            return m_captureWindowControl;
+        }
+    }
+
     if (!m_videoOutput) {
         if (qstrcmp(name, QVideoRendererControl_iid) == 0)
             m_videoOutput = new AVFCameraRendererControl(this);
@@ -234,6 +250,11 @@ void AVFCameraService::releaseControl(QMediaControl *control)
         delete m_videoOutput;
         m_videoOutput = nullptr;
     }
+    else if (m_captureWindowControl == control) {
+        m_session->setCapturePreviewOutput(nullptr);
+        delete m_captureWindowControl;
+        m_captureWindowControl = nullptr;
+    }
 }
 
 
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h
index 103ec0e17..a449bb806 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.h
+++ b/src/plugins/avfoundation/camera/avfcamerasession.h
@@ -54,6 +54,7 @@ class AVFCameraControl;
 class AVFCameraService;
 class AVFCameraRendererControl;
 class AVFMediaVideoProbeControl;
+class AVFCameraWindowControl;
 
 struct AVFCameraInfo
 {
@@ -79,6 +80,7 @@ public:
     AVFCameraInfo activeCameraInfo() const { return m_activeCameraInfo; }
 
     void setVideoOutput(AVFCameraRendererControl *output);
+    void setCapturePreviewOutput(AVFCameraWindowControl *output);
     AVCaptureSession *captureSession() const { return m_captureSession; }
     AVCaptureDevice *videoCaptureDevice() const;
 
@@ -122,6 +124,7 @@ private:
 
     AVFCameraService *m_service;
     AVFCameraRendererControl *m_videoOutput;
+    AVFCameraWindowControl *m_capturePreviewWindowOutput;
 
     QCamera::State m_state;
     bool m_active;
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 3c5f8f09a..6ee9c2636 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -48,6 +48,7 @@
 #include "avfcameraviewfindersettingscontrol.h"
 #include "avfimageencodercontrol.h"
 #include "avfcamerautility.h"
+#include "avfcamerawindowcontrol.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
@@ -146,6 +147,7 @@ QList<AVFCameraInfo> AVFCameraSession::m_cameraDevices;
 AVFCameraSession::AVFCameraSession(AVFCameraService *service, QObject *parent)
    : QObject(parent)
    , m_service(service)
+   , m_capturePreviewWindowOutput(nullptr)
    , m_state(QCamera::UnloadedState)
    , m_active(false)
    , m_videoInput(nil)
@@ -160,6 +162,10 @@ AVFCameraSession::AVFCameraSession(AVFCameraService *service, QObject *parent)
 
 AVFCameraSession::~AVFCameraSession()
 {
+    if (m_capturePreviewWindowOutput) {
+        m_capturePreviewWindowOutput->setLayer(nil);
+    }
+
     if (m_videoInput) {
         [m_captureSession removeInput:m_videoInput];
         [m_videoInput release];
@@ -257,6 +263,29 @@ void AVFCameraSession::setVideoOutput(AVFCameraRendererControl *output)
         output->configureAVCaptureSession(this);
 }
 
+void AVFCameraSession::setCapturePreviewOutput(AVFCameraWindowControl *output)
+{
+#ifdef QT_DEBUG_AVF
+    qDebug() << Q_FUNC_INFO << output;
+#endif
+
+    if (m_capturePreviewWindowOutput == output)
+        return;
+
+    if (m_capturePreviewWindowOutput)
+        m_capturePreviewWindowOutput->setLayer(nil);
+
+    m_capturePreviewWindowOutput = output;
+
+    if (m_capturePreviewWindowOutput) {
+        AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:m_captureSession];
+        m_capturePreviewWindowOutput->setLayer(previewLayer);
+        if (AVFCameraViewfinderSettingsControl2 *vfControl = m_service->viewfinderSettingsControl2()) {
+            m_capturePreviewWindowOutput->setNativeSize(vfControl->viewfinderSettings().resolution());
+        }
+    }
+}
+
 AVCaptureDevice *AVFCameraSession::videoCaptureDevice() const
 {
     if (m_videoInput)
@@ -409,6 +438,10 @@ bool AVFCameraSession::applyViewfinderSettings()
         }
 
         vfControl->applySettings(vfSettings);
+
+        if (m_capturePreviewWindowOutput)
+            m_capturePreviewWindowOutput->setNativeSize(vfControl->viewfinderSettings().resolution());
+
         return !vfSettings.isNull();
     }
 
diff --git a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.h b/src/plugins/avfoundation/camera/avfcamerawindowcontrol.h
new file mode 100644
index 000000000..d1a950e38
--- /dev/null
+++ b/src/plugins/avfoundation/camera/avfcamerawindowcontrol.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef AVFCAMERAWINDOWCONTROL_H
+#define AVFCAMERAWINDOWCONTROL_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QVideoWindowControl>
+
+@class AVCaptureVideoPreviewLayer;
+#if defined(Q_OS_MACOS)
+@class NSView;
+typedef NSView NativeView;
+#else
+@class UIView;
+typedef UIView NativeView;
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class AVFCameraWindowControl : public QVideoWindowControl
+{
+    Q_OBJECT
+public:
+    AVFCameraWindowControl(QObject *parent = nullptr);
+    virtual ~AVFCameraWindowControl() override;
+
+    // QVideoWindowControl interface
+public:
+    WId winId() const override;
+    void setWinId(WId id) override;
+
+    QRect displayRect() const override;
+    void setDisplayRect(const QRect &rect) override;
+
+    bool isFullScreen() const override;
+    void setFullScreen(bool fullScreen) override;
+
+    void repaint() override;
+
+    QSize nativeSize() const override;
+
+    Qt::AspectRatioMode aspectRatioMode() const override;
+    void setAspectRatioMode(Qt::AspectRatioMode mode) override;
+
+    int brightness() const override;
+    void setBrightness(int brightness) override;
+
+    int contrast() const override;
+    void setContrast(int contrast) override;
+
+    int hue() const override;
+    void setHue(int hue) override;
+
+    int saturation() const override;
+    void setSaturation(int saturation) override;
+
+    // AVF Camera implementation details
+    void setNativeSize(QSize size);
+    void setLayer(AVCaptureVideoPreviewLayer *capturePreviewLayer);
+
+private:
+    void updateAspectRatio();
+    void updateCaptureLayerBounds();
+
+    void retainNativeLayer();
+    void releaseNativeLayer();
+
+    void attachNativeLayer();
+    void detachNativeLayer();
+
+    WId m_winId{0};
+    QRect m_displayRect;
+    bool m_fullscreen{false};
+    Qt::AspectRatioMode m_aspectRatioMode{Qt::IgnoreAspectRatio};
+    QSize m_nativeSize;
+    AVCaptureVideoPreviewLayer *m_captureLayer{nullptr};
+    NativeView *m_nativeView{nullptr};
+};
+
+QT_END_NAMESPACE
+
+#endif // AVFCAMERAWINDOWCONTROL_H
diff --git a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.mm b/src/plugins/avfoundation/camera/avfcamerawindowcontrol.mm
new file mode 100644
index 000000000..5154d0646
--- /dev/null
+++ b/src/plugins/avfoundation/camera/avfcamerawindowcontrol.mm
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "avfcamerawindowcontrol.h"
+
+#import <AVFoundation/AVFoundation.h>
+#import <QuartzCore/CATransaction.h>
+
+#if QT_HAS_INCLUDE(<AppKit/AppKit.h>)
+#import <AppKit/AppKit.h>
+#endif
+
+#if QT_HAS_INCLUDE(<UIKit/UIKit.h>)
+#import <UIKit/UIKit.h>
+#endif
+
+QT_USE_NAMESPACE
+
+AVFCameraWindowControl::AVFCameraWindowControl(QObject *parent)
+    : QVideoWindowControl(parent)
+{
+    setObjectName(QStringLiteral("AVFCameraWindowControl"));
+}
+
+AVFCameraWindowControl::~AVFCameraWindowControl()
+{
+    releaseNativeLayer();
+}
+
+WId AVFCameraWindowControl::winId() const
+{
+    return m_winId;
+}
+
+void AVFCameraWindowControl::setWinId(WId id)
+{
+    if (m_winId == id)
+        return;
+
+    m_winId = id;
+
+    detachNativeLayer();
+    m_nativeView = (NativeView*)m_winId;
+    attachNativeLayer();
+}
+
+QRect AVFCameraWindowControl::displayRect() const
+{
+    return m_displayRect;
+}
+
+void AVFCameraWindowControl::setDisplayRect(const QRect &rect)
+{
+    if (m_displayRect != rect) {
+        m_displayRect = rect;
+        updateCaptureLayerBounds();
+    }
+}
+
+bool AVFCameraWindowControl::isFullScreen() const
+{
+    return m_fullscreen;
+}
+
+void AVFCameraWindowControl::setFullScreen(bool fullscreen)
+{
+    if (m_fullscreen != fullscreen) {
+        m_fullscreen = fullscreen;
+        Q_EMIT fullScreenChanged(fullscreen);
+    }
+}
+
+void AVFCameraWindowControl::repaint()
+{
+    if (m_captureLayer)
+        [m_captureLayer setNeedsDisplay];
+}
+
+QSize AVFCameraWindowControl::nativeSize() const
+{
+    return m_nativeSize;
+}
+
+void AVFCameraWindowControl::setNativeSize(QSize size)
+{
+    if (m_nativeSize != size) {
+        m_nativeSize = size;
+        Q_EMIT nativeSizeChanged();
+    }
+}
+
+Qt::AspectRatioMode AVFCameraWindowControl::aspectRatioMode() const
+{
+    return m_aspectRatioMode;
+}
+
+void AVFCameraWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode)
+{
+    if (m_aspectRatioMode != mode) {
+        m_aspectRatioMode = mode;
+        updateAspectRatio();
+    }
+}
+
+int AVFCameraWindowControl::brightness() const
+{
+    return 0;
+}
+
+void AVFCameraWindowControl::setBrightness(int brightness)
+{
+    if (0 != brightness)
+        qWarning("AVFCameraWindowControl doesn't support changing Brightness");
+}
+
+int AVFCameraWindowControl::contrast() const
+{
+    return 0;
+}
+
+void AVFCameraWindowControl::setContrast(int contrast)
+{
+    if (0 != contrast)
+        qWarning("AVFCameraWindowControl doesn't support changing Contrast");
+}
+
+int AVFCameraWindowControl::hue() const
+{
+    return 0;
+}
+
+void AVFCameraWindowControl::setHue(int hue)
+{
+    if (0 != hue)
+        qWarning("AVFCameraWindowControl doesn't support changing Hue");
+}
+
+int AVFCameraWindowControl::saturation() const
+{
+    return 0;
+}
+
+void AVFCameraWindowControl::setSaturation(int saturation)
+{
+    if (0 != saturation)
+        qWarning("AVFCameraWindowControl doesn't support changing Saturation");
+}
+
+void AVFCameraWindowControl::setLayer(AVCaptureVideoPreviewLayer *capturePreviewLayer)
+{
+    if (m_captureLayer == capturePreviewLayer)
+        return;
+
+    releaseNativeLayer();
+
+    m_captureLayer = capturePreviewLayer;
+
+    if (m_captureLayer)
+        retainNativeLayer();
+}
+
+void AVFCameraWindowControl::updateAspectRatio()
+{
+    if (m_captureLayer) {
+        switch (m_aspectRatioMode) {
+        case Qt::IgnoreAspectRatio:
+            [m_captureLayer setVideoGravity:AVLayerVideoGravityResize];
+            break;
+        case Qt::KeepAspectRatio:
+            [m_captureLayer setVideoGravity:AVLayerVideoGravityResizeAspect];
+            break;
+        case Qt::KeepAspectRatioByExpanding:
+            [m_captureLayer setVideoGravity:AVLayerVideoGravityResizeAspectFill];
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void AVFCameraWindowControl::updateCaptureLayerBounds()
+{
+    if (m_captureLayer && m_nativeView) {
+        [CATransaction begin];
+        [CATransaction setDisableActions: YES]; // disable animation/flicks
+        m_captureLayer.frame = m_displayRect.toCGRect();
+        [CATransaction commit];
+    }
+}
+
+void AVFCameraWindowControl::retainNativeLayer()
+{
+    [m_captureLayer retain];
+
+    updateAspectRatio();
+    attachNativeLayer();
+}
+
+void AVFCameraWindowControl::releaseNativeLayer()
+{
+    if (m_captureLayer) {
+        detachNativeLayer();
+        [m_captureLayer release];
+        m_captureLayer = nullptr;
+    }
+}
+
+void AVFCameraWindowControl::attachNativeLayer()
+{
+    if (m_captureLayer && m_nativeView) {
+#if defined(Q_OS_MACOS)
+        m_nativeView.wantsLayer = YES;
+#endif
+        CALayer *nativeLayer = m_nativeView.layer;
+        [nativeLayer addSublayer:m_captureLayer];
+        updateCaptureLayerBounds();
+    }
+}
+
+void AVFCameraWindowControl::detachNativeLayer()
+{
+    if (m_captureLayer && m_nativeView)
+        [m_captureLayer removeFromSuperlayer];
+}
+
+#include "moc_avfcamerawindowcontrol.cpp"
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index 4b960ed5a..70caf7536 100644
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -42,7 +42,8 @@ HEADERS += \
     avfcameraflashcontrol.h \
     avfvideoencodersettingscontrol.h \
     avfmediacontainercontrol.h \
-    avfaudioencodersettingscontrol.h
+    avfaudioencodersettingscontrol.h \
+    avfcamerawindowcontrol.h
 
 OBJECTIVE_SOURCES += \
     avfcameraserviceplugin.mm \
@@ -65,7 +66,8 @@ OBJECTIVE_SOURCES += \
     avfcameraflashcontrol.mm \
     avfvideoencodersettingscontrol.mm \
     avfmediacontainercontrol.mm \
-    avfaudioencodersettingscontrol.mm
+    avfaudioencodersettingscontrol.mm \
+    avfcamerawindowcontrol.mm
 
 osx {
 
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index db7bef895..e7467bf0b 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -1146,9 +1146,14 @@ void DSCameraSession::updateSourceCapabilities()
                     m_supportedViewfinderSettings.append(settings);
                     m_supportedFormats.append(DirectShowMediaType(*pmt));
                 }
-
-
+            } else {
+                OLECHAR *guidString = nullptr;
+                StringFromCLSID(pmt->subtype, &guidString);
+                if (guidString)
+                    qWarning() << "Unsupported media type:" << QString::fromWCharArray(guidString);
+                ::CoTaskMemFree(guidString);
             }
+
             DirectShowMediaType::deleteType(pmt);
         }
     }
diff --git a/src/plugins/directshow/common/directshowmediatype.cpp b/src/plugins/directshow/common/directshowmediatype.cpp
index 103f1ddc1..3429f4848 100644
--- a/src/plugins/directshow/common/directshowmediatype.cpp
+++ b/src/plugins/directshow/common/directshowmediatype.cpp
@@ -40,6 +40,11 @@
 #include "directshowmediatype.h"
 #include "directshowglobal.h"
 
+#include <initguid.h>
+
+DEFINE_GUID(MEDIASUBTYPE_Y800, 0x30303859, 0x0000, 0x0010, 0x80, 0x00,
+    0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+
 namespace
 {
     struct TypeLookup
@@ -66,7 +71,8 @@ namespace
         { QVideoFrame::Format_NV12, MEDIASUBTYPE_NV12 },
         { QVideoFrame::Format_YUV420P, MEDIASUBTYPE_IYUV },
         { QVideoFrame::Format_YUV420P, MEDIASUBTYPE_I420 },
-        { QVideoFrame::Format_Jpeg, MEDIASUBTYPE_MJPG }
+        { QVideoFrame::Format_Jpeg, MEDIASUBTYPE_MJPG },
+        { QVideoFrame::Format_Y8, MEDIASUBTYPE_Y800 },
     };
 }
 
@@ -294,6 +300,7 @@ int DirectShowMediaType::bytesPerLine(const QVideoSurfaceFormat &format)
         return format.frameWidth() * 4;
     // 24 bpp packed formats.
     case QVideoFrame::Format_RGB24:
+    case QVideoFrame::Format_BGR24:
         return PAD_TO_DWORD(format.frameWidth() * 3);
     // 16 bpp packed formats.
     case QVideoFrame::Format_RGB565:
diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp
index ced10ea10..3318d57b5 100644
--- a/src/plugins/directshow/player/directshowioreader.cpp
+++ b/src/plugins/directshow/player/directshowioreader.cpp
@@ -155,7 +155,7 @@ HRESULT DirectShowIOReader::Request(IMediaSample *pSample, DWORD_PTR dwUser)
         return VFW_E_SAMPLE_TIME_NOT_SET;
     }
     LONGLONG position = startTime / 10000000;
-    LONG length = (endTime - startTime) / 10000000;
+    LONG length = qMin<qint64>((endTime - startTime) / 10000000, m_availableLength);
 
     auto request = new DirectShowSampleRequest(pSample, dwUser, position, length, buffer);
 
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index d9becbab5..61138951c 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -64,7 +64,7 @@
 #endif
 
 #if QT_CONFIG(wshellitem)
-#include <ShlObj.h>
+#include <shlobj.h>
 #include <propkeydef.h>
 #include <private/qsystemlibrary_p.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index 52ec75f44..b164bc31a 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -366,12 +366,9 @@ bool CameraBinImageCapture::processBusMessage(const QGstreamerMessage &message)
 #ifdef DEBUG_CAPTURE
                     qDebug() << Q_FUNC_INFO << "Dropped saving file" << fileName;
 #endif
-                    //camerabin creates an empty file when captured buffer is dropped,
-                    //let's remove it
                     QFileInfo info(QString::fromUtf8(fileName));
-                    if (info.exists() && info.isFile() && info.size() == 0) {
+                    if (info.exists() && info.isFile())
                         QFile(info.absoluteFilePath()).remove();
-                    }
                 }
             }
         }
diff --git a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
index 70b83390c..9fca8a7e1 100644
--- a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
+++ b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
@@ -331,7 +331,7 @@ bool QnxAudioInput::open()
 
     m_pcmNotifier = new QSocketNotifier(snd_pcm_file_descriptor(m_pcmHandle, SND_PCM_CHANNEL_CAPTURE),
                                         QSocketNotifier::Read, this);
-    connect(m_pcmNotifier, SIGNAL(activated(int)), SLOT(userFeed()));
+    connect(m_pcmNotifier, SIGNAL(activated(QSocketDescriptor)), SLOT(userFeed()));
 
     return true;
 }
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
index d6b98cacd..e200e8d16 100644
--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
@@ -105,7 +105,7 @@ void QSGVivanteVideoMaterial::updateBlending() {
 void QSGVivanteVideoMaterial::setCurrentFrame(const QVideoFrame &frame, QSGVideoNode::FrameFlags flags)
 {
     QMutexLocker lock(&mFrameMutex);
-    mNextFrame = frame;
+    mCurrentFrame = frame;
     mMappable = mMapError == GL_NO_ERROR && !flags.testFlag(QSGVideoNode::FrameFiltered);
 
 #ifdef QT_VIVANTE_VIDEO_DEBUG
@@ -122,12 +122,8 @@ void QSGVivanteVideoMaterial::bind()
     }
 
     QMutexLocker lock(&mFrameMutex);
-    if (mNextFrame.isValid()) {
-        mCurrentFrame.unmap();
-
-        mCurrentFrame = mNextFrame;
-        mCurrentTexture = vivanteMapping(mNextFrame);
-    }
+    if (mCurrentFrame.isValid())
+        mCurrentTexture = vivanteMapping(mCurrentFrame);
     else
         glBindTexture(GL_TEXTURE_2D, mCurrentTexture);
 }
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
index adbd960a4..db59e8fc7 100644
--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
@@ -78,7 +78,7 @@ private:
     QVideoFrame::PixelFormat mFormat;
 
     QMap<const uchar*, GLuint> mBitsToTextureMap;
-    QVideoFrame mCurrentFrame, mNextFrame;
+    QVideoFrame mCurrentFrame;
     GLuint mCurrentTexture;
     bool mMappable;
     GLenum mMapError = GL_NO_ERROR;
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index 1182647fc..6ccffc8b2 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -630,7 +630,7 @@ qreal QWindowsAudioOutput::volume() const
 
 void QWindowsAudioOutput::reset()
 {
-    close();
+    stop();
 }
 
 OutputPrivate::OutputPrivate(QWindowsAudioOutput* audio)
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index ede3f6b04..98dd7c2f7 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -54,7 +54,7 @@
 
 #include <functional>
 #include <mfapi.h>
-#include <Mferror.h>
+#include <mferror.h>
 #include <mfidl.h>
 #include <wrl.h>
 #include <windows.devices.enumeration.h>
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index 24bfda833..1d145edc4 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -56,7 +56,7 @@
 #include "mfplayersession.h"
 #include "mfplayerservice.h"
 #include "mfmetadatacontrol.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include "sourceresolver.h"
 #include "samplegrabber.h"
@@ -277,10 +277,13 @@ MFPlayerSession::MediaType MFPlayerSession::getStreamType(IMFStreamDescriptor *s
     if (!stream)
         return Unknown;
 
-    IMFMediaTypeHandler *typeHandler = NULL;
-    if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler))) {
+    struct SafeRelease {
+        IMFMediaTypeHandler *ptr = nullptr;
+        ~SafeRelease() { if (ptr) ptr->Release(); }
+    } typeHandler;
+    if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler.ptr))) {
         GUID guidMajorType;
-        if (SUCCEEDED(typeHandler->GetMajorType(&guidMajorType))) {
+        if (SUCCEEDED(typeHandler.ptr->GetMajorType(&guidMajorType))) {
             if (guidMajorType == MFMediaType_Audio)
                 return Audio;
             else if (guidMajorType == MFMediaType_Video)
@@ -288,9 +291,6 @@ MFPlayerSession::MediaType MFPlayerSession::getStreamType(IMFStreamDescriptor *s
         }
     }
 
-    if (typeHandler)
-        typeHandler->Release();
-
     return Unknown;
 }
 
diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/plugins/wmf/player/mftvideo.cpp
index 879911d55..9dce654f2 100644
--- a/src/plugins/wmf/player/mftvideo.cpp
+++ b/src/plugins/wmf/player/mftvideo.cpp
@@ -40,7 +40,7 @@
 #include "mftvideo.h"
 #include "mfvideoprobecontrol.h"
 #include <private/qmemoryvideobuffer_p.h>
-#include <Mferror.h>
+#include <mferror.h>
 #include <strmif.h>
 #include <uuids.h>
 #include <InitGuid.h>
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
index c6f4e8566..15ef6f0ab 100644
--- a/src/plugins/wmf/sourceresolver.cpp
+++ b/src/plugins/wmf/sourceresolver.cpp
@@ -39,7 +39,7 @@
 
 #include "mfstream.h"
 #include "sourceresolver.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>