diff options
Diffstat (limited to 'src/multimedia/platform/windows/mediacapture')
6 files changed, 0 insertions, 163 deletions
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp index a6cd0e6cc..675290a71 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp @@ -40,7 +40,6 @@ #include "qwindowscamera_p.h" #include "qwindowscamerasession_p.h" -#include "qwindowscameraimageprocessing_p.h" #include "qwindowsmediacapture_p.h" #include <qcamerainfo.h> @@ -121,11 +120,4 @@ void QWindowsCamera::setCaptureSession(QPlatformMediaCaptureSession *session) m_cameraSession->setActiveCamera(m_cameraInfo); } -QPlatformCameraImageProcessing *QWindowsCamera::imageProcessingControl() -{ - if (!m_cameraSession) - return nullptr; - return m_cameraSession->imageProcessingControl(); -} - QT_END_NAMESPACE diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h index 63b9ff84c..7524c3357 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h @@ -74,8 +74,6 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *) override; - QPlatformCameraImageProcessing *imageProcessingControl() override; - private Q_SLOTS: void updateStatus(); diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing.cpp deleted file mode 100644 index 399cc7fe7..000000000 --- a/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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$ -** -****************************************************************************/ - -#include "qwindowscameraimageprocessing_p.h" - -QT_BEGIN_NAMESPACE - -QWindowsCameraImageProcessing::QWindowsCameraImageProcessing(QWindowsCameraSession *session) - : m_session(session) -{ - Q_ASSERT(m_session); -} - -bool QWindowsCameraImageProcessing::isParameterSupported(ProcessingParameter parameter) const -{ - return false; -} - -bool QWindowsCameraImageProcessing::isParameterValueSupported(ProcessingParameter parameter, - const QVariant &value) const -{ - return false; -} - -void QWindowsCameraImageProcessing::setParameter(ProcessingParameter parameter, const QVariant &value) -{ -} - -QT_END_NAMESPACE diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing_p.h deleted file mode 100644 index e58b7098f..000000000 --- a/src/multimedia/platform/windows/mediacapture/qwindowscameraimageprocessing_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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 QWINDOWSCAMERAIMAGEPROCESSING_H -#define QWINDOWSCAMERAIMAGEPROCESSING_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 <private/qplatformcameraimageprocessing_p.h> - -QT_BEGIN_NAMESPACE - -class QWindowsCameraSession; - -class QWindowsCameraImageProcessing : public QPlatformCameraImageProcessing -{ - Q_OBJECT -public: - explicit QWindowsCameraImageProcessing(QWindowsCameraSession *session); - - bool isParameterSupported(ProcessingParameter) const override; - bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const override; - void setParameter(ProcessingParameter parameter, const QVariant &value) override; - -private: - QWindowsCameraSession *m_session; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp index 2177e6c5f..ae5c79dec 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp @@ -40,7 +40,6 @@ #include "qwindowscamerasession_p.h" #include "qwindowscamerareader_p.h" -#include "qwindowscameraimageprocessing_p.h" #include "qwindowsmultimediautils_p.h" #include <qvideosink.h> #include <QtCore/qdebug.h> @@ -51,7 +50,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent) : QObject(parent) { m_cameraReader = new QWindowsCameraReader(this); - m_cameraImageProcessing = new QWindowsCameraImageProcessing(this); connect(m_cameraReader, SIGNAL(streamingStarted()), this, SLOT(handleStreamingStarted())); connect(m_cameraReader, SIGNAL(streamingStopped()), this, SLOT(handleStreamingStopped())); connect(m_cameraReader, SIGNAL(recordingStarted()), this, SIGNAL(recordingStarted())); @@ -61,7 +59,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent) QWindowsCameraSession::~QWindowsCameraSession() { - delete m_cameraImageProcessing; delete m_cameraReader; } @@ -124,11 +121,6 @@ void QWindowsCameraSession::setVideoSink(QVideoSink *surface) m_cameraReader->setSurface(surface); } -QWindowsCameraImageProcessing *QWindowsCameraSession::imageProcessingControl() -{ - return m_cameraImageProcessing; -} - void QWindowsCameraSession::handleStreamingStarted() { m_active = true; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h index ca4e31cd2..21b14608f 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h @@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE class QVideoSink; class QWindowsCameraReader; -class QWindowsCameraImageProcessing; class QWindowsCameraSession : public QObject { @@ -84,8 +83,6 @@ public: void setVideoSink(QVideoSink *surface); - QWindowsCameraImageProcessing *imageProcessingControl(); - QMediaEncoderSettings videoSettings() const; void setVideoSettings(const QMediaEncoderSettings &settings); @@ -112,7 +109,6 @@ private: bool m_readyForCapture = false; QCameraInfo m_activeCameraInfo; QWindowsCameraReader *m_cameraReader = nullptr; - QWindowsCameraImageProcessing *m_cameraImageProcessing = nullptr; QImageEncoderSettings m_imageEncoderSettings; QMediaEncoderSettings m_mediaEncoderSettings; }; |