Merge lp:~uriboni/qtubuntu-camera/performance-improvements into lp:qtubuntu-camera/staging

[Ugo Riboni]

Performance improvements to minimize the time necessary between when pressing the shutter button and being able to capture the next pitcure. Remove sliding out the preview as a part of this.

Performance improvements to minimize the time necessary between when pressing the shutter button and being able to capture the next pitcure. Remove sliding out the preview as a part of this.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Attempt to merge into lp:qtubuntu-camera/staging failed due to conflicts:

text conflict in src/aalimagecapturecontrol.cpp
text conflict in src/aalimagecapturecontrol.h
deleting parent in unittests/aalimagecapturecontrol
unversioned parent in unittests/aalimagecapturecontrol
contents conflict in unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp

[lp:~uriboni/qtubuntu-camera/performance-improvements]

192. By Ugo Riboni on 2016-02-11

Remove debug

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'aalCamera.pro'
--- aalCamera.pro	2015-11-12 10:32:24 +0000
+++ aalCamera.pro	2016-02-11 15:33:06 +0000
@@ -5,5 +5,4 @@
 SUBDIRS += \
     src \
     unittests
-
 OTHER_FILES += .qmake.conf

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2016-01-11 15:10:38 +0000
+++ src/aalimagecapturecontrol.cpp	2016-02-11 15:33:06 +0000
@@ -19,13 +19,14 @@
 #include "aalimageencodercontrol.h"
 #include "aalmetadatawritercontrol.h"
 #include "aalvideorenderercontrol.h"
+#include "aalviewfindersettingscontrol.h"
 #include "storagemanager.h"
 
 #include <hybris/camera/camera_compatibility_layer.h>
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
-#include <exiv2/exiv2.hpp>
 
 #include <QDir>
+#include <QObject>
 #include <QFile>
 #include <QFileInfo>
 #include <QMediaPlayer>
@@ -34,8 +35,7 @@
 #include <QGuiApplication>
 #include <QScreen>
 #include <QSettings>
-
-#include <cmath>
+#include <QtConcurrent/QtConcurrent>
 
 AalImageCaptureControl::AalImageCaptureControl(AalCameraService *service, QObject *parent)
    : QCameraImageCaptureControl(parent),
@@ -43,7 +43,7 @@
     m_cameraControl(service->cameraControl()),
     m_lastRequestId(0),
     m_ready(false),
-    m_pendingCaptureFile(),
+    m_targetFileName(),
     m_captureCancelled(false),
     m_screenAspectRatio(0.0),
     m_audioPlayer(new QMediaPlayer(this))
@@ -55,6 +55,9 @@
 #else
     m_audioPlayer->setAudioRole(QAudio::NotificationRole);
 #endif
+
+    QObject::connect(&m_storageManager, &StorageManager::previewReady,
+                     this, &AalImageCaptureControl::imageCaptured);
 }
 
 AalImageCaptureControl::~AalImageCaptureControl()
@@ -76,58 +79,24 @@
         return m_lastRequestId;
     }
 
+    m_targetFileName = fileName;
     m_captureCancelled = false;
-    QFileInfo fi(fileName);
-    if (fileName.isEmpty() || fi.isDir()) {
-        m_pendingCaptureFile = m_storageManager.nextPhotoFileName(fileName);
-    } else {
-        m_pendingCaptureFile = fileName;
-    }
-    bool diskOk = m_storageManager.checkDirectory(m_pendingCaptureFile);
-    if (!diskOk) {
-        emit error(m_lastRequestId, QCameraImageCapture::ResourceError,
-                   QString("Won't be able to save file %1 to disk").arg(m_pendingCaptureFile));
-        return m_lastRequestId;
-    }
 
     AalMetaDataWriterControl* metadataControl = m_service->metadataWriterControl();
-
     int rotation = metadataControl->correctedOrientation();
     android_camera_set_rotation(m_service->androidControl(), rotation);
 
-    QStringList availableMetadata = metadataControl->availableMetaData();
-    if (availableMetadata.contains("GPSLatitude") &&
-        availableMetadata.contains("GPSLongitude") &&
-        availableMetadata.contains("GPSTimeStamp")) {
-        float latitude = metadataControl->metaData("GPSLatitude").toFloat();
-        float longitude = metadataControl->metaData("GPSLongitude").toFloat();
-        float altitude = 0.0f;
-        if (availableMetadata.contains("GPSAltitude")) {
-            altitude = metadataControl->metaData("GPSAltitude").toFloat();
-        }
-        QDateTime timestamp = metadataControl->metaData("GPSTimeStamp").toDateTime();
-        QString processingMethod = metadataControl->metaData("GPSProcessingMethod").toString();
-        android_camera_set_location(m_service->androidControl(),
-                                    &latitude, &longitude, &altitude,
-                                    timestamp.toTime_t(),
-                                    processingMethod.toLocal8Bit().constData());
-    }
-
     android_camera_take_snapshot(m_service->androidControl());
 
     m_service->updateCaptureReady();
 
