Merge lp:~uriboni/qtubuntu-camera/cameras-info into lp:qtubuntu-camera/staging

[Ugo Riboni]

Implement qtmultimedia APIs to query the system for available cameras, their orientation and facing and replace some hardcoded logic to calls to these APIs.

Implement qtmultimedia APIs to query the system for available cameras, their orientation and facing and replace some hardcoded logic to calls to these APIs.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/qtubuntu-camera/cameras-info]

184. By Ugo Riboni on 2016-02-17

Fix unit tests

185. By Ugo Riboni on 2016-02-17

Add useful info the human readable device description

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/20/rebuild

review: Approve (continuous-integration)

[lp:~uriboni/qtubuntu-camera/cameras-info]

186. By Ugo Riboni on 2016-02-17

Remove debug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/21/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

src/aalcameraservice.cpp
control returned by android_camera_connect_by_id() is not kept

review: Needs Fixing

[Florian Boucault (fboucault)]

src/aalcameraserviceplugin.cpp
    return (result != 0) ? QCamera::UnspecifiedPosition :
                           (facing == BACK_FACING_CAMERA_TYPE ? QCamera::BackFace :
                                                                QCamera::FrontFace);

how about using some if blocks to help readability?

review: Needs Fixing

[Florian Boucault (fboucault)]

src/aalcameraserviceplugin.cpp

    if (!ok) return 0;
[...]
    if (!ok) return QCamera::UnspecifiedPosition;

syntax rule is to always use {} for any block, even for 1 liners

review: Needs Fixing

[lp:~uriboni/qtubuntu-camera/cameras-info]

187. By Ugo Riboni on 2016-02-24

Save the AndroidControl in case there is only one camera.Style fixes

188. By Ugo Riboni on 2016-02-24

Style fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/22/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

I tested this branch and got crashes with the code samples from bug 1514253 or bug 1514250.

Ran like so: "qmlscene test.qml --desktop_file_hint=dialer-app.desktop"

#0 0xb30193a8 in ?? () from /lib/arm-linux-gnueabihf/libcrypto.so.1.0.0
#1 0xb3016ec4 in OPENSSL_cpuid_setup ()
   from /lib/arm-linux-gnueabihf/libcrypto.so.1.0.0
#2 0xb6fe280c in ?? () from /lib/ld-linux-armhf.so.3
#3 0x000243b0 in ?? ()
Backtrace stopped: previous frame identical to this frame (corrupt stack?)

[Michael Terry (mterry)]

Oh, and this was the phone:

current build number: 267
device name: mako
channel: ubuntu-touch/rc-proposed/bq-aquaris.en
last update: 2016-03-19 11:53:04
version version: 267
version ubuntu: 20160318
version device: 20160315
version custom: 20160201-5-vivid

=== added file 'src/aalcamerainfocontrol.cpp'
--- src/aalcamerainfocontrol.cpp	1970-01-01 00:00:00 +0000
+++ src/aalcamerainfocontrol.cpp	2016-02-24 14:33:23 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "aalcamerainfocontrol.h"
+
+#include <QCameraInfo>
+
+AalCameraInfoControl::AalCameraInfoControl(QObject *parent) : QCameraInfoControl(parent)
+{
+}
+
+QCamera::Position AalCameraInfoControl::cameraPosition(const QString &deviceName) const
+{
+    return QCameraInfo(deviceName.toLatin1()).position();
+}
+
+int AalCameraInfoControl::cameraOrientation(const QString &deviceName) const
+{
+    return QCameraInfo(deviceName.toLatin1()).orientation();
+}

=== added file 'src/aalcamerainfocontrol.h'
--- src/aalcamerainfocontrol.h	1970-01-01 00:00:00 +0000
+++ src/aalcamerainfocontrol.h	2016-02-24 14:33:23 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AALCAMERAINFOCONTROL_H
+#define AALCAMERAINFOCONTROL_H
+
+#include <QCameraInfoControl>
+
+class AalCameraInfoControl : public QCameraInfoControl
+{
+    Q_OBJECT
+public:
+    AalCameraInfoControl(QObject *parent = 0);
+
+    QCamera::Position cameraPosition(const QString &deviceName) const;
+    int cameraOrientation(const QString &deviceName) const;
+};
+
+#endif // AALCAMERAINFOCONTROL_H

