Merge lp:~fboucault/qtubuntu-camera/hdr_scene_mode into lp:qtubuntu-camera

[Florian Boucault]

Expose scene modes through a custom QCameraExposureControl. Only relevant scene modes for now are AUTO (off) and HDR.

[Florian Boucault (fboucault)]

MR not ready for review.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/5

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/6

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/7

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Good to go apart from that we need to define a better enum value for HDR than QCameraExposure::ExposureModeVendor

Build will be green when relevant libhybris patch lands.

[Florian Boucault (fboucault)]

Patch in libhybris is at: https://code-review.phablet.ubuntu.com/#/c/291/

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/9/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/10/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/11

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

The main code looks great, I'd like to see some tests for the logic of setting the exposure mode and making sure the appropriate signals are emitted when expected.

review: Needs Fixing

[Jim Hodapp (jhodapp)]

By tests, I mean unit tests

[lp:~fboucault/qtubuntu-camera/hdr_scene_mode]

102. By Florian Boucault on 2014-07-14

Empty commit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/qtubuntu-camera/hdr_scene_mode]

103. By Florian Boucault on 2014-07-15

Fix unit test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/72/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/13/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/qtubuntu-camera/hdr_scene_mode]

104. By Florian Boucault on 2014-07-15

Properly fixed unit tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/14

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks great, thanks

review: Approve (code)

