1 files changed, 11 insertions, 48 deletions

diff --git a/src/plugins/multimedia/ffmpeg/qffmpegimagecapture_p.h b/src/plugins/multimedia/ffmpeg/qffmpegimagecapture_p.h
index 91dacb9d2..d8174ae05 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegimagecapture_p.h
+++ b/src/plugins/multimedia/ffmpeg/qffmpegimagecapture_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #ifndef QFFMPEGIMAGECAPTURE_H
@@ -55,12 +19,12 @@
 #include <private/qplatformimagecapture_p.h>
 #include "qffmpegmediacapturesession_p.h"
 
+#include <QtCore/qpointer.h>
 #include <qqueue.h>
 
 QT_BEGIN_NAMESPACE
 
 class QFFmpegImageCapture : public QPlatformImageCapture
-
 {
     Q_OBJECT
 public:
@@ -76,20 +40,21 @@ public:
 
     void setCaptureSession(QPlatformMediaCaptureSession *session);
 
+protected:
+    virtual int doCapture(const QString &fileName);
+    virtual void setupVideoSourceConnections();
+    QPlatformVideoSource *videoSource() const;
     void updateReadyForCapture();
 
-public Q_SLOTS:
-    void cameraActiveChanged(bool active);
+protected Q_SLOTS:
     void newVideoFrame(const QVideoFrame &frame);
-    void onCameraChanged();
+    void onVideoSourceChanged();
 
 private:
-    int doCapture(const QString &fileName);
-
     QFFmpegMediaCaptureSession *m_session = nullptr;
+    QPointer<QPlatformVideoSource> m_videoSource;
     int m_lastId = 0;
     QImageEncoderSettings m_settings;
-    QPlatformCamera *m_camera = nullptr;
 
     struct PendingImage {
         int id;
@@ -97,9 +62,7 @@ private:
         QMediaMetaData metaData;
     };
 
-    QQueue<PendingImage> pendingImages;
-    bool passImage = false;
-    bool cameraActive = false;
+    QQueue<PendingImage> m_pendingImages;
     bool m_isReadyForCapture = false;
 };