New QCameraInfo class.

The class allows to get the list of available cameras on the system as
well as getting some static information about them such as their unique
ID, display name, physical position and sensor orientation.

This makes QCamera::availableDevices() and QCamera::deviceDescription()
obsolete.

This patch contains the API, documentation and auto-tests but not the
actual implementation by each backend (except for retrieving the default
camera device).

[ChangeLog][QtMultimedia] Added new QCameraInfo class
[ChangeLog][QtMultimedia] QCamera: availableDevices() and
deviceDescription() are deprecated, use QCameraInfo instead

Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
index d582ea319..6bf221c50 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
@@ -44,6 +44,8 @@
 
 #include "private/qmediaserviceprovider_p.h"
 #include "qmediaservice.h"
+#include "mockvideodeviceselectorcontrol.h"
+#include "mockcamerainfocontrol.h"
 
 // Simple provider that lets you set the service
 class MockMediaServiceProvider : public QMediaServiceProvider
@@ -67,6 +69,40 @@ public:
         }
     }
 
+    QByteArray defaultDevice(const QByteArray &serviceType) const
+    {
+        if (serviceType == Q_MEDIASERVICE_CAMERA)
+            return MockVideoDeviceSelectorControl::defaultCamera();
+
+        return QByteArray();
+    }
+
+    QList<QByteArray> devices(const QByteArray &serviceType) const
+    {
+        if (serviceType == Q_MEDIASERVICE_CAMERA)
+            return MockVideoDeviceSelectorControl::availableCameras();
+
+        return QList<QByteArray>();
+    }
+
+    QString deviceDescription(const QByteArray &serviceType, const QByteArray &device)
+    {
+        if (serviceType == Q_MEDIASERVICE_CAMERA)
+            return MockVideoDeviceSelectorControl::cameraDescription(device);
+
+        return QString();
+    }
+
+    QCamera::Position cameraPosition(const QByteArray &device) const
+    {
+        return MockCameraInfoControl::position(device);
+    }
+
+    int cameraOrientation(const QByteArray &device) const
+    {
+        return MockCameraInfoControl::orientation(device);
+    }
+
     QMediaService *service;
     bool deleteServiceOnRelease;
 };