=== added file 'src/aalcameraexposurecontrol.cpp'
--- src/aalcameraexposurecontrol.cpp	1970-01-01 00:00:00 +0000
+++ src/aalcameraexposurecontrol.cpp	2014-07-15 12:39:22 +0000
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2014 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 "aalcameraexposurecontrol.h"
+#include "aalcameracontrol.h"
+#include "aalcameraservice.h"
+
+#include <hybris/camera/camera_compatibility_layer.h>
+#include <hybris/camera/camera_compatibility_layer_capabilities.h>
+
+// Definition of this enum value is duplicated in camera-app
+static const QCameraExposure::ExposureMode ExposureHdr = static_cast<QCameraExposure::ExposureMode>(QCameraExposure::ExposureModeVendor + 1);
+
+AalCameraExposureControl::AalCameraExposureControl(AalCameraService *service, QObject *parent)
+    : QCameraExposureControl(parent),
+      m_service(service),
+      m_requestedExposureMode(QCameraExposure::ExposureAuto),
+      m_actualExposureMode(QCameraExposure::ExposureAuto)
+{
+    m_androidToQtExposureModes[SCENE_MODE_AUTO] = QCameraExposure::ExposureAuto;
+    m_androidToQtExposureModes[SCENE_MODE_ACTION] = QCameraExposure::ExposureSports;
+    m_androidToQtExposureModes[SCENE_MODE_NIGHT] = QCameraExposure::ExposureNight;
+    m_androidToQtExposureModes[SCENE_MODE_PARTY] = QCameraExposure::ExposureAuto; // FIXME: no correspondance
+    m_androidToQtExposureModes[SCENE_MODE_SUNSET] = QCameraExposure::ExposureAuto; // FIXME: no correspondance
+    m_androidToQtExposureModes[SCENE_MODE_HDR] = ExposureHdr;
+}
+
+void AalCameraExposureControl::init(CameraControl *control, CameraControlListener *listener)
+{
+    Q_UNUSED(listener);
+
+    m_requestedExposureMode = QCameraExposure::ExposureAuto;
+    m_actualExposureMode = QCameraExposure::ExposureAuto;
+
+    m_supportedExposureModes.clear();
+    android_camera_enumerate_supported_scene_modes(control, &AalCameraExposureControl::supportedSceneModesCallback, this);
+
+    Q_EMIT requestedValueChanged(QCameraExposureControl::ExposureMode);
+    Q_EMIT actualValueChanged(QCameraExposureControl::ExposureMode);
+    Q_EMIT parameterRangeChanged(QCameraExposureControl::ExposureMode);
+}
+
+void AalCameraExposureControl::supportedSceneModesCallback(void *context, SceneMode sceneMode)
+{
+    AalCameraExposureControl *self = (AalCameraExposureControl*)context;
+    self->m_supportedExposureModes << QVariant::fromValue(self->m_androidToQtExposureModes[sceneMode]);
+}
+
+bool AalCameraExposureControl::setValue(ExposureParameter parameter, const QVariant& value)
+{
+    if (!value.isValid()) {
+        return false;
+    }
+
+    if (parameter == QCameraExposureControl::ExposureMode) {
+        m_requestedExposureMode = value.value<QCameraExposure::ExposureMode>();
+        Q_EMIT requestedValueChanged(QCameraExposureControl::ExposureMode);
+
+        if (m_supportedExposureModes.contains(value)) {
+            SceneMode sceneMode = m_androidToQtExposureModes.key(m_requestedExposureMode);
+            android_camera_set_scene_mode(m_service->androidControl(), sceneMode);
+            m_actualExposureMode = m_requestedExposureMode;
+            Q_EMIT actualValueChanged(QCameraExposureControl::ExposureMode);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+QVariant AalCameraExposureControl::requestedValue(ExposureParameter parameter) const
+{
+    if (parameter == QCameraExposureControl::ExposureMode) {
+        return QVariant::fromValue(m_requestedExposureMode);
+    }
+
+    return QVariant();
+}
+
+QVariant AalCameraExposureControl::actualValue(ExposureParameter parameter) const
+{
+    if (parameter == QCameraExposureControl::ExposureMode) {
+        return QVariant::fromValue(m_actualExposureMode);
+    }
+
+    return QVariant();
+}
+
+bool AalCameraExposureControl::isParameterSupported(ExposureParameter parameter) const
+{
+    switch (parameter) {
+        case QCameraExposureControl::ISO:
+            return false;
+        case QCameraExposureControl::Aperture:
+            return false;
+        case QCameraExposureControl::ShutterSpeed:
+            return false;
+        case QCameraExposureControl::ExposureCompensation:
+            return false;
+        case QCameraExposureControl::FlashPower:
+            return false;
+        case QCameraExposureControl::FlashCompensation:
+            return false;
+        case QCameraExposureControl::TorchPower:
+            return false;
+        case QCameraExposureControl::SpotMeteringPoint:
+            return false;
+        case QCameraExposureControl::ExposureMode:
+            return true;
+        case QCameraExposureControl::MeteringMode:
+            return false;
+        default:
+            return false;
+    }
+}
+
+QVariantList AalCameraExposureControl::supportedParameterRange(ExposureParameter parameter, bool *continuous) const
+{
+    if (continuous != NULL) {
+        *continuous = false;
+    }
+
+    if (parameter == QCameraExposureControl::ExposureMode) {
+        return m_supportedExposureModes;
+    }
+
+    return QVariantList();
+}

=== added file 'src/aalcameraexposurecontrol.h'
--- src/aalcameraexposurecontrol.h	1970-01-01 00:00:00 +0000
+++ src/aalcameraexposurecontrol.h	2014-07-15 12:39:22 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 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 AALCAMERAEXPOSURECONTROL_H
+#define AALCAMERAEXPOSURECONTROL_H
+
+#include <QtCore/QMap>
+#include <QCameraExposureControl>
+
+#include <hybris/camera/camera_compatibility_layer_capabilities.h>
+
+class AalCameraService;
+class CameraControl;
+class CameraControlListener;
+
+class AalCameraExposureControl : public QCameraExposureControl
+{
+    Q_OBJECT
+public:
+    explicit AalCameraExposureControl(AalCameraService *service, QObject *parent = 0);
+
+    void init(CameraControl *control, CameraControlListener *listener);
+    bool setValue(ExposureParameter parameter, const QVariant& value);
+    QVariant requestedValue(ExposureParameter parameter) const;
+    QVariant actualValue(ExposureParameter parameter) const;
+    bool isParameterSupported(ExposureParameter parameter) const;
+    QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const;
+
+    static void supportedSceneModesCallback(void *context, SceneMode sceneMode);
+
+private:
+    QMap<SceneMode, QCameraExposure::ExposureMode> m_androidToQtExposureModes;
+    AalCameraService *m_service;
+    QVariantList m_supportedExposureModes;
+    QCameraExposure::ExposureMode m_requestedExposureMode;
+    QCameraExposure::ExposureMode m_actualExposureMode;
+};
+
+#endif // AALCAMERAEXPOSURECONTROL_H

=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2013-08-01 10:41:04 +0000
+++ src/aalcameraservice.cpp	2014-07-15 12:39:22 +0000
@@ -27,6 +27,7 @@
 #include "aalvideoencodersettingscontrol.h"
 #include "aalvideorenderercontrol.h"
 #include "aalviewfindersettingscontrol.h"
+#include "aalcameraexposurecontrol.h"
 #include <storagemanager.h>
 
 #include <hybris/camera/camera_compatibility_layer.h>
@@ -56,6 +57,7 @@
     m_videoEncoderControl = new AalVideoEncoderSettingsControl(this);
     m_videoOutput = new AalVideoRendererControl(this);
     m_viewfinderControl = new AalViewfinderSettingsControl(this);
+    m_exposureControl = new AalCameraExposureControl(this);
 }
 
 AalCameraService::~AalCameraService()
@@ -74,6 +76,7 @@
     delete m_videoEncoderControl;
     delete m_videoOutput;
     delete m_viewfinderControl;
+    delete m_exposureControl;
     if (m_oldAndroidControl)
         android_camera_delete(m_oldAndroidControl);
     if (m_androidControl)
@@ -119,6 +122,9 @@
     if (qstrcmp(name, QCameraViewfinderSettingsControl_iid) == 0)
         return m_viewfinderControl;
 
+    if (qstrcmp(name, QCameraExposureControl_iid) == 0)
+        return m_exposureControl;
+
     return 0;
 }
 
@@ -285,4 +291,5 @@
         m_viewfinderControl->setAspectRatio(m_videoEncoderControl->getAspectRatio());
     m_viewfinderControl->init(camControl, listener);
     m_videoOutput->init(camControl, listener);
+    m_exposureControl->init(camControl, listener);
 }