=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2016-01-12 12:04:31 +0000
+++ src/aalcameraservice.cpp	2016-02-24 14:33:23 +0000
@@ -27,6 +27,7 @@
 #include "aalvideoencodersettingscontrol.h"
 #include "aalvideorenderercontrol.h"
 #include "aalviewfindersettingscontrol.h"
+#include "aalcamerainfocontrol.h"
 #include "storagemanager.h"
 #include "aalcameraexposurecontrol.h"
 
@@ -60,6 +61,7 @@
     m_videoOutput = new AalVideoRendererControl(this);
     m_viewfinderControl = new AalViewfinderSettingsControl(this);
     m_exposureControl = new AalCameraExposureControl(this);
+    m_infoControl = new AalCameraInfoControl(this);
 
     QGuiApplication* application = qobject_cast<QGuiApplication*>(QGuiApplication::instance());
     m_previousApplicationState = application->applicationState();
@@ -84,6 +86,7 @@
     delete m_videoOutput;
     delete m_viewfinderControl;
     delete m_exposureControl;
+    delete m_infoControl;
     if (m_androidControl)
         android_camera_delete(m_androidControl);
     delete m_storageManager;
@@ -130,6 +133,9 @@
     if (qstrcmp(name, QCameraExposureControl_iid) == 0)
         return m_exposureControl;
 
+    if (qstrcmp(name, QCameraInfoControl_iid) == 0)
+        return m_infoControl;
+
     return 0;
 }
 
@@ -153,21 +159,18 @@
     if (m_androidControl)
         return true;
 
-    CameraType device = BACK_FACING_CAMERA_TYPE;
-    if (!isBackCameraUsed())
-        device = FRONT_FACING_CAMERA_TYPE;
-
     m_androidListener = new CameraControlListener;
     memset(m_androidListener, 0, sizeof(*m_androidListener));
 