-    m_service->videoOutputControl()->createPreview();
-
-    m_service->metadataWriterControl()->clearAllMetaData();
-
     return m_lastRequestId;
 }
 
 void AalImageCaptureControl::cancelCapture()
 {
     m_captureCancelled = true;
-    m_pendingCaptureFile.clear();
+    m_targetFileName.clear();
 }
 
 void AalImageCaptureControl::shutterCB(void *context)
@@ -140,7 +109,14 @@
 void AalImageCaptureControl::saveJpegCB(void *data, uint32_t data_size, void *context)
 {
     Q_UNUSED(context);
-    AalCameraService::instance()->imageCaptureControl()->saveJpeg(data, data_size);
+
+    // Copy the data buffer so that it is safe to pass it off to another thread,
+    // since it will be destroyed once this function returns
+    QByteArray dataCopy((const char*)data, data_size);
+
+    QMetaObject::invokeMethod(AalCameraService::instance()->imageCaptureControl(),
+                              "saveJpeg", Qt::QueuedConnection,
+                              Q_ARG(QByteArray, dataCopy));
 }
 
 void AalImageCaptureControl::init(CameraControl *control, CameraControlListener *listener)
@@ -153,12 +129,6 @@
     connect(m_service->videoOutputControl(), SIGNAL(previewReady()), this, SLOT(onPreviewReady()));
 }
 