=== modified file 'src/aalcameraservice.h'
--- src/aalcameraservice.h	2013-08-01 10:41:04 +0000
+++ src/aalcameraservice.h	2014-07-15 12:39:22 +0000
@@ -31,6 +31,7 @@
 class AalVideoEncoderSettingsControl;
 class AalVideoRendererControl;
 class AalViewfinderSettingsControl;
+class AalCameraExposureControl;
 class QCameraControl;
 
 struct CameraControl;
@@ -60,6 +61,7 @@
     AalVideoEncoderSettingsControl *videoEncoderControl() const { return m_videoEncoderControl; }
     AalVideoRendererControl *videoOutputControl() const { return m_videoOutput; }
     AalViewfinderSettingsControl *viewfinderControl() const { return m_viewfinderControl; }
+    AalCameraExposureControl *exposureControl() const { return m_exposureControl; }
 
     CameraControl *androidControl();
 
@@ -99,6 +101,7 @@
     AalVideoEncoderSettingsControl *m_videoEncoderControl;
     AalVideoRendererControl *m_videoOutput;
     AalViewfinderSettingsControl *m_viewfinderControl;
+    AalCameraExposureControl *m_exposureControl;
 
     CameraControl *m_androidControl;
     CameraControlListener *m_androidListener;

=== modified file 'src/src.pro'
--- src/src.pro	2014-01-16 14:20:08 +0000
+++ src/src.pro	2014-07-15 12:39:22 +0000
@@ -33,6 +33,7 @@
     aalvideoencodersettingscontrol.h \
     aalvideorenderercontrol.h \
     aalviewfindersettingscontrol.h \
+    aalcameraexposurecontrol.h \
     storagemanager.h
 
 SOURCES += \
@@ -50,4 +51,5 @@
     aalvideoencodersettingscontrol.cpp \
     aalvideorenderercontrol.cpp \
     aalviewfindersettingscontrol.cpp \
+    aalcameraexposurecontrol.cpp \
     storagemanager.cpp

=== added directory 'unittests/aalcameraexposurecontrol'
=== added file 'unittests/aalcameraexposurecontrol/aalcameraexposurecontrol.pro'
--- unittests/aalcameraexposurecontrol/aalcameraexposurecontrol.pro	1970-01-01 00:00:00 +0000
+++ unittests/aalcameraexposurecontrol/aalcameraexposurecontrol.pro	2014-07-15 12:39:22 +0000
@@ -0,0 +1,20 @@
+include(../../coverage.pri)
+
+TARGET = tst_aalcameraexposurecontrol
+
+QT += testlib multimedia opengl
+
+LIBS += -L../mocks/aal -laal
+INCLUDEPATH += ../../src
+INCLUDEPATH += ../mocks/aal
+
+HEADERS += ../../src/aalcameraexposurecontrol.h \
+    ../../src/aalcameraservice.h
+
+SOURCES += tst_aalcameraexposurecontrol.cpp \
+    ../../src/aalcameraexposurecontrol.cpp \
+    aalcameraservice.cpp
+
+check.depends = $${TARGET}
+check.commands = ./$${TARGET}
+QMAKE_EXTRA_TARGETS += check

