diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-05-19 10:14:59 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-19 18:11:56 +0000 |
commit | 9f360934cb90b667ac9119ee93f67980b7b4e563 (patch) | |
tree | 753c9d78dcfc6b3739642ab3d43f7f3e31307854 /tests | |
parent | 0c40d337ae107d5ab2fde5da022c071c64c67e0e (diff) |
Remove contrast/brightness/hue/saturation properties from QCamera
Those methods are only supported on gstreamer (they don't exist
on macOS/iOS). They are probably better implemented as a
postprocessing effect anyway, so remove the from QCamera to keep
the API smaller and more manageable.
Change-Id: Ic203b3cac3384cdb0b6648366d47f6254f299197
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/unit/mockbackend/qmockcameraimageprocessing.h | 15 | ||||
-rw-r--r-- | tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp | 34 |
2 files changed, 0 insertions, 49 deletions
diff --git a/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h b/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h index 38084ccd1..3de32002a 100644 --- a/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h +++ b/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h @@ -64,9 +64,6 @@ public: { switch (parameter) { - case ContrastAdjustment: - case BrightnessAdjustment: - case SaturationAdjustment: case ColorTemperature: case WhiteBalancePreset: return true; @@ -86,15 +83,6 @@ public: void setParameter(ProcessingParameter parameter, const QVariant &value) { switch (parameter) { - case ContrastAdjustment: - m_contrast = value; - break; - case SaturationAdjustment: - m_saturation = value; - break; - case BrightnessAdjustment: - m_brightness = value; - break; case ColorTemperature: m_manualWhiteBalance = value; break; @@ -111,9 +99,6 @@ private: QCamera::WhiteBalanceMode m_whiteBalanceMode; QSet<QCamera::WhiteBalanceMode> m_supportedWhiteBalance; QVariant m_manualWhiteBalance; - QVariant m_contrast; - QVariant m_saturation; - QVariant m_brightness; }; #endif // MOCKCAMERAIMAGEPROCESSINGCONTROL_H diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index 290ed8d1f..08202be51 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -89,10 +89,6 @@ private slots: // Test cases for QPlatformCamera class. void testCameraControl(); - // Test case for image processing - void testContrast(); - void testSaturation(); - void testSetVideoOutput(); void testSetVideoOutputDestruction(); @@ -802,36 +798,6 @@ void tst_QCamera::testStatus() QVERIFY(camera.status() == QCamera::UnavailableStatus); } -void tst_QCamera::testContrast() -{ - QMediaCaptureSession session; - QCamera camera; - session.setCamera(&camera); - - QVERIFY(camera.contrast() == 0); - - camera.setContrast(0.123); - QCOMPARE(camera.contrast(), 0.123); - - camera.setContrast(4.56); - QCOMPARE(camera.contrast(), 4.56); -} - -void tst_QCamera::testSaturation() -{ - QMediaCaptureSession session; - QCamera camera; - session.setCamera(&camera); - - QCOMPARE(camera.saturation()+1.0, 1.0); - - camera.setSaturation(0.5); - QCOMPARE(camera.saturation(), 0.5); - - camera.setSaturation(-0.5); - QCOMPARE(camera.saturation(), -0.5); -} - //Added this code to cover QCamera::FocusModeHyperfocal and QCamera::FocusModeAutoNear //As the FocusModeHyperfocal and FocusModeAutoNear are not supported we can not set the focus mode to these Focus Modes void tst_QCamera::testFocusMode() |