diff options
Diffstat (limited to 'src/multimedia/platform/qnx')
6 files changed, 13 insertions, 141 deletions
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp index 351630abe..151d7ac67 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp @@ -80,4 +80,14 @@ void BbCameraImageCaptureControl::setCaptureDestination(QCameraImageCapture::Cap m_session->setCaptureDestination(destination); } +QImageEncoderSettings BbCameraImageCaptureControl::imageSettings() const +{ + return m_session->imageSettings(); +} + +void BbCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings) +{ + m_session->setImageSettings(settings); +} + QT_END_NAMESPACE diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h index f9b45672d..7cc5a38b9 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h @@ -70,6 +70,9 @@ public: QCameraImageCapture::CaptureDestinations captureDestination() const override; void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override; + QImageEncoderSettings imageSettings() const override; + void setImageSettings(const QImageEncoderSettings &settings) override; + private: BbCameraSession *m_session; }; diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp index a5137c33e..4343bb5ad 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp @@ -47,7 +47,6 @@ #include "bbcameramediarecordercontrol_p.h" #include "bbcamerasession_p.h" #include "bbcameravideoencodersettingscontrol_p.h" -#include "bbimageencodercontrol_p.h" #include "bbvideorenderercontrol_p.h" #include <QDebug> @@ -66,7 +65,6 @@ BbCameraService::BbCameraService(QObject *parent) , m_cameraImageProcessingControl(new BbCameraImageProcessingControl(m_cameraSession, this)) , m_cameraMediaRecorderControl(new BbCameraMediaRecorderControl(m_cameraSession, this)) , m_cameraVideoEncoderSettingsControl(new BbCameraVideoEncoderSettingsControl(m_cameraSession, this)) - , m_imageEncoderControl(new BbImageEncoderControl(m_cameraSession, this)) , m_videoRendererControl(new BbVideoRendererControl(m_cameraSession, this)) { } @@ -93,8 +91,6 @@ QMediaControl* BbCameraService::requestControl(const char *name) return m_cameraMediaRecorderControl; else if (qstrcmp(name, QVideoEncoderSettingsControl_iid) == 0) return m_cameraVideoEncoderSettingsControl; - else if (qstrcmp(name, QImageEncoderControl_iid) == 0) - return m_imageEncoderControl; else if (qstrcmp(name, QVideoRendererControl_iid) == 0) return m_videoRendererControl; diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h index e1a9016e1..0ecfb98c8 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h @@ -65,7 +65,6 @@ class BbCameraImageProcessingControl; class BbCameraMediaRecorderControl; class BbCameraSession; class BbCameraVideoEncoderSettingsControl; -class BbImageEncoderControl; class BbVideoRendererControl; class BbCameraService : public QMediaService @@ -90,7 +89,6 @@ private: BbCameraImageProcessingControl* m_cameraImageProcessingControl; BbCameraMediaRecorderControl* m_cameraMediaRecorderControl; BbCameraVideoEncoderSettingsControl* m_cameraVideoEncoderSettingsControl; - BbImageEncoderControl* m_imageEncoderControl; BbVideoRendererControl* m_videoRendererControl; }; diff --git a/src/multimedia/platform/qnx/camera/bbimageencodercontrol.cpp b/src/multimedia/platform/qnx/camera/bbimageencodercontrol.cpp deleted file mode 100644 index 65ebf2d63..000000000 --- a/src/multimedia/platform/qnx/camera/bbimageencodercontrol.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 "bbimageencodercontrol_p.h" - -#include "bbcamerasession_p.h" - -QT_BEGIN_NAMESPACE - -BbImageEncoderControl::BbImageEncoderControl(BbCameraSession *session, QObject *parent) - : QImageEncoderControl(parent) - , m_session(session) -{ -} - -QImageEncoderSettings BbImageEncoderControl::imageSettings() const -{ - return m_session->imageSettings(); -} - -void BbImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings) -{ - m_session->setImageSettings(settings); -} - -QT_END_NAMESPACE diff --git a/src/multimedia/platform/qnx/camera/bbimageencodercontrol_p.h b/src/multimedia/platform/qnx/camera/bbimageencodercontrol_p.h deleted file mode 100644 index f7e4d4445..000000000 --- a/src/multimedia/platform/qnx/camera/bbimageencodercontrol_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion -** 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 BBIMAGEENCODERCONTROL_H -#define BBIMAGEENCODERCONTROL_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 <qimageencodercontrol.h> - -QT_BEGIN_NAMESPACE - -class BbCameraSession; - -class BbImageEncoderControl : public QImageEncoderControl -{ - Q_OBJECT -public: - explicit BbImageEncoderControl(BbCameraSession *session, QObject *parent = 0); - - QImageEncoderSettings imageSettings() const override; - void setImageSettings(const QImageEncoderSettings &settings) override; - -private: - BbCameraSession *m_session; -}; - -QT_END_NAMESPACE - -#endif |