=== added file 'unittests/aalcameraexposurecontrol/aalcameraservice.cpp'
--- unittests/aalcameraexposurecontrol/aalcameraservice.cpp	1970-01-01 00:00:00 +0000
+++ unittests/aalcameraexposurecontrol/aalcameraservice.cpp	2014-07-15 12:39:22 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 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 "aalcameraservice.h"
+#include "aalcameraexposurecontrol.h"
+#include "camera_control.h"
+#include "camera_compatibility_layer.h"
+
+AalCameraService *AalCameraService::m_service = 0;
+
+AalCameraService::AalCameraService(QObject *parent) :
+    QMediaService(parent),
+    m_androidControl(0),
+    m_androidListener(0)
+{
+    m_exposureControl = new AalCameraExposureControl(this);
+}
+
+AalCameraService::~AalCameraService()
+{
+    delete m_exposureControl;
+}
+
+QMediaControl *AalCameraService::requestControl(const char *name)
+{
+    Q_UNUSED(name);
+    return 0;
+}
+
+void AalCameraService::releaseControl(QMediaControl *control)
+{
+    Q_UNUSED(control);
+}
+
+CameraControl *AalCameraService::androidControl()
+{
+    return m_androidControl;
+}
+
+bool AalCameraService::connectCamera()
+{
+    m_androidListener = new CameraControlListener;
+    m_androidControl = android_camera_connect_to(BACK_FACING_CAMERA_TYPE, m_androidListener);
+
+    initControls(m_androidControl, m_androidListener);
+
+    return true;
+}
+
+void AalCameraService::disconnectCamera()
+{
+    delete m_androidListener;
+    android_camera_disconnect(m_androidControl);
+}
+
+void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
+{
+    m_exposureControl->init(camControl, listener);
+}
+
+void AalCameraService::updateCaptureReady()
+{
+}

=== added file 'unittests/aalcameraexposurecontrol/tst_aalcameraexposurecontrol.cpp'
--- unittests/aalcameraexposurecontrol/tst_aalcameraexposurecontrol.cpp	1970-01-01 00:00:00 +0000
+++ unittests/aalcameraexposurecontrol/tst_aalcameraexposurecontrol.cpp	2014-07-15 12:39:22 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2013 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 <QtTest/QtTest>
+#include <QSignalSpy>
+
+#include "aalcameraservice.h"
+
+#define private public
+#include "aalcameraexposurecontrol.h"
+
+class tst_AalCameraExposureControl : public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void setUnsupportedParameter();
+    void setExposureMode();
+
+private:
+    AalCameraExposureControl *m_exposureControl;
+    AalCameraService *m_service;
+};
+
+void tst_AalCameraExposureControl::initTestCase()
+{
+    m_service = new AalCameraService();
+    m_exposureControl = m_service->exposureControl();
+    m_service->connectCamera();
+}
+
+void tst_AalCameraExposureControl::cleanupTestCase()
+{
+    delete m_service;
+}
+
+void tst_AalCameraExposureControl::setUnsupportedParameter()
+{
+    QCameraExposureControl::ExposureParameter parameter = QCameraExposureControl::ISO;
+
+    QSignalSpy spyActual(m_exposureControl, SIGNAL(actualValueChanged(int)));
+    QSignalSpy spyRequested(m_exposureControl, SIGNAL(requestedValueChanged(int)));
+
+    bool supported = m_exposureControl->isParameterSupported(parameter);
+    bool valid = m_exposureControl->setValue(parameter, QVariant::fromValue(200));
+    QVariant requestedValue = m_exposureControl->requestedValue(parameter);
+    QVariant actualValue = m_exposureControl->actualValue(parameter);
+
+    QVERIFY(!supported);
+    QVERIFY(!valid);
+    QCOMPARE(requestedValue, QVariant());
+    QCOMPARE(actualValue, QVariant());
+
+    QCOMPARE(spyActual.count(), 0);
+    QCOMPARE(spyRequested.count(), 0);
+}
+
+void tst_AalCameraExposureControl::setExposureMode()
+{
+    QCameraExposureControl::ExposureParameter parameter = QCameraExposureControl::ExposureMode;
+
+    QSignalSpy spyActual(m_exposureControl, SIGNAL(actualValueChanged(int)));
+    QSignalSpy spyRequested(m_exposureControl, SIGNAL(requestedValueChanged(int)));
+
+    bool supported = m_exposureControl->isParameterSupported(parameter);
+    bool valid = m_exposureControl->setValue(parameter, QVariant::fromValue(QCameraExposure::ExposureSports));
+    QVariant requestedValue = m_exposureControl->requestedValue(parameter);
+    QVariant actualValue = m_exposureControl->actualValue(parameter);
+
+    QVERIFY(supported);
+    QVERIFY(valid);
+    QCOMPARE(requestedValue, QVariant::fromValue(QCameraExposure::ExposureSports));
+    QCOMPARE(actualValue, QVariant::fromValue(QCameraExposure::ExposureSports));
+
+    QCOMPARE(spyActual.count(), 1);
+    QCOMPARE(spyRequested.count(), 1);
+}
+
+QTEST_MAIN(tst_AalCameraExposureControl)
+
+#include "tst_aalcameraexposurecontrol.moc"