-void AalImageCaptureControl::onPreviewReady()
-{
-    // The preview image was fully captured, notify the UI layer
-    Q_EMIT imageCaptured(m_lastRequestId, m_service->videoOutputControl()->preview());
-}
-
 void AalImageCaptureControl::setReady(bool ready)
 {
     if (m_ready != ready) {
@@ -169,7 +139,7 @@
 
 bool AalImageCaptureControl::isCaptureRunning() const
 {
-    return !m_pendingCaptureFile.isNull();
+    return !m_targetFileName.isEmpty();
 }
 
 void AalImageCaptureControl::shutter()
@@ -181,96 +151,56 @@
     Q_EMIT imageExposed(m_lastRequestId);
 }
 
-bool AalImageCaptureControl::updateJpegMetadata(void* data, uint32_t dataSize, QTemporaryFile* destination)
-{
-    if (data == 0 || destination == 0) return false;
-
-    Exiv2::Image::AutoPtr image;
-    try {
-        image = Exiv2::ImageFactory::open(static_cast<Exiv2::byte*>(data), dataSize);
-        if (!image.get()) {
-            return false;
-        }
-    } catch(const Exiv2::AnyError&) {
-        return false;
-    }
-
-    try {
-        image->readMetadata();
-        Exiv2::ExifData ed = image->exifData();
-        const QString now = QDateTime::currentDateTime().toString("yyyy:MM:dd HH:mm:ss");
-        ed["Exif.Photo.DateTimeOriginal"].setValue(now.toStdString());
-        ed["Exif.Photo.DateTimeDigitized"].setValue(now.toStdString());
-        image->setExifData(ed);
-        image->writeMetadata();
-    } catch(const Exiv2::AnyError&) {
-        return false;
-    }
-
-    if (!destination->open()) {
-        return false;
-    }
-
-    try {
-        Exiv2::BasicIo& io = image->io();
-        char* modifiedMetadata = reinterpret_cast<char*>(io.mmap());
-        const long size = io.size();
-        const qint64 writtenSize = destination->write(modifiedMetadata, size);
-        io.munmap();
-        destination->close();
-        return (writtenSize == size);
-
-    } catch(const Exiv2::AnyError&) {
-        destination->close();
-        return false;
-    }
-}
-
-void AalImageCaptureControl::saveJpeg(void *data, uint32_t dataSize)
+void AalImageCaptureControl::saveJpeg(const QByteArray& data)
 {
     if (m_captureCancelled) {
         m_captureCancelled = false;
         return;
     }
 
-    if (m_pendingCaptureFile.isNull() || !m_service->androidControl())
-        return;
-
-    QTemporaryFile file;
-    if (!updateJpegMetadata(data, dataSize, &file)) {
-        qWarning() << "Failed to update EXIF timestamps. Picture will be saved as UTC timezone.";
-        if (!file.open()) {
-            emit error(m_lastRequestId, QCameraImageCapture::ResourceError,
-                       QString("Could not open temprary file %1").arg(file.fileName()));
-            m_pendingCaptureFile.clear();
-            m_service->updateCaptureReady();
-            return;
-        }
-
-        const qint64 writtenSize = file.write(static_cast<const char*>(data), dataSize);
-        file.close();
-        if (writtenSize != dataSize) {
-            emit error(m_lastRequestId, QCameraImageCapture::ResourceError,
-                       QString("Could not write file %1").arg(file.fileName()));
-            m_pendingCaptureFile.clear();
-            m_service->updateCaptureReady();
-            return;
-        }
-    }
-
-    QFile finalFile(file.fileName());
-    bool ok = finalFile.rename(m_pendingCaptureFile);
-    if (!ok) {
-        emit error(m_lastRequestId, QCameraImageCapture::ResourceError,
-                   QString("Could not save image to %1").arg(m_pendingCaptureFile));
-        m_pendingCaptureFile.clear();
-        m_service->updateCaptureReady();
-        return;
-    }
-
-    Q_EMIT imageSaved(m_lastRequestId, m_pendingCaptureFile);
-    m_pendingCaptureFile.clear();
-
-    android_camera_start_preview(m_service->androidControl());
+    // Copy the metadata so that we can clear its container
+    QVariantMap metadata;
+    AalMetaDataWriterControl* metadataControl = m_service->metadataWriterControl();
+    Q_FOREACH(QString key, metadataControl->availableMetaData()) {
+        metadata.insert(key, metadataControl->metaData(key));
+    }
+    m_service->metadataWriterControl()->clearAllMetaData();
+
+    QString fileName = m_targetFileName;
+    m_targetFileName.clear();
+
+    AalViewfinderSettingsControl* viewfinder = m_service->viewfinderControl();
+    QSize resolution = viewfinder->viewfinderParameter(QCameraViewfinderSettingsControl::Resolution).toSize();
+
+    // Restart the viewfinder and notify that the camera is ready to capture again
+    if (m_service->androidControl()) {
+        android_camera_start_preview(m_service->androidControl());
+    }
     m_service->updateCaptureReady();
+
+    DiskWriteWatcher* watcher = new DiskWriteWatcher(this);
+    QObject::connect(watcher, &QFutureWatcher<QString>::finished, this, &AalImageCaptureControl::onImageFileSaved);
+    m_pendingSaveOperations.insert(watcher, m_lastRequestId);
+
+    QFuture<SaveToDiskResult> future = QtConcurrent::run(&m_storageManager, &StorageManager::saveJpegImage,
+                                                         data, metadata, fileName, resolution, m_lastRequestId);
+    watcher->setFuture(future);
+}
+
+void AalImageCaptureControl::onImageFileSaved()
+{
+    DiskWriteWatcher* watcher = static_cast<DiskWriteWatcher*>(sender());
+
+    if (m_pendingSaveOperations.contains(watcher)) {
+        int requestID = m_pendingSaveOperations.take(watcher);
+
+        SaveToDiskResult result = watcher->result();
+        delete watcher;
+
+        if (result.success) {
+            Q_EMIT imageSaved(requestID, result.fileName);
+        } else {
+            Q_EMIT error(requestID, QCameraImageCapture::ResourceError, result.errorMessage);
+        }
+    }
 }

=== modified file 'src/aalimagecapturecontrol.h'
--- src/aalimagecapturecontrol.h	2016-01-11 15:10:38 +0000
+++ src/aalimagecapturecontrol.h	2016-02-11 15:33:06 +0000
@@ -20,7 +20,7 @@
 #include <QCameraImageCaptureControl>
 #include <QSettings>
 #include <QString>
-#include <QTemporaryFile>
+#include <QFutureWatcher>
 #include <storagemanager.h>
 
 #include <stdint.h>
@@ -31,6 +31,8 @@
 class CameraControlListener;
 class QMediaPlayer;
 
+typedef QFutureWatcher<SaveToDiskResult> DiskWriteWatcher;
+
 class AalImageCaptureControl : public QCameraImageCaptureControl
 {
 Q_OBJECT
@@ -55,13 +57,13 @@
 
 public Q_SLOTS:
     void init(CameraControl *control, CameraControlListener *listener);
-    void onPreviewReady();
+    void onImageFileSaved();
 
 private Q_SLOTS:
     void shutter();
+    void saveJpeg(const QByteArray& data);
 
 private:
-    void saveJpeg(void* data, uint32_t dataSize);
     bool updateJpegMetadata(void* data, uint32_t dataSize, QTemporaryFile* destination);
 
     AalCameraService *m_service;
@@ -69,7 +71,7 @@
     int m_lastRequestId;
     StorageManager m_storageManager;
     bool m_ready;
-    QString m_pendingCaptureFile;
+    QString m_targetFileName;
     bool m_captureCancelled;
     float m_screenAspectRatio;
     /// Maintains a list of highest priority aspect ratio to lowest, for the
@@ -78,6 +80,8 @@
     QString m_galleryPath;
     QMediaPlayer *m_audioPlayer;
     QSettings m_settings;
+
+    QMap<DiskWriteWatcher*, int> m_pendingSaveOperations;
 };
 
 #endif

=== modified file 'src/storagemanager.cpp'
--- src/storagemanager.cpp	2014-09-10 19:48:00 +0000
+++ src/storagemanager.cpp	2016-02-11 15:33:06 +0000
@@ -15,12 +15,18 @@
  */
 
 #include "storagemanager.h"
+
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 #include <QStandardPaths>
 #include <QCoreApplication>
+#include <QBuffer>
+#include <QImageReader>
+
+#include <exiv2/exiv2.hpp>
+#include <cmath>
 
 const QLatin1String photoBase = QLatin1String("image");
 const QLatin1String videoBase = QLatin1String("video");
@@ -28,7 +34,7 @@
 const QLatin1String videoExtension = QLatin1String("mp4");
 const QLatin1String dateFormat = QLatin1String("yyyyMMdd_HHmmsszzz");
 
-StorageManager::StorageManager()
+StorageManager::StorageManager(QObject* parent) : QObject(parent)
 {
 }
 
@@ -87,3 +93,169 @@
             .arg(date)
             .arg(extension);
 }
