Merge QCameraCaptureDestinationControl into QImageCaptureControl

Change-Id: Idb30411d7474fb2fe9581aa94535c1638d71161c
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

14 files changed, 28 insertions, 122 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index c49236f43..25b529610 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -42,7 +42,6 @@
 #include <qimageencodercontrol.h>
 #include <qcameraimageprocessingcontrol.h>
 #include <qcameracapturebufferformatcontrol.h>
-#include <qcameracapturedestinationcontrol.h>
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcamerainfo.h>
@@ -384,16 +383,8 @@ void tst_QCameraBackend::testCaptureToBuffer()
 
     camera.load();
 
-    if (!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer))
-        QSKIP("Buffer capture not supported");
-
     QTRY_COMPARE(camera.status(), QCamera::LoadedStatus);
 
-    QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToFile));
-    QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer));
-    QVERIFY(imageCapture.isCaptureDestinationSupported(
-                QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile));
-
     QSignalSpy destinationChangedSignal(&imageCapture, SIGNAL(captureDestinationChanged(QCameraImageCapture::CaptureDestinations)));
 
     QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToFile);
@@ -466,28 +457,26 @@ void tst_QCameraBackend::testCaptureToBuffer()
     QTRY_VERIFY(imageCapture.isReadyForCapture());
 
     //Try to capture to both buffer and file
-    if (imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile)) {
-        imageCapture.setCaptureDestination(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile);
+    imageCapture.setCaptureDestination(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile);
 
-        int oldId = id;
-        id = imageCapture.capture();
-        QVERIFY(id != oldId);
-        QTRY_VERIFY(!savedSignal.isEmpty());
+    int oldId = id;
+    id = imageCapture.capture();
+    QVERIFY(id != oldId);
+    QTRY_VERIFY(!savedSignal.isEmpty());
 
-        QVERIFY(errorSignal.isEmpty());
-        QVERIFY(!capturedSignal.isEmpty());
-        QVERIFY(!imageAvailableSignal.isEmpty());
-        QVERIFY(!savedSignal.isEmpty());
+    QVERIFY(errorSignal.isEmpty());
+    QVERIFY(!capturedSignal.isEmpty());
+    QVERIFY(!imageAvailableSignal.isEmpty());
+    QVERIFY(!savedSignal.isEmpty());
 
-        QCOMPARE(capturedSignal.first().first().toInt(), id);
-        QCOMPARE(imageAvailableSignal.first().first().toInt(), id);
+    QCOMPARE(capturedSignal.first().first().toInt(), id);
+    QCOMPARE(imageAvailableSignal.first().first().toInt(), id);
 
-        frame = imageAvailableSignal.first().last().value<QVideoFrame>();
-        QVERIFY(!frame.image().isNull());
+    frame = imageAvailableSignal.first().last().value<QVideoFrame>();
+    QVERIFY(!frame.image().isNull());
 
-        QString fileName = savedSignal.first().last().toString();
-        QVERIFY(QFileInfo(fileName).exists());
-    }
+    QString fileName = savedSignal.first().last().toString();
+    QVERIFY(QFileInfo(fileName).exists());
 }
 
 void tst_QCameraBackend::testCameraCaptureMetadata()
diff --git a/tests/auto/unit/qcamera/CMakeLists.txt b/tests/auto/unit/qcamera/CMakeLists.txt
index 6eecf7997..24c00fe45 100644
--- a/tests/auto/unit/qcamera/CMakeLists.txt
+++ b/tests/auto/unit/qcamera/CMakeLists.txt
@@ -7,7 +7,6 @@
 qt_add_test(tst_qcamera
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp
index dd4efc5b7..40a5ca483 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@ -41,7 +41,6 @@
 #include <qimageencodercontrol.h>
 #include <qcameraimageprocessingcontrol.h>
 #include <qcameracapturebufferformatcontrol.h>
-#include <qcameracapturedestinationcontrol.h>
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcamerainfo.h>
@@ -370,11 +369,6 @@ void tst_QCamera::testSimpleCaptureDestination()
     QCamera camera;
     QCameraImageCapture imageCapture(&camera);
 
-    QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToFile));
-    QVERIFY(!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer));
-    QVERIFY(!imageCapture.isCaptureDestinationSupported(
-                QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile));
-
     QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToFile);
     imageCapture.setCaptureDestination(QCameraImageCapture::CaptureToBuffer);
     QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToFile);