=== modified file 'unittests/mocks/aal/camera_compatibility_layer.cpp'
--- unittests/mocks/aal/camera_compatibility_layer.cpp	2013-06-07 08:54:10 +0000
+++ unittests/mocks/aal/camera_compatibility_layer.cpp	2014-07-15 12:39:22 +0000
@@ -16,8 +16,8 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#include <hybris/camera/camera_compatibility_layer.h>
-#include <hybris/camera/camera_compatibility_layer_capabilities.h>
+#include "camera_compatibility_layer.h"
+#include "camera_compatibility_layer_capabilities.h"
 
 #include "camera_control.h"
 
@@ -95,6 +95,14 @@
     crashTest(control);
 }
 
+void android_camera_enumerate_supported_scene_modes(CameraControl* control, scene_mode_callback cb, void* ctx)
+{
+    Q_UNUSED(cb);
+    Q_UNUSED(ctx);
+    crashTest(control);
+    cb(ctx, SCENE_MODE_ACTION);
+}
+
 void android_camera_set_scene_mode(CameraControl* control, SceneMode mode)
 {
     Q_UNUSED(mode);

=== modified file 'unittests/mocks/aal/camera_compatibility_layer_capabilities.h'
--- unittests/mocks/aal/camera_compatibility_layer_capabilities.h	2013-02-11 15:56:21 +0000
+++ unittests/mocks/aal/camera_compatibility_layer_capabilities.h	2014-07-15 12:39:22 +0000
@@ -48,7 +48,8 @@
     SCENE_MODE_ACTION,
     SCENE_MODE_NIGHT,
     SCENE_MODE_PARTY,
-    SCENE_MODE_SUNSET
+    SCENE_MODE_SUNSET,
+    SCENE_MODE_HDR
 } SceneMode;
 
 typedef enum
@@ -95,6 +96,7 @@
 } FocusRegion;
 
 typedef void (*size_callback)(void* ctx, int width, int height);
+typedef void (*scene_mode_callback)(void* ctx, SceneMode mode);
 
 // Dumps the camera parameters to stdout.
 void android_camera_dump_parameters(CameraControl* control);
@@ -115,6 +117,7 @@
 void android_camera_get_effect_mode(CameraControl* control, EffectMode* mode);
 void android_camera_get_flash_mode(CameraControl* control, FlashMode* mode);
 void android_camera_get_white_balance_mode(CameraControl* control, WhiteBalanceMode* mode);
+void android_camera_enumerate_supported_scene_modes(CameraControl* control, scene_mode_callback cb, void* ctx);
 void android_camera_get_scene_mode(CameraControl* control, SceneMode* mode);
 void android_camera_get_auto_focus_mode(CameraControl* control, AutoFocusMode* mode);
 void android_camera_get_preview_format(CameraControl* control, CameraPixelFormat* format);

=== modified file 'unittests/mocks/aal/media_recorder_layer.cpp'
--- unittests/mocks/aal/media_recorder_layer.cpp	2014-06-19 20:54:56 +0000
+++ unittests/mocks/aal/media_recorder_layer.cpp	2014-07-15 12:39:22 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-#include <hybris/media/media_recorder_layer.h>
+#include "media_recorder_layer.h"
 #include "camera_control.h"
 
 #include <qglobal.h>

=== modified file 'unittests/unittests.pro'
--- unittests/unittests.pro	2013-05-24 11:25:15 +0000
+++ unittests/unittests.pro	2014-07-15 12:39:22 +0000
@@ -3,6 +3,7 @@
 SUBDIRS += \
     mocks \
     aalcameracontrol \
+    aalcameraexposurecontrol \
     aalcameraflashcontrol \
     aalcamerafocuscontrol \
     aalcamerazoomcontrol \