diff options
Diffstat (limited to 'src/multimedia/platform/android')
8 files changed, 15 insertions, 151 deletions
diff --git a/src/multimedia/platform/android/mediacapture/mediacapture.pri b/src/multimedia/platform/android/mediacapture/mediacapture.pri index 6d785d366..97083c284 100644 --- a/src/multimedia/platform/android/mediacapture/mediacapture.pri +++ b/src/multimedia/platform/android/mediacapture/mediacapture.pri @@ -6,7 +6,6 @@ SOURCES += \ $$PWD/qandroidcamerasession.cpp \ $$PWD/qandroidcameraexposurecontrol.cpp \ $$PWD/qandroidcameraimageprocessingcontrol.cpp \ - $$PWD/qandroidimageencodercontrol.cpp \ $$PWD/qandroidcameraimagecapturecontrol.cpp \ $$PWD/qandroidcamerafocuscontrol.cpp \ $$PWD/qandroidcapturesession.cpp \ @@ -19,7 +18,6 @@ HEADERS += \ $$PWD/qandroidcamerasession_p.h \ $$PWD/qandroidcameraexposurecontrol_p.h \ $$PWD/qandroidcameraimageprocessingcontrol_p.h \ - $$PWD/qandroidimageencodercontrol_p.h \ $$PWD/qandroidcameraimagecapturecontrol_p.h \ $$PWD/qandroidcamerafocuscontrol_p.h \ $$PWD/qandroidcapturesession_p.h \ diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp index bd3431755..9885be05b 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp @@ -81,4 +81,14 @@ void QAndroidCameraImageCaptureControl::setCaptureDestination(QCameraImageCaptur m_session->setCaptureDestination(destination); } +QImageEncoderSettings QAndroidCameraImageCaptureControl::imageSettings() const +{ + return m_session->imageSettings(); +} + +void QAndroidCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings) +{ + m_session->setImageSettings(settings); +} + QT_END_NAMESPACE diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h index f126efd82..58dc73e98 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h @@ -71,6 +71,9 @@ public: QCameraImageCapture::CaptureDestinations captureDestination() const override; void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override; + QImageEncoderSettings imageSettings() const override; + void setImageSettings(const QImageEncoderSettings &settings) override; + private: QAndroidCameraSession *m_session; }; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp index 042f66078..a9d5b32e6 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp @@ -516,8 +516,8 @@ void QAndroidCameraSession::applyImageSettings() if (!m_camera) return; - if (m_actualImageSettings.codec().isEmpty()) - m_actualImageSettings.setCodec(QLatin1String("jpeg")); + // only supported format right now. + m_actualImageSettings.setFormat(QImageEncoderSettings::JPEG); const QSize requestedResolution = m_requestedImageSettings.resolution(); const QList<QSize> supportedResolutions = m_camera->getSupportedPictureSizes(); diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp index 9721229a6..f6d242cd7 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp @@ -45,7 +45,6 @@ #include "qandroidcameracontrol_p.h" #include "qandroidcamerasession_p.h" #include "qandroidcameravideorenderercontrol_p.h" -#include "qandroidimageencodercontrol_p.h" #include "qandroidcameraimagecapturecontrol_p.h" QT_BEGIN_NAMESPACE @@ -57,12 +56,10 @@ QAndroidCaptureService::QAndroidCaptureService(QMediaRecorder::CaptureMode mode) if (m_videoEnabled) { m_cameraSession = new QAndroidCameraSession; m_cameraControl = new QAndroidCameraControl(m_cameraSession); - m_imageEncoderControl = new QAndroidImageEncoderControl(m_cameraSession); m_imageCaptureControl = new QAndroidCameraImageCaptureControl(m_cameraSession); } else { m_cameraSession = 0; m_cameraControl = 0; - m_imageEncoderControl = 0; m_imageCaptureControl = 0; } @@ -76,7 +73,6 @@ QAndroidCaptureService::~QAndroidCaptureService() delete m_captureSession; delete m_cameraControl; delete m_videoRendererControl; - delete m_imageEncoderControl; delete m_imageCaptureControl; delete m_cameraSession; } @@ -89,9 +85,6 @@ QObject *QAndroidCaptureService::requestControl(const char *name) if (qstrcmp(name, QCameraControl_iid) == 0) return m_cameraControl; - if (qstrcmp(name, QImageEncoderControl_iid) == 0) - return m_imageEncoderControl; - if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0) return m_imageCaptureControl; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h index 0f0892a24..55d4f845e 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h @@ -63,7 +63,6 @@ class QAndroidCaptureSession; class QAndroidCameraControl; class QAndroidCameraSession; class QAndroidCameraVideoRendererControl; -class QAndroidImageEncoderControl; class QAndroidCameraImageCaptureControl; class QAndroidCaptureService : public QMediaPlatformCaptureInterface @@ -84,7 +83,6 @@ public: QAndroidCameraControl *m_cameraControl; QAndroidCameraSession *m_cameraSession; QAndroidCameraVideoRendererControl *m_videoRendererControl; - QAndroidImageEncoderControl *m_imageEncoderControl; QAndroidCameraImageCaptureControl *m_imageCaptureControl; }; diff --git a/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol.cpp deleted file mode 100644 index 7be520941..000000000 --- a/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#include "qandroidimageencodercontrol_p.h" - -#include "qandroidcamerasession_p.h" -#include "androidcamera_p.h" - -QT_BEGIN_NAMESPACE - -QAndroidImageEncoderControl::QAndroidImageEncoderControl(QAndroidCameraSession *session) - : QImageEncoderControl() - , m_session(session) -{ -} - -QImageEncoderSettings QAndroidImageEncoderControl::imageSettings() const -{ - return m_session->imageSettings(); -} - -void QAndroidImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings) -{ - m_session->setImageSettings(settings); -} - -QT_END_NAMESPACE diff --git a/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol_p.h deleted file mode 100644 index 19555879e..000000000 --- a/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#ifndef QANDROIDIMAGEENCODERCONTROL_H -#define QANDROIDIMAGEENCODERCONTROL_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 QAndroidCameraSession; - -class QAndroidImageEncoderControl : public QImageEncoderControl -{ - Q_OBJECT -public: - explicit QAndroidImageEncoderControl(QAndroidCameraSession *session); - - QImageEncoderSettings imageSettings() const override; - void setImageSettings(const QImageEncoderSettings &settings) override; - -private: - QAndroidCameraSession *m_session; -}; - -QT_END_NAMESPACE - -#endif // QANDROIDIMAGEENCODERCONTROL_H |