diff options
Diffstat (limited to 'tests/auto')
7 files changed, 42 insertions, 136 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 3d1b970b5..4c5f6c251 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -34,7 +34,6 @@ #include <private/qplatformcamera_p.h> #include <private/qplatformcameraimagecapture_p.h> -#include <private/qplatformcameraimageprocessing_p.h> #include <qcamera.h> #include <qcamerainfo.h> #include <qcameraimagecapture.h> diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt index 0c471e7f1..8f43aafdd 100644 --- a/tests/auto/unit/mockbackend/CMakeLists.txt +++ b/tests/auto/unit/mockbackend/CMakeLists.txt @@ -15,7 +15,6 @@ target_link_libraries(QtMultimediaMockBackend INTERFACE target_sources(QtMultimediaMockBackend INTERFACE qmockaudiodecoder.h qmockcamera.h - qmockcameraimageprocessing.h qmockimagecapture.h qmockimagecapture.cpp qmockmediaplayer.h qmockmediaencoder.h diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h index 5ccf79e2f..b5fe3f745 100644 --- a/tests/auto/unit/mockbackend/qmockcamera.h +++ b/tests/auto/unit/mockbackend/qmockcamera.h @@ -31,7 +31,6 @@ #include "private/qplatformcamera_p.h" #include "qcamerainfo.h" -#include "qmockcameraimageprocessing.h" #include <qtimer.h> class QMockCamera : public QPlatformCamera @@ -53,7 +52,6 @@ public: m_propertyChangesSupported(false) { if (!simpleCamera) { - mockImageProcessing = new QMockCameraImageProcessing(this); minIsoChanged(100); maxIsoChanged(800); minShutterSpeedChanged(.001); @@ -164,14 +162,29 @@ public: return manualShutterSpeed() > 0 ? manualShutterSpeed() : .05; } - QPlatformCameraImageProcessing *imageProcessingControl() override { return mockImageProcessing; } + bool isWhiteBalanceModeSupported(QCamera::WhiteBalanceMode mode) const override + { + if (simpleCamera) + return mode == QCamera::WhiteBalanceAuto; + return mode == QCamera::WhiteBalanceAuto || + mode == QCamera::WhiteBalanceManual || + mode == QCamera::WhiteBalanceSunlight; + } + void setWhiteBalanceMode(QCamera::WhiteBalanceMode mode) override + { + if (isWhiteBalanceModeSupported(mode)) + whiteBalanceModeChanged(mode); + } + void setColorTemperature(int temperature) override + { + if (!simpleCamera) + colorTemperatureChanged(temperature); + } bool m_active = false; QCamera::Status m_status; QCameraInfo m_camera; bool m_propertyChangesSupported; - - QMockCameraImageProcessing *mockImageProcessing = nullptr; }; diff --git a/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h b/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h deleted file mode 100644 index 3de32002a..000000000 --- a/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOCKCAMERAIMAGEPROCESSINGCONTROL_H -#define MOCKCAMERAIMAGEPROCESSINGCONTROL_H - -#include "private/qplatformcameraimageprocessing_p.h" - -class QMockCameraImageProcessing : public QPlatformCameraImageProcessing -{ - Q_OBJECT -public: - QMockCameraImageProcessing(QObject *parent = 0) - : QPlatformCameraImageProcessing(parent) - { - m_supportedWhiteBalance.insert(QCamera::WhiteBalanceAuto); - } - - QCamera::WhiteBalanceMode whiteBalanceMode() const - { - return m_whiteBalanceMode; - } - void setWhiteBalanceMode(QCamera::WhiteBalanceMode mode) - { - m_whiteBalanceMode = mode; - } - - bool isWhiteBalanceModeSupported(QCamera::WhiteBalanceMode mode) const - { - return m_supportedWhiteBalance.contains(mode); - } - - void setSupportedWhiteBalanceModes(QSet<QCamera::WhiteBalanceMode> modes) - { - m_supportedWhiteBalance = modes; - } - - bool isParameterSupported(ProcessingParameter parameter) const - { - switch (parameter) - { - case ColorTemperature: - case WhiteBalancePreset: - return true; - default : - return false; - } - } - - bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const - { - if (parameter != WhiteBalancePreset) - return false; - - return m_supportedWhiteBalance.contains(value.value<QCamera::WhiteBalanceMode>()); - } - - void setParameter(ProcessingParameter parameter, const QVariant &value) - { - switch (parameter) { - case ColorTemperature: - m_manualWhiteBalance = value; - break; - case WhiteBalancePreset: - m_whiteBalanceMode = value.value<QCamera::WhiteBalanceMode>(); - break; - default: - break; - } - } - - -private: - QCamera::WhiteBalanceMode m_whiteBalanceMode; - QSet<QCamera::WhiteBalanceMode> m_supportedWhiteBalance; - QVariant m_manualWhiteBalance; -}; - -#endif // MOCKCAMERAIMAGEPROCESSINGCONTROL_H diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index 08202be51..9265f0799 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -34,7 +34,6 @@ #include <qvideosink.h> #include <private/qplatformcamera_p.h> #include <private/qplatformcameraimagecapture_p.h> -#include <private/qplatformcameraimageprocessing_p.h> #include <qcamera.h> #include <qcamerainfo.h> #include <qcameraimagecapture.h> @@ -134,14 +133,15 @@ void tst_QCamera::testSimpleCameraWhiteBalance() QCamera camera; //only WhiteBalanceAuto is supported - QVERIFY(!camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceAuto)); + QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceAuto)); + QVERIFY(!camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceManual)); QVERIFY(!camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceCloudy)); QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); camera.setWhiteBalanceMode(QCamera::WhiteBalanceCloudy); QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); - QCOMPARE(camera.manualWhiteBalance()+1.0, 1.0); - camera.setManualWhiteBalance(5000); - QCOMPARE(camera.manualWhiteBalance()+1.0, 1.0); + QCOMPARE(camera.colorTemperature(), 0); + camera.setColorTemperature(5000); + QCOMPARE(camera.colorTemperature(), 0); } void tst_QCamera::testSimpleCameraExposure() @@ -296,34 +296,36 @@ void tst_QCamera::testCameraCaptureMetadata() void tst_QCamera::testCameraWhiteBalance() { - QSet<QCamera::WhiteBalanceMode> whiteBalanceModes; - whiteBalanceModes << QCamera::WhiteBalanceAuto; - whiteBalanceModes << QCamera::WhiteBalanceFlash; - whiteBalanceModes << QCamera::WhiteBalanceTungsten; - whiteBalanceModes << QCamera::WhiteBalanceManual; - QCamera camera; - QMockCamera *mockCamera = integration.lastCamera(); - mockCamera->mockImageProcessing->setSupportedWhiteBalanceModes(whiteBalanceModes); QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); camera.setWhiteBalanceMode(QCamera::WhiteBalanceFlash); - QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceFlash); + QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceAuto)); - QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceFlash)); - QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceTungsten)); + QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceManual)); + QVERIFY(camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceSunlight)); QVERIFY(!camera.isWhiteBalanceModeSupported(QCamera::WhiteBalanceCloudy)); - camera.setWhiteBalanceMode(QCamera::WhiteBalanceTungsten); - QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceTungsten); + camera.setWhiteBalanceMode(QCamera::WhiteBalanceSunlight); + QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceSunlight); camera.setWhiteBalanceMode(QCamera::WhiteBalanceManual); QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceManual); - camera.setManualWhiteBalance(34); - QCOMPARE(camera.manualWhiteBalance(), 34.0); + camera.setColorTemperature(4000); + QCOMPARE(camera.colorTemperature(), 4000); + + camera.setColorTemperature(8000); + QCOMPARE(camera.colorTemperature(), 8000); + + camera.setWhiteBalanceMode(QCamera::WhiteBalanceAuto); + QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); + camera.setColorTemperature(4000); + QCOMPARE(camera.colorTemperature(), 4000); + QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceManual); - camera.setManualWhiteBalance(432.0); - QCOMPARE(camera.manualWhiteBalance(), 432.0); + camera.setColorTemperature(0); + QCOMPARE(camera.colorTemperature(), 0); + QCOMPARE(camera.whiteBalanceMode(), QCamera::WhiteBalanceAuto); } void tst_QCamera::testCameraExposure() @@ -385,7 +387,6 @@ void tst_QCamera::testCameraExposure() qreal minShutterSpeed = camera.minimumShutterSpeed(); qreal maxShutterSpeed = camera.maximumShutterSpeed(); - qDebug() << minShutterSpeed << maxShutterSpeed; QVERIFY(minShutterSpeed > 0); QVERIFY(maxShutterSpeed > 0); QVERIFY(camera.shutterSpeed() >= minShutterSpeed); diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp index 2b11636c0..3fda9b0de 100644 --- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -31,7 +31,6 @@ #include <private/qplatformcamera_p.h> #include <private/qplatformcameraimagecapture_p.h> -#include <private/qplatformcameraimageprocessing_p.h> #include <qcamera.h> #include <qcameraimagecapture.h> #include <qmediacapturesession.h> diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp index 00cfc1646..757a8c805 100644 --- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp @@ -33,7 +33,6 @@ #include <private/qplatformcamera_p.h> #include <private/qplatformcameraimagecapture_p.h> -#include <private/qplatformcameraimageprocessing_p.h> #include <qmediacapturesession.h> #include <qcamera.h> #include <qcameraimagecapture.h> |