diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-22 18:24:00 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:55:36 +0000 |
commit | acd9a72314696d97dccc36fd491d1aff754f2606 (patch) | |
tree | f1c6ee7f589c0dc5bfdc7f132fe3507e77e176fb /tests | |
parent | b3284a1583f5e3d5cef360af279cfbe473245e97 (diff) | |
download | qtmultimedia-acd9a72314696d97dccc36fd491d1aff754f2606.tar.gz |
Merge QCameraLocksControl into QCameraControl
Change-Id: I228b7ef5dbb3e782a4cf39605e2f33b3c93ba8a5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
16 files changed, 87 insertions, 155 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index cd56ca1ac..d4c3972cf 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -34,7 +34,6 @@ #include <qabstractvideosurface.h> #include <qcameracontrol.h> -#include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> #include <qcameraimagecapturecontrol.h> diff --git a/tests/auto/integration/shared/mediafileselector.h b/tests/auto/integration/shared/mediafileselector.h index 984da6e2b..c1e585b02 100644 --- a/tests/auto/integration/shared/mediafileselector.h +++ b/tests/auto/integration/shared/mediafileselector.h @@ -31,6 +31,9 @@ #include <QMediaContent> #include <QMediaPlayer> +#include <qsignalspy.h> +#include <qfileinfo.h> +#include <qtest.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/unit/qcamera/CMakeLists.txt b/tests/auto/unit/qcamera/CMakeLists.txt index c982d7120..4fd2fb931 100644 --- a/tests/auto/unit/qcamera/CMakeLists.txt +++ b/tests/auto/unit/qcamera/CMakeLists.txt @@ -12,7 +12,6 @@ qt_add_test(tst_qcamera ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 971ba53c1..5f8f40eb0 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -33,7 +33,6 @@ #include <qabstractvideosurface.h> #include <qcameracontrol.h> -#include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> #include <qcameraimagecapturecontrol.h> @@ -2106,7 +2105,7 @@ void tst_QCamera::testLockChangeReason() QSignalSpy lockStatusChangedSignalWithType(&camera, SIGNAL(lockStatusChanged(QCamera::LockType,QCamera::LockStatus,QCamera::LockChangeReason))); /* Set the lockChangeReason */ - service.mockLocksControl->setLockChangeReason(QCamera::LockAcquired); + service.mockControl->setLockChangeReason(QCamera::LockAcquired); /* Verify if lockChangeReson is eqaul toQCamera::LockAcquired */ QCOMPARE(lockStatusChangedSignalWithType.count(), 1); diff --git a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt index 5e7643803..751b2b763 100644 --- a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt +++ b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt @@ -12,7 +12,6 @@ qt_add_test(tst_qcameraimagecapture ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index cab3f8984..5340706fc 100644 --- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -40,7 +40,6 @@ Reviewer Name Date Coverage ( Full / Test Case IDs ). #include <QDebug> #include <qcameracontrol.h> -#include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> #include <qcameraimagecapturecontrol.h> diff --git a/tests/auto/unit/qcamerainfo/CMakeLists.txt b/tests/auto/unit/qcamerainfo/CMakeLists.txt index 1fed27667..83d0c2b87 100644 --- a/tests/auto/unit/qcamerainfo/CMakeLists.txt +++ b/tests/auto/unit/qcamerainfo/CMakeLists.txt @@ -12,7 +12,6 @@ qt_add_test(tst_qcamerainfo ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qcameraviewfinder/CMakeLists.txt b/tests/auto/unit/qcameraviewfinder/CMakeLists.txt index 5f298ce2e..022019f27 100644 --- a/tests/auto/unit/qcameraviewfinder/CMakeLists.txt +++ b/tests/auto/unit/qcameraviewfinder/CMakeLists.txt @@ -12,7 +12,6 @@ qt_add_test(tst_qcameraviewfinder ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qcamerawidgets/CMakeLists.txt b/tests/auto/unit/qcamerawidgets/CMakeLists.txt index 178ea2f9e..6b228bf7c 100644 --- a/tests/auto/unit/qcamerawidgets/CMakeLists.txt +++ b/tests/auto/unit/qcamerawidgets/CMakeLists.txt @@ -12,7 +12,6 @@ qt_add_test(tst_qcamerawidgets ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp index 72ef219a0..11221bf09 100644 --- a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp @@ -33,7 +33,6 @@ #include <qabstractvideosurface.h> #include <qcameracontrol.h> -#include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> #include <qcameraimagecapturecontrol.h> diff --git a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt index 3bcc630f6..9eec6604c 100644 --- a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt +++ b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt @@ -14,7 +14,6 @@ qt_add_test(tst_qdeclarativecamera ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt index 75af082e2..5d7911dbe 100644 --- a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt +++ b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt @@ -14,7 +14,6 @@ qt_add_test(tst_qdeclarativemultimediaglobal ../qmultimedia_common/mockcamerafocuscontrol.h ../qmultimedia_common/mockcameraimagecapturecontrol.h ../qmultimedia_common/mockcameraimageprocessingcontrol.h - ../qmultimedia_common/mockcameralockscontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockcameraviewfindersettingscontrol.h ../qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri index edf537eeb..0c439f5ab 100644 --- a/tests/auto/unit/qmultimedia_common/mockcamera.pri +++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri @@ -6,7 +6,6 @@ INCLUDEPATH += $$PWD \ HEADERS *= \ ../qmultimedia_common/mockcameraservice.h \ - ../qmultimedia_common/mockcameralockscontrol.h \ ../qmultimedia_common/mockcamerafocuscontrol.h \ ../qmultimedia_common/mockcameraimageprocessingcontrol.h \ ../qmultimedia_common/mockcameraimagecapturecontrol.h \ diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h index 95e9be7b3..fb686f92f 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h @@ -30,6 +30,7 @@ #define MOCKCAMERACONTROL_H #include "qcameracontrol.h" +#include <qtimer.h> class MockCameraControl : public QCameraControl { @@ -92,11 +93,6 @@ public: return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo; } - QCamera::LockTypes supportedLocks() const - { - return QCamera::LockExposure | QCamera::LockFocus | QCamera::LockWhiteBalance; - } - bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const { Q_UNUSED(status); @@ -108,6 +104,66 @@ public: return m_propertyChangesSupported; } + QCamera::LockTypes supportedLocks() const + { + return QCamera::LockExposure | QCamera::LockFocus; + } + + QCamera::LockStatus lockStatus(QCamera::LockType lock) const + { + switch (lock) { + case QCamera::LockExposure: + return m_exposureLock; + case QCamera::LockFocus: + return m_focusLock; + default: + return QCamera::Unlocked; + } + } + + void searchAndLock(QCamera::LockTypes locks) + { + if (locks & QCamera::LockExposure) { + QCamera::LockStatus newStatus = locks & QCamera::LockFocus ? QCamera::Searching : QCamera::Locked; + + if (newStatus != m_exposureLock) + emit lockStatusChanged(QCamera::LockExposure, + m_exposureLock = newStatus, + QCamera::UserRequest); + } + + if (locks & QCamera::LockFocus) { + emit lockStatusChanged(QCamera::LockFocus, + m_focusLock = QCamera::Searching, + QCamera::UserRequest); + + QTimer::singleShot(5, this, SLOT(focused())); + } + } + + void unlock(QCamera::LockTypes locks) { + if (locks & QCamera::LockFocus && m_focusLock != QCamera::Unlocked) { + emit lockStatusChanged(QCamera::LockFocus, + m_focusLock = QCamera::Unlocked, + QCamera::UserRequest); + } + + if (locks & QCamera::LockExposure && m_exposureLock != QCamera::Unlocked) { + emit lockStatusChanged(QCamera::LockExposure, + m_exposureLock = QCamera::Unlocked, + QCamera::UserRequest); + } + } + + /* helper method to emit the signal with LockChangeReason */ + void setLockChangeReason (QCamera::LockChangeReason lockChangeReason) + { + emit lockStatusChanged(QCamera::NoLock, + QCamera::Unlocked, + lockChangeReason); + + } + /* helper method to emit the signal error */ void setError(QCamera::Error err, QString errorString) { @@ -125,6 +181,28 @@ public: QCamera::CaptureModes m_captureMode; QCamera::Status m_status; bool m_propertyChangesSupported; + + +private slots: + void focused() + { + if (m_focusLock == QCamera::Searching) { + emit lockStatusChanged(QCamera::LockFocus, + m_focusLock = QCamera::Locked, + QCamera::UserRequest); + } + + if (m_exposureLock == QCamera::Searching) { + emit lockStatusChanged(QCamera::LockExposure, + m_exposureLock = QCamera::Locked, + QCamera::UserRequest); + } + } + + +private: + QCamera::LockStatus m_focusLock = QCamera::Unlocked; + QCamera::LockStatus m_exposureLock = QCamera::Unlocked; }; diff --git a/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h deleted file mode 100644 index a520ad055..000000000 --- a/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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 MOCKCAMERALOCKCONTROL_H -#define MOCKCAMERALOCKCONTROL_H - -#include <QTimer> -#include "qcameralockscontrol.h" - -class MockCameraLocksControl : public QCameraLocksControl -{ - Q_OBJECT -public: - MockCameraLocksControl(QObject *parent = 0): - QCameraLocksControl(parent), - m_focusLock(QCamera::Unlocked), - m_exposureLock(QCamera::Unlocked) - { - } - - ~MockCameraLocksControl() {} - - QCamera::LockTypes supportedLocks() const - { - return QCamera::LockExposure | QCamera::LockFocus; - } - - QCamera::LockStatus lockStatus(QCamera::LockType lock) const - { - switch (lock) { - case QCamera::LockExposure: - return m_exposureLock; - case QCamera::LockFocus: - return m_focusLock; - default: - return QCamera::Unlocked; - } - } - - void searchAndLock(QCamera::LockTypes locks) - { - if (locks & QCamera::LockExposure) { - QCamera::LockStatus newStatus = locks & QCamera::LockFocus ? QCamera::Searching : QCamera::Locked; - - if (newStatus != m_exposureLock) - emit lockStatusChanged(QCamera::LockExposure, - m_exposureLock = newStatus, - QCamera::UserRequest); - } - - if (locks & QCamera::LockFocus) { - emit lockStatusChanged(QCamera::LockFocus, - m_focusLock = QCamera::Searching, - QCamera::UserRequest); - - QTimer::singleShot(5, this, SLOT(focused())); - } - } - - void unlock(QCamera::LockTypes locks) { - if (locks & QCamera::LockFocus && m_focusLock != QCamera::Unlocked) { - emit lockStatusChanged(QCamera::LockFocus, - m_focusLock = QCamera::Unlocked, - QCamera::UserRequest); - } - - if (locks & QCamera::LockExposure && m_exposureLock != QCamera::Unlocked) { - emit lockStatusChanged(QCamera::LockExposure, - m_exposureLock = QCamera::Unlocked, - QCamera::UserRequest); - } - } - - /* helper method to emit the signal with LockChangeReason */ - void setLockChangeReason (QCamera::LockChangeReason lockChangeReason) - { - emit lockStatusChanged(QCamera::NoLock, - QCamera::Unlocked, - lockChangeReason); - - } - -private slots: - void focused() - { - if (m_focusLock == QCamera::Searching) { - emit lockStatusChanged(QCamera::LockFocus, - m_focusLock = QCamera::Locked, - QCamera::UserRequest); - } - - if (m_exposureLock == QCamera::Searching) { - emit lockStatusChanged(QCamera::LockExposure, - m_exposureLock = QCamera::Locked, - QCamera::UserRequest); - } - } - - -private: - QCamera::LockStatus m_focusLock; - QCamera::LockStatus m_exposureLock; -}; - - -#endif // MOCKCAMERALOCKCONTROL_H diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h index 11dcb39f1..6c1665d05 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h @@ -30,7 +30,6 @@ #define MOCKCAMERASERVICE_H #include "qmediaservice.h" -#include "../qmultimedia_common/mockcameralockscontrol.h" #include "../qmultimedia_common/mockcamerafocuscontrol.h" #include "../qmultimedia_common/mockcameraimageprocessingcontrol.h" #include "../qmultimedia_common/mockcameraimagecapturecontrol.h" @@ -79,7 +78,6 @@ public: MockCameraService(): QMediaService(0) { mockControl = new MockCameraControl(this); - mockLocksControl = new MockCameraLocksControl(this); mockExposureControl = new MockCameraExposureControl(this); mockFocusControl = new MockCameraFocusControl(this); mockCaptureControl = new MockCaptureControl(mockControl, this); @@ -103,9 +101,6 @@ public: if (qstrcmp(iid, QCameraControl_iid) == 0) return mockControl; - if (qstrcmp(iid, QCameraLocksControl_iid) == 0) - return mockLocksControl; - if (qstrcmp(iid, QCameraExposureControl_iid) == 0) return mockExposureControl; @@ -156,7 +151,6 @@ public: } MockCameraControl *mockControl; - MockCameraLocksControl *mockLocksControl; MockCaptureControl *mockCaptureControl; MockCaptureBufferFormatControl *mockCaptureBufferControl; MockCameraExposureControl *mockExposureControl; |