-    m_androidControl = android_camera_connect_to(device, m_androidListener);
-
-    // fallback if there is only one camera
-    if (!m_androidControl && m_deviceSelectControl->deviceCount() == 1) {
-        if (device == BACK_FACING_CAMERA_TYPE)
+    // if there is only one camera fallback directly to the ID of whatever device we have
+    if (m_deviceSelectControl->deviceCount() == 1) {
+        m_androidControl = android_camera_connect_by_id(m_deviceSelectControl->selectedDevice(), m_androidListener);
+    } else {
+        CameraType device = BACK_FACING_CAMERA_TYPE;
+        if (!isBackCameraUsed()) {
             device = FRONT_FACING_CAMERA_TYPE;
-        else
-            device = BACK_FACING_CAMERA_TYPE;
+        }
+
         m_androidControl = android_camera_connect_to(device, m_androidListener);
     }
 
@@ -232,7 +235,9 @@
 
 bool AalCameraService::isBackCameraUsed() const
 {
-    return m_deviceSelectControl->selectedDevice() == 0;
+    int deviceIndex = m_deviceSelectControl->selectedDevice();
+    QString deviceName = m_deviceSelectControl->deviceName(deviceIndex);
+    return m_infoControl->cameraPosition(deviceName) == QCamera::BackFace;
 }
 
 /*!

=== modified file 'src/aalcameraservice.h'
--- src/aalcameraservice.h	2015-12-16 11:22:04 +0000
+++ src/aalcameraservice.h	2016-02-24 14:33:23 +0000
@@ -34,6 +34,7 @@
 class AalVideoRendererControl;
 class AalViewfinderSettingsControl;
 class AalCameraExposureControl;
+class AalCameraInfoControl;
 class QCameraControl;
 
 struct CameraControl;
@@ -64,6 +65,7 @@
     AalVideoRendererControl *videoOutputControl() const { return m_videoOutput; }
     AalViewfinderSettingsControl *viewfinderControl() const { return m_viewfinderControl; }
     AalCameraExposureControl *exposureControl() const { return m_exposureControl; }
+    AalCameraInfoControl *infoControl() const { return m_infoControl; }
 
     CameraControl *androidControl();
 
@@ -110,6 +112,7 @@
     AalVideoRendererControl *m_videoOutput;
     AalViewfinderSettingsControl *m_viewfinderControl;
     AalCameraExposureControl *m_exposureControl;
+    AalCameraInfoControl *m_infoControl;
 
     CameraControl *m_androidControl;
     CameraControlListener *m_androidListener;

=== modified file 'src/aalcameraserviceplugin.cpp'
--- src/aalcameraserviceplugin.cpp	2013-03-12 16:17:37 +0000
+++ src/aalcameraserviceplugin.cpp	2016-02-24 14:33:23 +0000
@@ -21,6 +21,10 @@
 #include <QMetaType>
 #include <qgl.h>
 
+#include <hybris/camera/camera_compatibility_layer.h>
+#include <hybris/camera/camera_compatibility_layer_capabilities.h>
+
+
 AalServicePlugin::AalServicePlugin()
 {
 }
@@ -42,13 +46,75 @@
 
 QList<QByteArray> AalServicePlugin::devices(const QByteArray &service) const
 {
-    Q_UNUSED(service);
-    return QList<QByteArray>();
+    QList<QByteArray> deviceList;
+
+    if (QString::fromLatin1(service) != QLatin1String(Q_MEDIASERVICE_CAMERA)) {
+        return deviceList;
+    }
+
+    // Devices are identified in android only by their index, so we do the same
+    int cameras = android_camera_get_number_of_devices();
+    for (int deviceId = 0; deviceId < cameras; deviceId++) {
+        QString camera("%1");
+        camera = camera.arg(deviceId);
+        deviceList.append(camera.toLatin1());
+    }
+
+    return deviceList;
 }
 
 QString AalServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
 {
-    Q_UNUSED(service);
-    Q_UNUSED(device);
-    return QString();
+    if (QString::fromLatin1(service) != QLatin1String(Q_MEDIASERVICE_CAMERA)) {
+        return QString();
+    }
+
+    // Android does not provice a descriptive identifier for devices, so we just
+    // send back the index plus some useful human readable information about position.
+    bool ok;
+    int deviceID = device.toInt(&ok, 10);
+    if (!ok || deviceID >= android_camera_get_number_of_devices()) {
+        qWarning() << "Requested description for invalid device ID:" << device;
+        return QString();
+    } else {
+        QCamera::Position position = cameraPosition(device);
+        return QString("Camera %1%2").arg(QLatin1String(device))
+                                     .arg(position == QCamera::FrontFace ? " Front facing" :
+                                          (position == QCamera::BackFace ? " Back facing" : ""));
+    }
+}
+
+int AalServicePlugin::cameraOrientation(const QByteArray & device) const
+{
+    int facing;
+    int orientation;
+
+    bool ok;
+    int deviceID = device.toInt(&ok, 10);
+    if (!ok) {
+        return 0;
+    }
+
+    int result = android_camera_get_device_info(deviceID, &facing, &orientation);
+    return (result != 0) ? 0 : orientation;
+}
+
+QCamera::Position AalServicePlugin::cameraPosition(const QByteArray & device) const
+{
+    int facing;
+    int orientation;
+
+    bool ok;
+    int deviceID = device.toInt(&ok, 10);
+    if (!ok) {
+        return QCamera::UnspecifiedPosition;
+    }
+
+    int result = android_camera_get_device_info(deviceID, &facing, &orientation);
+    if (result != 0) {
+        return QCamera::UnspecifiedPosition;
+    } else {
+        return facing == BACK_FACING_CAMERA_TYPE ? QCamera::BackFace :
+                                                   QCamera::FrontFace;
+    }
 }

=== modified file 'src/aalcameraserviceplugin.h'
--- src/aalcameraserviceplugin.h	2013-02-11 15:56:21 +0000
+++ src/aalcameraserviceplugin.h	2016-02-24 14:33:23 +0000
@@ -20,10 +20,12 @@
 #include <QMediaServiceProviderPlugin>
 
 class AalServicePlugin : public QMediaServiceProviderPlugin,
-                         public QMediaServiceSupportedDevicesInterface
+                         public QMediaServiceSupportedDevicesInterface,
+                         public QMediaServiceCameraInfoInterface
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
+    Q_INTERFACES(QMediaServiceCameraInfoInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "aalcamera.json")
 
 public:
@@ -34,6 +36,8 @@
 
     QList<QByteArray> devices(const QByteArray &service) const;
     QString deviceDescription(const QByteArray &service, const QByteArray &device);
+    int cameraOrientation(const QByteArray & device) const;
+    QCamera::Position cameraPosition(const QByteArray & device) const;
 };
 
 #endif

=== modified file 'src/aalvideodeviceselectorcontrol.cpp'
--- src/aalvideodeviceselectorcontrol.cpp	2015-12-07 15:16:51 +0000
+++ src/aalvideodeviceselectorcontrol.cpp	2016-02-24 14:33:23 +0000
@@ -23,6 +23,7 @@
 
 #include <QDebug>
 #include <QtMultimedia/QCamera>
+#include <QtMultimedia/QCameraInfo>
 
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
@@ -41,28 +42,17 @@
 
 int AalVideoDeviceSelectorControl::deviceCount() const
 {
-    if (m_numberOfCameras < 0)
-        m_numberOfCameras = android_camera_get_number_of_devices();
-
-    return m_numberOfCameras;
+    return QCameraInfo::availableCameras().count();
 }
 
 QString AalVideoDeviceSelectorControl::deviceDescription(int index) const
 {
-    switch (index) {
-    case 0: return QLatin1String("Back camera");
-    case 1: return QLatin1String("Front camera");
-    default: return QLatin1String("");
-    }
+    return QCameraInfo::availableCameras().value(index).description();
 }
 
 QString AalVideoDeviceSelectorControl::deviceName(int index) const
 {
-    switch (index) {
-    case 0: return QLatin1String("Back");
-    case 1: return QLatin1String("Front");
-    default: return QLatin1String("");
-    }
+    return QCameraInfo::availableCameras().value(index).deviceName();
 }
 
 int AalVideoDeviceSelectorControl::selectedDevice() const

=== modified file 'src/src.pro'
--- src/src.pro	2015-11-12 10:32:24 +0000
+++ src/src.pro	2016-02-24 14:33:23 +0000
@@ -29,6 +29,7 @@
     aalvideoencodersettingscontrol.h \
     aalvideorenderercontrol.h \
     aalviewfindersettingscontrol.h \
+    aalcamerainfocontrol.h \
     audiocapture.h \
     aalcameraexposurecontrol.h \
     storagemanager.h
@@ -48,6 +49,7 @@
     aalvideoencodersettingscontrol.cpp \
     aalvideorenderercontrol.cpp \
     aalviewfindersettingscontrol.cpp \
+    aalcamerainfocontrol.cpp \
     audiocapture.cpp \
     aalcameraexposurecontrol.cpp \
     storagemanager.cpp

=== modified file 'unittests/aalvideodeviceselectorcontrol/aalvideodeviceselectorcontrol.pro'
--- unittests/aalvideodeviceselectorcontrol/aalvideodeviceselectorcontrol.pro	2015-12-18 15:16:06 +0000
+++ unittests/aalvideodeviceselectorcontrol/aalvideodeviceselectorcontrol.pro	2016-02-24 14:33:23 +0000
@@ -7,11 +7,13 @@
 LIBS += -L../mocks/aal -laal
 INCLUDEPATH += ../../src
 INCLUDEPATH += ../mocks/aal
+INCLUDEPATH += ../stubs/
 
 HEADERS += ../../src/aalvideodeviceselectorcontrol.h \
     ../../src/aalcameracontrol.h \
     ../../src/aalcameraservice.h \
-    ../../src/aalvideoencodersettingscontrol.h
+    ../../src/aalvideoencodersettingscontrol.h \
+    ../stubs/qcamerainfodata.h
 
 SOURCES += tst_aalvideodeviceselectorcontrol.cpp \
     ../../src/aalvideodeviceselectorcontrol.cpp \
@@ -19,7 +21,9 @@
     aalimageencodercontrol.cpp \
     aalviewfindersettingscontrol.cpp \
     ../stubs/aalcameracontrol_stub.cpp \
-    ../stubs/aalvideoencodersettingscontrol_stub.cpp
+    ../stubs/aalvideoencodersettingscontrol_stub.cpp \
+    ../stubs/qcamerainfo_stub.cpp \
+    ../stubs/qcamerainfodata.cpp
 
 check.depends = $${TARGET}
 check.commands = ./$${TARGET}

=== modified file 'unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp'
--- unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp	2014-07-31 16:44:03 +0000
+++ unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp	2016-02-24 14:33:23 +0000
@@ -21,6 +21,7 @@
 
 #define private public
 #include "aalvideodeviceselectorcontrol.h"
+#include "qcamerainfodata.h"
 
 class tst_AalVideoDeviceSelectorControl : public QObject
 {
@@ -53,6 +54,10 @@
     QSignalSpy spy(m_selectControl, SIGNAL(selectedDeviceChanged(int)));
     QSignalSpy spy2(m_selectControl, SIGNAL(selectedDeviceChanged(QString)));
 
+    QCameraInfoData::availableDevices.clear();
+    QCameraInfoData::availableDevices.append(CameraInfo("0", "Camera 0"));
+    QCameraInfoData::availableDevices.append(CameraInfo("1", "Camera 1"));
+
     m_selectControl->setSelectedDevice(1);
 
     QCOMPARE(m_selectControl->selectedDevice(), 1);

=== added file 'unittests/stubs/qcamerainfo_stub.cpp'
--- unittests/stubs/qcamerainfo_stub.cpp	1970-01-01 00:00:00 +0000
+++ unittests/stubs/qcamerainfo_stub.cpp	2016-02-24 14:33:23 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtMultimedia/QCameraInfo>
+#include "qcamerainfodata.h"
+
+class QCameraInfoPrivate {
+public:
+    QString deviceID;
+    QString description;
+    int orientation;
+    QCamera::Position position;
+};
+
+QCameraInfo::QCameraInfo(const QByteArray &name) : d(new QCameraInfoPrivate())
+{
+    QStringList info = QString::fromLatin1(name).split('|');
+    d->deviceID = info.at(0);
+    d->description = info.at(1);
+    d->orientation = info.at(2).toInt();
+    d->position = QCamera::Position(info.at(3).toInt());
+}
+
+QCameraInfo::QCameraInfo(const QCamera &camera) : d(new QCameraInfoPrivate()) {
+    Q_UNUSED(camera);
+}
+
+QCameraInfo::QCameraInfo(const QCameraInfo& other) : d(new QCameraInfoPrivate())
+{
+    d->deviceID = other.deviceName();
+    d->description = other.description();
+    d->orientation = other.orientation();
+    d->position = other.position();
+}
+QCameraInfo::~QCameraInfo() { }
+
+QCameraInfo& QCameraInfo::operator=(const QCameraInfo& other) {
+    if (this != &other) {
+        d->deviceID = other.deviceName();
+        d->description = other.description();
+        d->orientation = other.orientation();
+        d->position = other.position();
+    }
+    return *this;
+}
+bool QCameraInfo::operator==(const QCameraInfo &other) const { Q_UNUSED(other); return false; }
+
+bool QCameraInfo::isNull() const { return false; }
+
+QString QCameraInfo::deviceName() const { return d->deviceID; }
+QString QCameraInfo::description() const { return d->description; }
+QCamera::Position QCameraInfo::position() const { return d->position; }
+int QCameraInfo::orientation() const { return d->orientation; }
+
+QCameraInfo QCameraInfo::defaultCamera() { return QCameraInfo(); }
+QList<QCameraInfo> QCameraInfo::availableCameras(QCamera::Position position) {
+    Q_UNUSED(position);
+
+    QList<QCameraInfo> list;
+    Q_FOREACH(CameraInfo info, QCameraInfoData::availableDevices) {
+        QString infoString = QString("%1|%2|%3|%4").arg(info.deviceID).arg(info.description)
+                                                   .arg(info.orientation).arg(info.position);
+        QCameraInfo camera(infoString.toLatin1());
+        list.append(camera);
+    }
+
+    return list;
+}

=== added file 'unittests/stubs/qcamerainfodata.cpp'
--- unittests/stubs/qcamerainfodata.cpp	1970-01-01 00:00:00 +0000
+++ unittests/stubs/qcamerainfodata.cpp	2016-02-24 14:33:23 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qcamerainfodata.h"
+
+QList<CameraInfo> QCameraInfoData::availableDevices = QList<CameraInfo>();
+
+CameraInfo::CameraInfo(QString deviceID, QString description,
+                       int orientation, QCamera::Position position) :
+    deviceID(deviceID),
+    description(description),
+    orientation(orientation),
+    position(position)
+{
+}
+
+

=== added file 'unittests/stubs/qcamerainfodata.h'
--- unittests/stubs/qcamerainfodata.h	1970-01-01 00:00:00 +0000
+++ unittests/stubs/qcamerainfodata.h	2016-02-24 14:33:23 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QCAMERAINFODATA_H
+#define QCAMERAINFODATA_H
+
+#include <QCamera>
+
+class CameraInfo {
+public:
+    CameraInfo(QString deviceID = QString(), QString description = QString(),
+               int orientation = 0, QCamera::Position position = QCamera::UnspecifiedPosition);
+
+    QString deviceID;
+    QString description;
+    int orientation;
+    QCamera::Position position;
+};
+
+class QCameraInfoData
+{
+public:
+    static QList<CameraInfo> availableDevices;
+};
+
+#endif // QCAMERAINFODATA_H