1 files changed, 36 insertions, 48 deletions

diff --git a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture_p.h b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture_p.h
index 1f498fe0b..04a7c00b4 100644
--- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture_p.h
+++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamerimagecapture_p.h
@@ -1,42 +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 QGSTREAMERIMAGECAPTURECONTROL_H
 #define QGSTREAMERIMAGECAPTURECONTROL_H
@@ -52,23 +15,26 @@
 // We mean it.
 //
 
-#include <private/qplatformimagecapture_p.h>
-#include "qgstreamermediacapture_p.h"
-#include "qgstreamerbufferprobe_p.h"
+#include <QtMultimedia/private/qplatformimagecapture_p.h>
+#include <QtMultimedia/private/qmultimediautils_p.h>
 
-#include <qqueue.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qqueue.h>
+#include <QtConcurrent/QtConcurrentRun>
 
-#include <qgst_p.h>
+#include <common/qgst_p.h>
+#include <common/qgstreamerbufferprobe_p.h>
+#include <mediacapture/qgstreamermediacapture_p.h>
 #include <gst/video/video.h>
 
 QT_BEGIN_NAMESPACE
 
 class QGstreamerImageCapture : public QPlatformImageCapture, private QGstreamerBufferProbe
-
 {
     Q_OBJECT
+
 public:
-    QGstreamerImageCapture(QImageCapture *parent);
+    static QMaybe<QPlatformImageCapture *> create(QImageCapture *parent);
     virtual ~QGstreamerImageCapture();
 
     bool isReadyForCapture() const override;
@@ -82,16 +48,26 @@ public:
 
     void setCaptureSession(QPlatformMediaCaptureSession *session);
 
-    QGstElement gstElement() const { return bin.element(); }
+    QGstElement gstElement() const { return bin; }
+
+    void setMetaData(const QMediaMetaData &m) override;
 
 public Q_SLOTS:
     void cameraActiveChanged(bool active);
     void onCameraChanged();
 
 private:
+    QGstreamerImageCapture(QImageCapture *parent);
+
+    void setResolution(const QSize &resolution);
     int doCapture(const QString &fileName);
-    static gboolean saveImageFilter(GstElement *element, GstBuffer *buffer, GstPad *pad, void *appdata);
+    static gboolean saveImageFilter(GstElement *element, GstBuffer *buffer, GstPad *pad,
+                                    QGstreamerImageCapture *capture);
+
+    void saveBufferToImage(GstBuffer *buffer);
 
+    mutable QRecursiveMutex
+            m_mutex; // guard all elements accessed from probeBuffer/saveBufferToImage
     QGstreamerMediaCapture *m_session = nullptr;
     int m_lastId = 0;
     QImageEncoderSettings m_settings;
@@ -106,6 +82,7 @@ private:
 
     QGstBin bin;
     QGstElement queue;
+    QGstElement filter;
     QGstElement videoConvert;
     QGstElement encoder;
     QGstElement muxer;
@@ -114,6 +91,17 @@ private:
 
     bool passImage = false;
     bool cameraActive = false;
+
+    QGObjectHandlerScopedConnection m_handoffConnection;
+
+    QMap<int, QFuture<void>> m_pendingFutures;
+    int futureIDAllocator = 0;
+
+    template <typename Functor>
+    void invokeDeferred(Functor &&fn)
+    {
+        QMetaObject::invokeMethod(this, std::forward<decltype(fn)>(fn), Qt::QueuedConnection);
+    };
 };
 
 QT_END_NAMESPACE