+
+bool StorageManager::updateJpegMetadata(QByteArray data, QVariantMap metadata, QTemporaryFile* destination)
+{
+    if (data.isEmpty() || destination == 0) return false;
+
+    Exiv2::Image::AutoPtr image;
+    try {
+        image = Exiv2::ImageFactory::open(static_cast<const Exiv2::byte*>((const unsigned char*)data.constData()), data.size());
+        if (!image.get()) {
+            return false;
+        }
+    } catch(const Exiv2::AnyError&) {
+        return false;
+    }
+
+    try {
+        image->readMetadata();
+        Exiv2::ExifData ed = image->exifData();
+        const QString now = QDateTime::currentDateTime().toString("yyyy:MM:dd HH:mm:ss");
+        ed["Exif.Photo.DateTimeOriginal"].setValue(now.toStdString());
+        ed["Exif.Photo.DateTimeDigitized"].setValue(now.toStdString());
+
+        if (metadata.contains("GPSLatitude") &&
+            metadata.contains("GPSLongitude") &&
+            metadata.contains("GPSTimeStamp")) {
+
+            // Write all GPS metadata according to version 2.2 of the EXIF spec,
+            // which is what Android did. See: http://www.exiv2.org/Exif2-2.PDF
+            const char version[4] = {2, 2, 0, 0};
+            Exiv2::DataValue versionValue(Exiv2::unsignedByte);
+            versionValue.read((const Exiv2::byte*)version, 4);
+            ed.add(Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), &versionValue);
+
+            // According to the spec, the GPS processing method is a buffer of type Undefined, which
+            // does not need to be zero terminated. It should be prepended by an 8 byte, zero padded
+            // string specifying the encoding.
+            const char methodHeader[8] = {'A', 'S', 'C', 'I', 'I', 0, 0, 0};
+            QByteArray method = metadata.value("GPSProcessingMethod").toString().toLatin1();
+            method.prepend(methodHeader, 8);
+            Exiv2::DataValue methodValue(Exiv2::undefined);
+            methodValue.read((const Exiv2::byte*)method.constData(), method.size());
+            ed.add(Exiv2::ExifKey("Exif.GPSInfo.GPSProcessingMethod"), &methodValue);
+
+            double latitude = metadata.value("GPSLatitude").toDouble();
+            ed["Exif.GPSInfo.GPSLatitude"] = decimalToExifRational(latitude).toStdString();
+            ed["Exif.GPSInfo.GPSLatitudeRef"] = (latitude < 0 ) ? "S" : "N";
+
+            double longitude = metadata.value("GPSLongitude").toDouble();
+            ed["Exif.GPSInfo.GPSLongitude"] = decimalToExifRational(longitude).toStdString();
+            ed["Exif.GPSInfo.GPSLongitudeRef"] = (longitude < 0 ) ? "W" : "E";
+
+            if (metadata.contains("GPSAltitude")) {
+                // Assume altitude precision to the meter
+                unsigned int altitude = floor(metadata.value("GPSAltitude").toDouble());
+                Exiv2::URationalValue::AutoPtr altitudeValue(new Exiv2::URationalValue);
+                altitudeValue->value_.push_back(std::make_pair(altitude,1));
+                ed.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitude"), altitudeValue.get());
+
+                // Byte field of lenght 1. Value of 0 means the reference is sea level.
+                const char reference = 0;
+                Exiv2::DataValue referenceValue(Exiv2::unsignedByte);
+                referenceValue.read((const Exiv2::byte*) &reference, 1);
+                ed.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"), &referenceValue);
+            }
+
+            QDateTime stamp = metadata.value("GPSTimeStamp").toDateTime();
+            ed["Exif.GPSInfo.GPSTimeStamp"] = stamp.toString("HH/1 mm/1 ss/1").toStdString();
+            ed["Exif.GPSInfo.GPSDateStamp"] = stamp.toString("yyyy:MM:dd").toStdString();
+        }
+
+        image->setExifData(ed);
+        image->writeMetadata();
+    } catch(const Exiv2::AnyError&) {
+        return false;
+    }
+
+    if (!destination->open()) {
+        return false;
+    }
+
+    try {
+        Exiv2::BasicIo& io = image->io();
+        char* modifiedMetadata = reinterpret_cast<char*>(io.mmap());
+        const long size = io.size();
+        const qint64 writtenSize = destination->write(modifiedMetadata, size);
+        io.munmap();
+        destination->close();
+        return (writtenSize == size);
+
+    } catch(const Exiv2::AnyError&) {
+        destination->close();
+        return false;
+    }
+}
+
+SaveToDiskResult StorageManager::saveJpegImage(QByteArray data, QVariantMap metadata, QString fileName,
+                                               QSize previewResolution, int captureID)
+{
+    SaveToDiskResult result;
+
+    QString captureFile;
+    QFileInfo fi(fileName);
+    if (fileName.isEmpty() || fi.isDir()) {
+        captureFile = nextPhotoFileName(fileName);
+    } else {
+        captureFile = fileName;
+    }
+    result.fileName = captureFile;
+
+    bool diskOk = checkDirectory(captureFile);
+    if (!diskOk) {
+        result.errorMessage = QString("Won't be able to save file %1 to disk").arg(captureFile);
+        return result;
+    }
+
+    QBuffer buffer(&data);
+    QImageReader reader(&buffer, "jpg");
+
+    QSize scaledSize = reader.size(); // fast, as it does not decode the JPEG
+    scaledSize.scale(previewResolution, Qt::KeepAspectRatio);
+    reader.setScaledSize(scaledSize);
+    reader.setQuality(25);
+    QImage image = reader.read();
+    Q_EMIT previewReady(captureID, image);
+
+    QTemporaryFile file;
+    if (!updateJpegMetadata(data, metadata, &file)) {
+        qWarning() << "Failed to update EXIF timestamps. Picture will be saved as UTC timezone.";
+        if (!file.open()) {
+            result.errorMessage = QString("Could not open temprary file %1").arg(file.fileName());
+            return result;
+        }
+
+        const qint64 writtenSize = file.write(data);
+        file.close();
+        if (writtenSize != data.size()) {
+            result.errorMessage = QString("Could not write file %1").arg(fileName);
+            return result;
+        }
+    }
+
+    QFile finalFile(file.fileName());
+    bool ok = finalFile.rename(captureFile);
+    if (!ok) {
+        result.errorMessage = QString("Could not save image to %1").arg(fileName);
+        return result;
+    }
+
+    result.success = true;
+    return result;
+}
+
+QString StorageManager::decimalToExifRational(double decimal)
+{
+    decimal = fabs(decimal);
+    unsigned int degrees = floor(decimal);
+    unsigned int minutes = floor((decimal - degrees) * 60);
+    double seconds = (decimal - degrees - minutes / 60) * 3600;
+    seconds = floor(seconds * 100);
+
+    return QString("%1/1 %2/1 %3/100").arg(degrees).arg(minutes).arg(seconds);
+}
+
+SaveToDiskResult::SaveToDiskResult() : success(false)
+{
+}