@@ -398,11 +392,6 @@ void tst_QCamera::testCaptureDestination()
     QCamera camera;
     QCameraImageCapture imageCapture(&camera);
 
-    QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToFile));
-    QVERIFY(imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer));
-    QVERIFY(!imageCapture.isCaptureDestinationSupported(
-                QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile));
-
     QSignalSpy destinationChangedSignal(&imageCapture, SIGNAL(captureDestinationChanged(QCameraImageCapture::CaptureDestinations)));
 
     QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToFile);
@@ -412,10 +401,9 @@ void tst_QCamera::testCaptureDestination()
     QCOMPARE(destinationChangedSignal.first().first().value<QCameraImageCapture::CaptureDestinations>(),
              QCameraImageCapture::CaptureToBuffer);
 
-    //not supported combination
     imageCapture.setCaptureDestination(QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile);
-    QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToBuffer);
-    QCOMPARE(destinationChangedSignal.size(), 1);
+    QCOMPARE(imageCapture.captureDestination(), QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile);
+    QCOMPARE(destinationChangedSignal.size(), 2);
 }
 
 void tst_QCamera::testCaptureFormat()
diff --git a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt
index 247768b9d..33236798d 100644
--- a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt
+++ b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt
@@ -7,7 +7,6 @@
 qt_add_test(tst_qcameraimagecapture
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qcamerainfo/CMakeLists.txt b/tests/auto/unit/qcamerainfo/CMakeLists.txt
index b2ddf0c4f..2472f5dc8 100644
--- a/tests/auto/unit/qcamerainfo/CMakeLists.txt
+++ b/tests/auto/unit/qcamerainfo/CMakeLists.txt
@@ -7,7 +7,6 @@
 qt_add_test(tst_qcamerainfo
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qcameraviewfinder/CMakeLists.txt b/tests/auto/unit/qcameraviewfinder/CMakeLists.txt
index 93422349a..a7bd7d078 100644
--- a/tests/auto/unit/qcameraviewfinder/CMakeLists.txt
+++ b/tests/auto/unit/qcameraviewfinder/CMakeLists.txt
@@ -7,7 +7,6 @@
 qt_add_test(tst_qcameraviewfinder
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qcamerawidgets/CMakeLists.txt b/tests/auto/unit/qcamerawidgets/CMakeLists.txt
index c217a0f96..46d501e57 100644
--- a/tests/auto/unit/qcamerawidgets/CMakeLists.txt
+++ b/tests/auto/unit/qcamerawidgets/CMakeLists.txt
@@ -7,7 +7,6 @@
 qt_add_test(tst_qcamerawidgets
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp
index 648c6a408..7f560bd2d 100644
--- a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -41,7 +41,6 @@
 #include <qimageencodercontrol.h>
 #include <qcameraimageprocessingcontrol.h>
 #include <qcameracapturebufferformatcontrol.h>
-#include <qcameracapturedestinationcontrol.h>
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcameraimagecapture.h>
diff --git a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt
index b2d070182..8cf41da77 100644
--- a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt
+++ b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt
@@ -9,7 +9,6 @@ qt_add_test(tst_qdeclarativecamera
     QMLTEST
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt
index 4dd73b6b3..a12975ce5 100644
--- a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt
+++ b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt
@@ -9,7 +9,6 @@ qt_add_test(tst_qdeclarativemultimediaglobal
     QMLTEST
     SOURCES
         ../qmultimedia_common/mockcameracapturebuffercontrol.h
-        ../qmultimedia_common/mockcameracapturedestinationcontrol.h
         ../qmultimedia_common/mockcameracontrol.h
         ../qmultimedia_common/mockcameraexposurecontrol.h
         ../qmultimedia_common/mockcameraflashcontrol.h
diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri
index 2c59aa8c5..58825b521 100644
--- a/tests/auto/unit/qmultimedia_common/mockcamera.pri
+++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri
@@ -13,7 +13,6 @@ HEADERS *= \
     ../qmultimedia_common/mockcameraimageprocessingcontrol.h \
     ../qmultimedia_common/mockcameraimagecapturecontrol.h \
     ../qmultimedia_common/mockcameraexposurecontrol.h \
-    ../qmultimedia_common/mockcameracapturedestinationcontrol.h \
     ../qmultimedia_common/mockcameracapturebuffercontrol.h \
     ../qmultimedia_common/mockimageencodercontrol.h \
     ../qmultimedia_common/mockcameracontrol.h \
diff --git a/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
deleted file mode 100644
index adec9ea81..000000000
--- a/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
+++ /dev/null
@@ -1,67 +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 MOCKCAMERACAPTUREDESTINATIONCONTROL_H
-#define MOCKCAMERACAPTUREDESTINATIONCONTROL_H
-
-#include <QtMultimedia/qcameracapturedestinationcontrol.h>
-
-class MockCaptureDestinationControl : public QCameraCaptureDestinationControl
-{
-    Q_OBJECT
-public:
-    MockCaptureDestinationControl(QObject *parent = 0):
-            QCameraCaptureDestinationControl(parent),
-            m_destination(QCameraImageCapture::CaptureToFile)
-    {
-    }
-
-    bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const
-    {
-        return destination == QCameraImageCapture::CaptureToBuffer ||
-               destination == QCameraImageCapture::CaptureToFile;
-    }
-
-    QCameraImageCapture::CaptureDestinations captureDestination() const
-    {
-        return m_destination;
-    }
-
-    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination)
-    {
-        if (isCaptureDestinationSupported(destination) && destination != m_destination) {
-            m_destination = destination;
-            emit captureDestinationChanged(m_destination);
-        }
-    }
-
-private:
-    QCameraImageCapture::CaptureDestinations m_destination;
-};
-
-#endif // MOCKCAMERACAPTUREDESTINATIONCONTROL_H
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
index 6aa793a24..f3203ee23 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
@@ -76,6 +76,16 @@ public:
         m_captureCanceled = true;
     }
 
+    QCameraImageCapture::CaptureDestinations captureDestination() const
+    {
+        return m_destination;
+    }
+
+    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination)
+    {
+        m_destination = destination;
+    }
+
 private Q_SLOTS:
     void captured()
     {
@@ -113,6 +123,7 @@ private:
     int m_captureRequest;
     bool m_ready;
     bool m_captureCanceled;
+    QCameraImageCapture::CaptureDestinations m_destination;
 };
 
 #endif // MOCKCAMERACAPTURECONTROL_H
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
index 432e04d81..d6d571cea 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
@@ -37,7 +37,6 @@
 #include "../qmultimedia_common/mockcameraimageprocessingcontrol.h"
 #include "../qmultimedia_common/mockcameraimagecapturecontrol.h"
 #include "../qmultimedia_common/mockcameraexposurecontrol.h"
-#include "../qmultimedia_common/mockcameracapturedestinationcontrol.h"
 #include "../qmultimedia_common/mockcameracapturebuffercontrol.h"
 #include "../qmultimedia_common/mockimageencodercontrol.h"
 #include "../qmultimedia_common/mockcameracontrol.h"
@@ -89,7 +88,6 @@ public:
         mockZoomControl = new MockCameraZoomControl(this);
         mockCaptureControl = new MockCaptureControl(mockControl, this);
         mockCaptureBufferControl = new MockCaptureBufferFormatControl(this);
-        mockCaptureDestinationControl = new MockCaptureDestinationControl(this);
         mockImageProcessingControl = new MockImageProcessingControl(this);
         mockImageEncoderControl = new MockImageEncoderControl(this);
         rendererControl = new MockVideoRendererControl(this);
@@ -130,9 +128,6 @@ public:
         if (qstrcmp(iid, QCameraCaptureBufferFormatControl_iid) == 0)
             return mockCaptureBufferControl;
 
-        if (qstrcmp(iid, QCameraCaptureDestinationControl_iid) == 0)
-            return mockCaptureDestinationControl;
-
         if (qstrcmp(iid, QCameraImageProcessingControl_iid) == 0)
             return mockImageProcessingControl;
 
@@ -174,7 +169,6 @@ public:
     MockCameraLocksControl *mockLocksControl;
     MockCaptureControl *mockCaptureControl;
     MockCaptureBufferFormatControl *mockCaptureBufferControl;
-    MockCaptureDestinationControl *mockCaptureDestinationControl;
     MockCameraExposureControl *mockExposureControl;
     MockCameraFlashControl *mockFlashControl;
     MockCameraFocusControl *mockFocusControl;