=== modified file 'src/storagemanager.h'
--- src/storagemanager.h	2014-09-10 19:48:00 +0000
+++ src/storagemanager.h	2016-02-11 15:33:06 +0000
@@ -18,19 +18,43 @@
 #define STORAGEMANAGER_H
 
 #include <QString>
-
-class StorageManager
-{
-public:
-    StorageManager();
+#include <QVariantMap>
+#include <QByteArray>
+#include <QTemporaryFile>
+#include <QImage>
+
+class SaveToDiskResult
+{
+public:
+    SaveToDiskResult();
+    bool success;
+    QString fileName;
+    QString errorMessage;
+};
+
+class StorageManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit StorageManager(QObject* parent = 0);
 
     QString nextPhotoFileName(const QString &directoy = QString());
     QString nextVideoFileName(const QString &directoy = QString());
 
     bool checkDirectory(const QString &path) const;
 
+    SaveToDiskResult saveJpegImage(QByteArray data, QVariantMap metadata,
+                                   QString fileName, QSize previewResolution,
+                                   int captureID);
+
+Q_SIGNALS:
+    void previewReady(int captureID, QImage image);
+
 private:
     QString fileNameGenerator(const QString &base, const QString &extension);
+    bool updateJpegMetadata(QByteArray data, QVariantMap metadata, QTemporaryFile* destination);
+    QString decimalToExifRational(double decimal);
 
     QString m_directory;
 };

=== modified file 'unittests/aalcamerafocuscontrol/aalcamerafocuscontrol.pro'
--- unittests/aalcamerafocuscontrol/aalcamerafocuscontrol.pro	2014-01-16 14:20:08 +0000
+++ unittests/aalcamerafocuscontrol/aalcamerafocuscontrol.pro	2016-02-11 15:33:06 +0000
@@ -10,10 +10,12 @@
 
 HEADERS += ../../src/aalcamerafocuscontrol.h \
     ../../src/aalcameraservice.h \
-    ../../src/aalimagecapturecontrol.h
+    ../../src/aalimagecapturecontrol.h \
+    ../../src/storagemanager.h
 
 SOURCES += tst_aalcamerafocuscontrol.cpp \
     ../../src/aalcamerafocuscontrol.cpp \
+    storagemanager.cpp \
     aalcameraservice.cpp \
     aalimagecapturecontrol.cpp
 

=== modified file 'unittests/aalcamerafocuscontrol/aalimagecapturecontrol.cpp'
--- unittests/aalcamerafocuscontrol/aalimagecapturecontrol.cpp	2013-06-05 16:11:12 +0000
+++ unittests/aalcamerafocuscontrol/aalimagecapturecontrol.cpp	2016-02-11 15:33:06 +0000
@@ -19,10 +19,6 @@
 #include <hybris/camera/camera_compatibility_layer.h>
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
-StorageManager::StorageManager()
-{
-}
-
 AalImageCaptureControl::AalImageCaptureControl(AalCameraService *service, QObject *parent)
     : QCameraImageCaptureControl(parent)
 {
@@ -54,10 +50,6 @@
     Q_UNUSED(listener);
 }
 
-void AalImageCaptureControl::onPreviewReady()
-{
-}
-
 void AalImageCaptureControl::setReady(bool ready)
 {
     Q_UNUSED(ready);
@@ -66,3 +58,13 @@
 void AalImageCaptureControl::shutter()
 {
 }
+
+void AalImageCaptureControl::onImageFileSaved()
+{
+}
+
+void AalImageCaptureControl::saveJpeg(const QByteArray& data)
+{
+    Q_UNUSED(data);
+}
+

=== removed directory 'unittests/aalimagecapturecontrol'
=== removed file 'unittests/aalimagecapturecontrol/aalcameraservice.cpp'
--- unittests/aalimagecapturecontrol/aalcameraservice.cpp	2015-12-07 15:16:51 +0000
+++ unittests/aalimagecapturecontrol/aalcameraservice.cpp	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * 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"
-
-AalCameraService *AalCameraService::m_service = 0;
-
-AalCameraService::AalCameraService(QObject *parent) :
-    QMediaService(parent),
-    m_androidControl(0),
-    m_androidListener(0)
-{
-}
-
-AalCameraService::~AalCameraService()
-{
-}
-
-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()
-{
-    return true;
-}
-
-void AalCameraService::disconnectCamera()
-{
-}
-
-void AalCameraService::startPreview()
-{
-}
-
-void AalCameraService::stopPreview()
-{
-}
-
-bool AalCameraService::isPreviewStarted() const
-{
-    return true;
-}
-
-void AalCameraService::onApplicationStateChanged()
-{
-}
-
-void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
-{
-    Q_UNUSED(camControl);
-    Q_UNUSED(listener);
-}
-
-bool AalCameraService::isCameraActive() const
-{
-    return true;
-}
-
-bool AalCameraService::isBackCameraUsed() const
-{
-    return true;
-}
-
-void AalCameraService::updateCaptureReady()
-{
-}
-
-QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
-{
-    Q_UNUSED(sizes);
-    Q_UNUSED(targetAspectRatio);
-    return QSize();
-}

=== removed file 'unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro'
--- unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro	2014-09-23 18:12:45 +0000
+++ unittests/aalimagecapturecontrol/aalimagecapturecontrol.pro	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-include(../../coverage.pri)
-
-TARGET = tst_aalimagecapturecontrol
-
-QT += testlib multimedia opengl
-
-LIBS += -L../mocks/aal -laal
-INCLUDEPATH += ../../src
-INCLUDEPATH += ../mocks/aal
-
-CONFIG += link_pkgconfig
-PKGCONFIG += exiv2
-
-HEADERS += ../../src/aalimagecapturecontrol.h \
-    ../../src/aalcameraservice.h \
-    ../../src/aalimageencodercontrol.h \
-    ../../src/aalmetadatawritercontrol.h \
-    ../../src/aalvideorenderercontrol.h \
-    ../../src/storagemanager.h
-
-SOURCES += tst_aalimagecapturecontrol.cpp \
-    ../../src/aalimagecapturecontrol.cpp \
-    aalcameraservice.cpp \
-    aalimageencodercontrol.cpp \
-    ../stubs/aalmetadatawritercontrol_stub.cpp \
-    aalvideorenderercontrol.cpp \
-    storagemanager.cpp
-
-check.depends = $${TARGET}
-check.commands = ./$${TARGET}
-QMAKE_EXTRA_TARGETS += check

=== removed file 'unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp'
--- unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp	2015-10-14 21:22:46 +0000
+++ unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2013-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 <QImageEncoderControl>
-#include <QList>
-#include <QString>
-#include <QStringList>
-
-#include <QDebug>
-
-#include "aalimageencodercontrol.h"
-
-AalImageEncoderControl::AalImageEncoderControl(AalCameraService *service, QObject *parent)
-    : QImageEncoderControl(parent),
-      m_service(service),
-      m_currentSize()
-{
-}
-
-AalImageEncoderControl::~AalImageEncoderControl()
-{
-}
-
-QString AalImageEncoderControl::imageCodecDescription(const QString &codec) const
-{
-    Q_UNUSED(codec);
-    return QString();
-}
-
-QImageEncoderSettings AalImageEncoderControl::imageSettings() const
-{
-    return QImageEncoderSettings();
-}
-
-void AalImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings)
-{
-    Q_UNUSED(settings);
-}
-
-QStringList AalImageEncoderControl::supportedImageCodecs() const
-{
-    return QStringList();
-}
-
-QList<QSize> AalImageEncoderControl::supportedResolutions(const QImageEncoderSettings &settings, bool *continuous) const
-{
-    Q_UNUSED(settings);
-    Q_UNUSED(continuous);
-
-    return QList<QSize>();
-}
-
-QList<QSize> AalImageEncoderControl::supportedThumbnailResolutions(const QImageEncoderSettings &settings, bool *continuous) const
-{
-    Q_UNUSED(settings);
-    Q_UNUSED(continuous);
-
-    return QList<QSize>();
-}
-
-void AalImageEncoderControl::init(CameraControl *control)
-{
-    Q_UNUSED(control);
-}
-
-bool AalImageEncoderControl::setSize(const QSize &size)
-{
-    Q_UNUSED(size);
-    return true;
-}
-
-void AalImageEncoderControl::resetAllSettings()
-{
-}
-
-void AalImageEncoderControl::getPictureSizeCb(void *ctx, int width, int height)
-{
-    Q_UNUSED(ctx);
-    Q_UNUSED(width);
-    Q_UNUSED(height);
-}
-
-void AalImageEncoderControl::getPictureSize(int width, int height)
-{
-    Q_UNUSED(width);
-    Q_UNUSED(height);
-}
-
-void AalImageEncoderControl::getThumbnailSizeCb(void *ctx, int width, int height)
-{
-    Q_UNUSED(ctx);
-    Q_UNUSED(width);
-    Q_UNUSED(height);
-}
-
-void AalImageEncoderControl::getThumbnailSize(int width, int height)
-{
-    Q_UNUSED(width);
-    Q_UNUSED(height);
-}
-
-QMultimedia::EncodingQuality AalImageEncoderControl::jpegQualityToQtEncodingQuality(int jpegQuality)
-{
-    Q_UNUSED(jpegQuality)
-    return QMultimedia::NormalQuality;
-}
-
-int AalImageEncoderControl::qtEncodingQualityToJpegQuality(QMultimedia::EncodingQuality quality)
-{
-    Q_UNUSED(quality)
-    return 100;
-}

=== removed file 'unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp'
--- unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp	2015-12-07 15:16:51 +0000
+++ unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * 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 "aalvideorenderercontrol.h"
-#include "aalcameraservice.h"
-
-
-AalVideoRendererControl::AalVideoRendererControl(AalCameraService *service, QObject *parent)
-   : QVideoRendererControl(parent)
-   , m_surface(0),
-     m_service(service),
-     m_viewFinderRunning(false),
-     m_textureId(0)
-{
-}
-
-AalVideoRendererControl::~AalVideoRendererControl()
-{
-}
-
-QAbstractVideoSurface *AalVideoRendererControl::surface() const
-{
-    return m_surface;
-}
-
-void AalVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
-{
-    Q_UNUSED(surface);
-}
-
-void AalVideoRendererControl::init(CameraControl *control, CameraControlListener *listener)
-{
-    Q_UNUSED(control);
-    Q_UNUSED(listener);
-}
-
-void AalVideoRendererControl::startPreview()
-{
-}
-
-void AalVideoRendererControl::stopPreview()
-{
-}
-
-bool AalVideoRendererControl::isPreviewStarted() const
-{
-    return true;
-}
-
-void AalVideoRendererControl::updateViewfinderFrame()
-{
-}
-
-void AalVideoRendererControl::onTextureCreated(unsigned int textureID)
-{
-    Q_UNUSED(textureID);
-}
-
-void AalVideoRendererControl::onSnapshotTaken(QImage snapshotImage)
-{
-    Q_UNUSED(snapshotImage);
-}
-
-const QImage &AalVideoRendererControl::preview() const
-{
-    return m_preview;
-}
-
-void AalVideoRendererControl::createPreview()
-{
-}

=== removed file 'unittests/aalimagecapturecontrol/storagemanager.cpp'
--- unittests/aalimagecapturecontrol/storagemanager.cpp	2014-09-10 19:48:00 +0000
+++ unittests/aalimagecapturecontrol/storagemanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * 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 <QDebug>
-#include <QString>
-
-#include "storagemanager.h"
-
-StorageManager::StorageManager()
-{
-}
-
-QString StorageManager::nextPhotoFileName(const QString &directory)
-{
-    Q_UNUSED(directory);
-    return QString();
-}
-
-QString StorageManager::nextVideoFileName(const QString &directory)
-{
-    Q_UNUSED(directory);
-    return QString();
-}
-
-bool StorageManager::checkDirectory(const QString &path) const
-{
-    Q_UNUSED(path);
-    return true;
-}
-
-QString StorageManager::fileNameGenerator(const QString &base,
-                                          const QString& extension)
-{
-    Q_UNUSED(base);
-    Q_UNUSED(extension);
-    return QString();
-}

=== removed file 'unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp'
--- unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp	2015-10-14 21:22:46 +0000
+++ unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * 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 <cmath>
-
-#include "aalcameraservice.h"
-#include "data_validjpeg.h"
-#include "data_noexifjpeg.h"
-
-#define private public
-#include "aalimagecapturecontrol.h"
-
-class tst_AalImageCaptureControl : public QObject
-{
-    Q_OBJECT
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-    void updateEXIF();
-
-private:
-    AalImageCaptureControl *m_icControl;
-    AalCameraService *m_service;
-
-    friend class AalImageCaptureControl;
-};
-
-void tst_AalImageCaptureControl::initTestCase()
-{
-    m_service = new AalCameraService();
-    m_icControl = new AalImageCaptureControl(m_service);
-}
-
-void tst_AalImageCaptureControl::cleanupTestCase()
-{
-    delete m_icControl;
-    delete m_service;
-}
-
-void tst_AalImageCaptureControl::updateEXIF()
-{
-    bool result;
-    QTemporaryFile tmp;
-    char *invalidJPEG = "INVALID_IMAGE";
-    result = m_icControl->updateJpegMetadata(0, 0, &tmp);
-    QCOMPARE(result, false);
-    result = m_icControl->updateJpegMetadata(invalidJPEG, strlen(invalidJPEG), 0);
-    QCOMPARE(result, false);
-    result = m_icControl->updateJpegMetadata(invalidJPEG, strlen(invalidJPEG), &tmp);
-    QCOMPARE(result, false);
-    result = m_icControl->updateJpegMetadata(data_validjpeg, data_validjpeg_len, &tmp);
-    QCOMPARE(result, true);
-    result = m_icControl->updateJpegMetadata(data_noexifjpeg, data_noexifjpeg_len, &tmp);
-    QCOMPARE(result, true);
-}
-
-QTEST_GUILESS_MAIN(tst_AalImageCaptureControl)
-
-#include "tst_aalimagecapturecontrol.moc"

=== renamed file 'unittests/aalimagecapturecontrol/data_noexifjpeg.h' => 'unittests/storagemanager/data_noexifjpeg.h'
=== renamed file 'unittests/aalimagecapturecontrol/data_validjpeg.h' => 'unittests/storagemanager/data_validjpeg.h'
=== modified file 'unittests/storagemanager/storagemanager.pro'
--- unittests/storagemanager/storagemanager.pro	2013-06-13 19:13:27 +0000
+++ unittests/storagemanager/storagemanager.pro	2016-02-11 15:33:06 +0000
@@ -4,6 +4,11 @@
 
 QT += testlib
 
+CONFIG += link_pkgconfig
+PKGCONFIG += exiv2
+
+HEADERS += ../../src/storagemanager.h
+
 SOURCES += tst_storagemanager.cpp \
     ../../src/storagemanager.cpp
 

=== modified file 'unittests/storagemanager/tst_storagemanager.cpp'
--- unittests/storagemanager/tst_storagemanager.cpp	2014-09-10 19:48:00 +0000
+++ unittests/storagemanager/tst_storagemanager.cpp	2016-02-11 15:33:06 +0000
@@ -22,6 +22,8 @@
 
 #define private public
 #include "storagemanager.h"
+#include "data_validjpeg.h"
+#include "data_noexifjpeg.h"
 
 const QLatin1String testPath("/tmp/aalCameraStorageManagerUnitTestDirectory0192837465/");
 
@@ -34,6 +36,7 @@
     void checkDirectory();
     void fileNameGenerator_data();
     void fileNameGenerator();
+    void updateEXIF();
 
 private:
     void removeTestDirectory();
@@ -112,6 +115,25 @@
         dir.rmdir(testPath);
 }
 
+void tst_StorageManager::updateEXIF()
+{
+    StorageManager storage;
+    bool result;
+    QTemporaryFile tmp;
+    QVariantMap metadata;
+    QByteArray invalidJPEG("INVALID_IMAGE");
+    result = storage.updateJpegMetadata(invalidJPEG, metadata, &tmp);
+    QCOMPARE(result, false);
+    result = storage.updateJpegMetadata(invalidJPEG, metadata, 0);
+    QCOMPARE(result, false);
+    result = storage.updateJpegMetadata(invalidJPEG, metadata, &tmp);
+    QCOMPARE(result, false);
+    result = storage.updateJpegMetadata(QByteArray((char*)data_validjpeg, data_validjpeg_len), metadata, &tmp);
+    QCOMPARE(result, true);
+    result = storage.updateJpegMetadata(QByteArray((char*)data_noexifjpeg, data_noexifjpeg_len), metadata, &tmp);
+    QCOMPARE(result, true);
+}
+
 QTEST_GUILESS_MAIN(tst_StorageManager);
 
 #include "tst_storagemanager.moc"

=== modified file 'unittests/stubs/storagemanager_stub.cpp'
--- unittests/stubs/storagemanager_stub.cpp	2014-09-10 19:48:00 +0000
+++ unittests/stubs/storagemanager_stub.cpp	2016-02-11 15:33:06 +0000
@@ -19,8 +19,9 @@
 
 #include "storagemanager.h"
 
-StorageManager::StorageManager()
+StorageManager::StorageManager(QObject* parent)
 {
+    Q_UNUSED(parent);
 }
 
 QString StorageManager::nextPhotoFileName(const QString &directory)

=== modified file 'unittests/unittests.pro'
--- unittests/unittests.pro	2014-07-14 16:18:14 +0000
+++ unittests/unittests.pro	2016-02-11 15:33:06 +0000
@@ -7,7 +7,6 @@
     aalcameraflashcontrol \
     aalcamerafocuscontrol \
     aalcamerazoomcontrol \
-    aalimagecapturecontrol \
     aalmediarecordercontrol \
     aalvideodeviceselectorcontrol \
     aalviewfindersettingscontrol \