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

[Florian Boucault]

Make it possible to set resolution at application startup by not
starting the viewfinder the first time the camera state is set to Unloaded.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/23/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/120/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/24/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/25/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/123/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/27/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/28/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/29/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/29

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

164. By Florian Boucault on 2015-11-25

Merged with staging

Unmerged revisions

=== added file '.qmake.conf'
--- .qmake.conf	1970-01-01 00:00:00 +0000
+++ .qmake.conf	2015-11-17 15:24:47 +0000
@@ -0,0 +1,5 @@
+PKG_CONFIG_ARCH = $$section(QMAKE_CC, -, 0, -2)
+!isEmpty (PKG_CONFIG_ARCH) {
+  PKG_CONFIG = $$PKG_CONFIG_ARCH-pkg-config
+}
+
 
=== modified file 'aalCamera.pro'
--- aalCamera.pro	2012-11-01 14:51:08 +0000
+++ aalCamera.pro	2015-11-17 15:24:47 +0000
@@ -5,3 +5,5 @@
 SUBDIRS += \
     src \
     unittests
+
+OTHER_FILES += .qmake.conf
 
=== modified file 'src/aalcameracontrol.cpp'
--- src/aalcameracontrol.cpp	2013-07-26 16:46:16 +0000
+++ src/aalcameracontrol.cpp	2015-11-17 15:24:47 +0000
@@ -42,14 +42,25 @@
     if (m_state == state)
         return;
 
-    if (m_state == QCamera::ActiveState) {
-        m_service->disconnectCamera();
-    } else {
+    if (state == QCamera::ActiveState) {
         bool ok = m_service->connectCamera();
         if (!ok) {
             Q_EMIT error(QCamera::CameraError, QLatin1String("Unable to connect to camera"));
             return;
         }
+        m_service->startPreview();
+    } else if (state == QCamera::LoadedState) {
+        if (m_state == QCamera::UnloadedState) {
+            bool ok = m_service->connectCamera();
+            if (!ok) {
+                Q_EMIT error(QCamera::CameraError, QLatin1String("Unable to connect to camera"));
+                return;
+            }
+        } else {
+            m_service->disconnectCamera();
+        }
+    } else if (state == QCamera::UnloadedState) {
+        m_service->disconnectCamera();
     }
 
     m_state = state;
@@ -106,9 +117,7 @@
 
 void AalCameraControl::handleError()
 {
-    setState(QCamera::LoadedState);
     Q_EMIT error(QCamera::CameraError, QLatin1String("Unknown error in camera"));
-    setState(QCamera::ActiveState);
 }
 
 void AalCameraControl::errorCB(void *context)
 
=== modified file 'src/aalcamerafocuscontrol.cpp'
--- src/aalcamerafocuscontrol.cpp	2015-04-09 17:54:55 +0000
+++ src/aalcamerafocuscontrol.cpp	2015-11-17 15:24:47 +0000
@@ -100,6 +100,7 @@
         return;
 
     m_focusRunning = false;
+    m_service->updateCaptureReady();
     AutoFocusMode focusMode = qt2Android(mode);
     m_focusMode = mode;
     if (m_service->androidControl()) {
@@ -154,6 +155,7 @@
     AutoFocusMode mode = qt2Android(m_focusMode);
     android_camera_set_auto_focus_mode(control, mode);
     m_focusRunning = false;
+    m_service->updateCaptureReady();
 }
 
 void AalCameraFocusControl::startFocus()
 
=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2015-01-28 14:11:53 +0000
+++ src/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -33,6 +33,7 @@
 #include <hybris/camera/camera_compatibility_layer.h>
 
 #include <QDebug>
+#include <cmath>
 
 AalCameraService *AalCameraService::m_service = 0;
 
@@ -171,16 +172,13 @@
 
     m_androidListener->context = m_androidControl;
     initControls(m_androidControl, m_androidListener);
-    m_videoOutput->startPreview();
 
     return true;
 }
 
 void AalCameraService::disconnectCamera()
 {
-    if (m_service->videoOutputControl()) {
-        m_service->videoOutputControl()->stopPreview();
-    }
+    stopPreview();
 
     if (m_androidControl) {
         android_camera_disconnect(m_androidControl);
@@ -193,6 +191,20 @@
     }
 }
 
+void AalCameraService::startPreview()
+{
+    if (m_videoOutput) {
+        m_videoOutput->startPreview();
+    }
+}
+
+void AalCameraService::stopPreview()
+{
+    if (m_videoOutput) {
+        m_videoOutput->stopPreview();
+    }
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return m_cameraControl->state() == QCamera::ActiveState;
@@ -211,7 +223,7 @@
     m_imageEncoderControl->enablePhotoMode();
     m_focusControl->enablePhotoMode();
     m_zoomControl->enablePhotoMode();
-    m_viewfinderControl->setAspectRatio(m_imageCaptureControl->getAspectRatio());
+    m_viewfinderControl->setAspectRatio(m_imageEncoderControl->getAspectRatio());
 }
 
 /*!
@@ -225,15 +237,6 @@
 }
 
 /*!
- * \brief AalCameraService::isReady return if the camera is ready for capturing
- * \return
- */
-bool AalCameraService::isReady() const
-{
-    return m_imageCaptureControl->isReadyForCapture();
-}
-
-/*!
  * \brief AalCameraService::isRecording returns true is a video recording is
  * currently ongoing
  * \return
@@ -268,17 +271,37 @@
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     m_cameraControl->init(camControl, listener);
+    m_videoOutput->init(camControl, listener);
+    m_viewfinderControl->init(camControl, listener);
     m_imageEncoderControl->init(camControl);
     m_imageCaptureControl->init(camControl, listener);
     m_flashControl->init(camControl);
     m_focusControl->init(camControl, listener);
     m_zoomControl->init(camControl, listener);
     m_videoEncoderControl->init(camControl, listener);
-    if (m_cameraControl->captureMode() == QCamera::CaptureStillImage)
-        m_viewfinderControl->setAspectRatio(m_imageCaptureControl->getAspectRatio());
-    else
-        m_viewfinderControl->setAspectRatio(m_videoEncoderControl->getAspectRatio());
-    m_viewfinderControl->init(camControl, listener);
-    m_videoOutput->init(camControl, listener);
     m_exposureControl->init(camControl, listener);
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    QSize selectedSize;
+    long selectedPixelCount = 0;
+    const float EPSILON = 0.02;
+
+    if (!sizes.empty()) {
+        // Loop over all sizes until we find the highest one that matches targetAspectRatio.
+        QList<QSize>::const_iterator it = sizes.begin();
+        while (it != sizes.end()) {
+            QSize size = *it;
+            const float aspectRatio = (float)size.width() / (float)size.height();
+            const long pixelCount = (long)size.width() * (long)size.height();
+            if (fabs(aspectRatio - targetAspectRatio) < EPSILON && pixelCount > selectedPixelCount) {
+                selectedSize = size;
+                selectedPixelCount = pixelCount;
+            }
+            ++it;
+        }
+    }
+
+    return selectedSize;
+}
 
=== modified file 'src/aalcameraservice.h'
--- src/aalcameraservice.h	2014-07-30 19:35:51 +0000
+++ src/aalcameraservice.h	2015-11-17 15:24:47 +0000
@@ -18,6 +18,7 @@
 #define AALCAMERASERVICE_H
 
 #include <QMediaService>
+#include <QSize>
 
 class AalCameraControl;
 class AalCameraFlashControl;
@@ -69,6 +70,8 @@
 
     bool connectCamera();
     void disconnectCamera();
+    void startPreview();
+    void stopPreview();
 
     bool isCameraActive() const;
     bool isBackCameraUsed() const;
@@ -76,8 +79,8 @@
     void enablePhotoMode();
     void enableVideoMode();
 
-    bool isReady() const;
     bool isRecording() const;
+    QSize selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const;
 
     static AalCameraService *instance() { return m_service; }
 
 
=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2015-07-06 18:22:43 +0000
+++ src/aalimagecapturecontrol.cpp	2015-11-17 15:24:47 +0000
@@ -43,9 +43,6 @@
     m_lastRequestId(0),
     m_ready(false),
     m_pendingCaptureFile(),
-    m_photoWidth(320),
-    m_photoHeight(240),
-    m_aspectRatio(0.0),
     m_screenAspectRatio(0.0),
     m_audioPlayer(new QMediaPlayer(this))
 {
@@ -141,36 +138,6 @@
 {
     Q_UNUSED(control);
 
-    // Set the optimal image resolution that will be used by the camera
-    QImageEncoderSettings settings;
-    AalImageEncoderControl *imageEncoderControl = AalCameraService::instance()->imageEncoderControl();
-    float imageAspectRatio = 0.0, thumbnailAspectRatio = 0.0;
-    if (!imageEncoderControl->supportedResolutions(settings).empty()) {
-        const QSize s = chooseOptimalSize(imageEncoderControl->supportedResolutions(settings));
-        imageAspectRatio = (float)s.width() / (float)s.height();
-        qDebug() << "Setting image resolution: " << s;
-        qDebug() << "Image aspect ratio: " << imageAspectRatio;
-        imageEncoderControl->setSize(s);
-    }
-    else
-        qWarning() << "No supported resolutions detected for currently selected camera device." << endl;
-
-    // Set the optimal thumbnail image resolution that will be saved to the JPEG file
-    if (!imageEncoderControl->supportedThumbnailResolutions(settings).empty()) {
-        const QSize s = chooseOptimalSize(imageEncoderControl->supportedThumbnailResolutions(settings), false);
-        thumbnailAspectRatio = (float)s.width() / (float)s.height();
-        qDebug() << "Setting thumbnail resolution: " << s;
-        qDebug() << "Thumbnail aspect ratio: " << thumbnailAspectRatio;
-        imageEncoderControl->setThumbnailSize(s);
-    }
-    else
-        qWarning() << "No supported resolutions detected for currently selected camera device." << endl;
-
-    // Thumbnails will appear squashed or stretched if not the same aspect ratio as the original image.
-    // This will most likely be an incorrect size list supplied to qtubuntu-camera from the camera driver.
-    if (imageAspectRatio != thumbnailAspectRatio)
-        qWarning() << "** The image and thumbnail aspect ratios are not equal. Thumbnails will display wrong!";
-
     listener->on_msg_shutter_cb = &AalImageCaptureControl::shutterCB;
     listener->on_data_compressed_image_cb = &AalImageCaptureControl::saveJpegCB;
 
@@ -196,102 +163,12 @@
     return !m_pendingCaptureFile.isNull();
 }
 
-float AalImageCaptureControl::getAspectRatio() const
-{
-    return m_aspectRatio;
-}
-
 void AalImageCaptureControl::shutter()
 {
     m_audioPlayer->play();
     Q_EMIT imageExposed(m_lastRequestId);
 }
 
-QSize AalImageCaptureControl::chooseOptimalSize(const QList<QSize> &sizes, bool updateAspectRatio)
-{
-    QSize optimalSize;
-    long optimalPixels = 0;
-
-    if (!sizes.empty()) {
-        getPriorityAspectRatios();
-        float aspectRatio = m_prioritizedAspectRatios.front();
-        if (updateAspectRatio)
-            m_aspectRatio = aspectRatio;
-
-        // Loop over all reported camera resolutions until we find the highest
-        // one that matches the current prioritized aspect ratio. If it doesn't
-        // find one on the current aspect ration, it selects the next ratio and
-        // tries again.
-        QList<float>::const_iterator ratioIt = m_prioritizedAspectRatios.begin();
-        while (ratioIt != m_prioritizedAspectRatios.end()) {
-            // Don't update the aspect ratio when using this function for finding
-            // the optimal thumbnail size as it will affect the preview window size
-            if (updateAspectRatio)
-                m_aspectRatio = (*ratioIt);
-            else
-                aspectRatio = (*ratioIt);
-
-            QList<QSize>::const_iterator it = sizes.begin();
-            while (it != sizes.end()) {
-                const float ratio = (float)(*it).width() / (float)(*it).height();
-                const long pixels = ((long)((*it).width())) * ((long)((*it).height()));
-                const float EPSILON = 10e-3;
-                if (fabs(ratio - aspectRatio) < EPSILON && pixels > optimalPixels) {
-                    optimalSize = *it;
-                    optimalPixels = pixels;
-                }
-                ++it;
-            }
-            if (optimalPixels > 0) break;
-            ++ratioIt;
-        }
-    }
-
-    return optimalSize;
-}
-
-float AalImageCaptureControl::getScreenAspectRatio()
-{
-    // Only get the screen aspect ratio once, otherwise use the cached copy
-    if (m_screenAspectRatio == 0.0) {
-        // Get screen resolution.
-        QScreen *screen = QGuiApplication::primaryScreen();
-        Q_ASSERT(!screen);
-        const int kScreenWidth = screen->geometry().width();
-        const int kScreenHeight = screen->geometry().height();
-        Q_ASSERT(kScreenWidth > 0 && kScreenHeight > 0);
-
-        m_screenAspectRatio = (kScreenWidth > kScreenHeight) ?
-            ((float)kScreenWidth / (float)kScreenHeight) : ((float)kScreenHeight / (float)kScreenWidth);
-    }
-
-    return m_screenAspectRatio;
-}
-
-void AalImageCaptureControl::getPriorityAspectRatios()
-{
-    m_prioritizedAspectRatios.clear();
-
-    if (m_service->isBackCameraUsed()) {
-        if (m_screenAspectRatio > 0.0f) {
-            m_prioritizedAspectRatios.append(getScreenAspectRatio());
-        }
-        // Prioritized list of aspect ratios for the back camera
-        const float backAspectRatios[4] = { 16.0f/9.0f, 3.0f/2.0f, 4.0f/3.0f, 5.0f/4.0f };
-        for (uint8_t i=0; i<4; ++i) {
-            if (!m_prioritizedAspectRatios.contains(backAspectRatios[i])) {
-                m_prioritizedAspectRatios.append(backAspectRatios[i]);
-            }
-        }
-    } else {
-        // Prioritized list of aspect ratios for the front camera
-        const float frontAspectRatios[4] = { 4.0f/3.0f, 5.0f/4.0f, 16.0f/9.0f, 3.0f/2.0f };
-        for (uint8_t i=0; i<4; ++i) {
-            m_prioritizedAspectRatios.append(frontAspectRatios[i]);
-        }
-    }
-}
-
 bool AalImageCaptureControl::updateJpegMetadata(void* data, uint32_t dataSize, QTemporaryFile* destination)
 {
     if (data == 0 || destination == 0) return false;
 
=== modified file 'src/aalimagecapturecontrol.h'
--- src/aalimagecapturecontrol.h	2014-12-02 20:56:46 +0000
+++ src/aalimagecapturecontrol.h	2015-11-17 15:24:47 +0000
@@ -52,10 +52,6 @@
 
     bool isCaptureRunning() const;
 
-    /// Find the highest optimal aspect ratio resolution, which depends
-    /// on the type of camera currently selected:
-    float getAspectRatio() const;
-
 public Q_SLOTS:
     void init(CameraControl *control, CameraControlListener *listener);
     void onPreviewReady();
@@ -64,9 +60,6 @@
     void shutter();
 
 private:
-    QSize chooseOptimalSize(const QList<QSize> &sizes, bool updateAspectRatio = true);
-    float getScreenAspectRatio();
-    void getPriorityAspectRatios();
     void saveJpeg(void* data, uint32_t dataSize);
     bool updateJpegMetadata(void* data, uint32_t dataSize, QTemporaryFile* destination);
 
@@ -76,9 +69,6 @@
     StorageManager m_storageManager;
     bool m_ready;
     QString m_pendingCaptureFile;
-    int m_photoWidth;
-    int m_photoHeight;
-    float m_aspectRatio;
     float m_screenAspectRatio;
     /// Maintains a list of highest priority aspect ratio to lowest, for the
     /// currently selected camera
 
=== modified file 'src/aalimageencodercontrol.cpp'
--- src/aalimageencodercontrol.cpp	2015-01-28 14:11:53 +0000
+++ src/aalimageencodercontrol.cpp	2015-11-17 15:24:47 +0000
@@ -15,12 +15,17 @@
  */
 
 #include "aalimageencodercontrol.h"
+#include "aalcameracontrol.h"
+#include "aalviewfindersettingscontrol.h"
+#include "aalvideoencodersettingscontrol.h"
+#include "aalimagecapturecontrol.h"
 #include "aalcameraservice.h"
 
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
 #include <unistd.h>
 
+#include <QCamera>
 #include <QDebug>
 
 AalImageEncoderControl::AalImageEncoderControl(AalCameraService *service, QObject *parent)
@@ -63,7 +68,7 @@
 
         // resolution
         if (!settings.resolution().isNull()) {
-            m_encoderSettings.setResolution(settings.resolution());
+            setSize(settings.resolution());
         }
 
         // encoding options
@@ -94,6 +99,11 @@
     return m_availableThumbnailSizes;
 }
 
+float AalImageEncoderControl::getAspectRatio() const
+{
+    return (float)m_currentSize.width() / (float)m_currentSize.height();
+}
+
 void AalImageEncoderControl::init(CameraControl *control)
 {
     Q_ASSERT(control != NULL);
@@ -106,47 +116,60 @@
     int jpegQuality;
     android_camera_get_jpeg_quality(control, &jpegQuality);
     m_encoderSettings.setQuality(jpegQualityToQtEncodingQuality(jpegQuality));
+
+    if (m_availableSizes.empty()) {
+        qWarning() << "(AalImageEncoderControl::init) No supported resolutions detected for currently selected camera device." << endl;
+        return;
+    }
+
+    if (!m_currentSize.isValid() || !m_availableSizes.contains(m_currentSize)) {
+        setSize(m_availableSizes.last());
+    } else {
+        setSize(m_currentSize);
+    }
 }
 
-void AalImageEncoderControl::setSize(const QSize &size)
+bool AalImageEncoderControl::setSize(const QSize &size)
 {
     CameraControl *cc = m_service->androidControl();
     if (!cc) {
         m_currentSize = size;
-        return;
+        m_encoderSettings.setResolution(m_currentSize);
+        return true;
     }
 
     if (!m_availableSizes.contains(size)) {
-        qWarning() << "Size " << size << "is not supported by the camera";
-        qWarning() << "Supported sizes are: " << m_availableSizes;
-        return;
+        qWarning() << "(AalImageEncoderControl::setSize) Size " << size << "is not supported by the camera";
+        qWarning() << "(AalImageEncoderControl::setSize) Supported sizes are: " << m_availableSizes;
+        return false;
     }
 
     m_currentSize = size;
-
-    android_camera_set_picture_size(cc, size.width(), size.height());
-}
-
-/*!
- * \brief AalImageEncoderControl::setThumbnailSize sets the resolution of JPEG thumbnail
- */
-void AalImageEncoderControl::setThumbnailSize(const QSize &size)
-{
-    CameraControl *cc = m_service->androidControl();
-    if (!cc) {
-        m_currentThumbnailSize = size;
-        return;
-    }
-
-    if (!m_availableThumbnailSizes.contains(size)) {
-        qWarning() << "Thumbnail size " << size << "is not supported by the camera";
-        qWarning() << "Supported thumbnail sizes are: " << m_availableThumbnailSizes;
-        return;
-    }
-
-    m_currentThumbnailSize = size;
-
-    android_camera_set_thumbnail_size(cc, size.width(), size.height());
+    m_encoderSettings.setResolution(m_currentSize);
+    if (m_service->cameraControl()->captureMode() == QCamera::CaptureStillImage) {
+        m_service->viewfinderControl()->setAspectRatio(getAspectRatio());
+    }
+
+    // Select m_currentThumbnailSize so that its aspect ratio is the same
+    // as m_currentSize's aspect ratio
+    float imageAspectRatio = getAspectRatio();
+    float thumbnailAspectRatio;
+
+    // Set the optimal thumbnail image resolution that will be saved to the JPEG file
+    if (!m_availableThumbnailSizes.empty()) {
+        m_currentThumbnailSize = m_service->selectSizeWithAspectRatio(m_availableThumbnailSizes, imageAspectRatio);
+        thumbnailAspectRatio = (float)m_currentThumbnailSize.width() / (float)m_currentThumbnailSize.height();
+    }
+
+    // Thumbnails will appear squashed or stretched if not the same aspect ratio as the original image.
+    // This will most likely be an incorrect size list supplied to qtubuntu-camera from the camera driver.
+    if (imageAspectRatio != thumbnailAspectRatio) {
+        qWarning() << "(AalImageEncoderControl::setSize) ** Image and thumbnail aspect ratios are different. Thumbnails will look wrong!";
+    }
+
+    android_camera_set_picture_size(cc, m_currentSize.width(), m_currentSize.height());
+    android_camera_set_thumbnail_size(cc, m_currentThumbnailSize.width(), m_currentThumbnailSize.height());
+    return true;
 }
 
 void AalImageEncoderControl::resetAllSettings()
 
=== modified file 'src/aalimageencodercontrol.h'
--- src/aalimageencodercontrol.h	2014-11-24 10:58:09 +0000
+++ src/aalimageencodercontrol.h	2015-11-17 15:24:47 +0000
@@ -37,10 +37,9 @@
     QStringList supportedImageCodecs() const;
     QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const;
     QList<QSize> supportedThumbnailResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const;
+    float getAspectRatio() const;
 
     void init(CameraControl *control);
-    void setSize(const QSize &size);
-    void setThumbnailSize(const QSize &size);
     void resetAllSettings();
 
     void enablePhotoMode();
@@ -56,6 +55,7 @@
     QSize m_currentThumbnailSize;
     QImageEncoderSettings m_encoderSettings;
 
+    bool setSize(const QSize &size);
     void getPictureSize(int width, int height);
     void getThumbnailSize(int width, int height);
     QMultimedia::EncodingQuality jpegQualityToQtEncodingQuality(int jpegQuality);
 
=== modified file 'src/aalvideodeviceselectorcontrol.cpp'
--- src/aalvideodeviceselectorcontrol.cpp	2014-07-28 12:52:45 +0000
+++ src/aalvideodeviceselectorcontrol.cpp	2015-11-17 15:24:47 +0000
@@ -86,8 +86,10 @@
     m_service->imageEncoderControl()->resetAllSettings();
     m_service->videoEncoderControl()->resetAllSettings();
     m_currentDevice = index;
-    if (m_service->isCameraActive())
+    if (m_service->isCameraActive()) {
         m_service->connectCamera();
+        m_service->startPreview();
+    }
 
     Q_EMIT selectedDeviceChanged(m_currentDevice);
     Q_EMIT selectedDeviceChanged(deviceName(m_currentDevice));
 
=== modified file 'src/aalvideoencodersettingscontrol.cpp'
--- src/aalvideoencodersettingscontrol.cpp	2013-07-24 06:50:58 +0000
+++ src/aalvideoencodersettingscontrol.cpp	2015-11-17 15:24:47 +0000
@@ -16,10 +16,13 @@
 
 #include "aalvideoencodersettingscontrol.h"
 #include "aalcameraservice.h"
+#include "aalcameracontrol.h"
 #include "aalviewfindersettingscontrol.h"
 
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
+#include <QCamera>
+
 const QSize AalVideoEncoderSettingsControl::DEFAULT_SIZE = QSize(1280,720);
 const int AalVideoEncoderSettingsControl::DEFAULT_FPS = 30;
 const QString AalVideoEncoderSettingsControl::DEFAULT_CODEC = QString("H.264");
@@ -49,8 +52,12 @@
     if (supportedFrameRates(settings, &continuous).contains(settings.frameRate()))
         m_settings.setFrameRate(settings.frameRate());
 
-    if (supportedResolutions(settings, &continuous).contains(settings.resolution()))
+    if (supportedResolutions(settings, &continuous).contains(settings.resolution())) {
         m_settings.setResolution(settings.resolution());
+        if (m_service->cameraControl()->captureMode() == QCamera::CaptureVideo) {
+            m_service->viewfinderControl()->setAspectRatio(getAspectRatio());
+        }
+    }
 
     // FIXME support more options
 }
@@ -136,6 +143,9 @@
 
     if (!m_availableSizes.contains(m_settings.resolution()) && !m_availableSizes.empty()) {
         m_settings.setResolution(m_availableSizes[0]);
+        if (m_service->cameraControl()->captureMode() == QCamera::CaptureVideo) {
+            m_service->viewfinderControl()->setAspectRatio(getAspectRatio());
+        }
     }
 }
 
 
=== modified file 'src/aalvideorenderercontrol.cpp'
--- src/aalvideorenderercontrol.cpp	2014-09-05 15:20:34 +0000
+++ src/aalvideorenderercontrol.cpp	2015-11-17 15:24:47 +0000
@@ -129,9 +129,6 @@
 
 void AalVideoRendererControl::stopPreview()
 {
-    if (!m_viewFinderRunning || !m_surface)
-        return;
-
     m_viewFinderRunning = false;
 
     CameraControl *cc = m_service->androidControl();
@@ -139,7 +136,7 @@
         android_camera_stop_preview(cc);
     }
 
-    if (m_surface->isActive())
+    if (m_surface && m_surface->isActive())
         m_surface->stop();
 
     m_frameCount = 0;
 
=== modified file 'src/aalviewfindersettingscontrol.cpp'
--- src/aalviewfindersettingscontrol.cpp	2013-07-16 13:09:15 +0000
+++ src/aalviewfindersettingscontrol.cpp	2015-11-17 15:24:47 +0000
@@ -20,8 +20,6 @@
 
 #include <QDebug>
 
-#include <cmath>
-
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
 AalViewfinderSettingsControl::AalViewfinderSettingsControl(AalCameraService *service, QObject *parent)
@@ -111,15 +109,9 @@
     m_currentSize = size;
 
     AalVideoRendererControl *videoRenderer = m_service->videoOutputControl();
-    bool vfRunning = videoRenderer->isViewfinderRunning();
-
-    if (vfRunning)
-        videoRenderer->stopPreview();
-
+    videoRenderer->stopPreview();
     android_camera_set_preview_size(cc, m_currentSize.width(), m_currentSize.height());
-
-    if (vfRunning)
-        videoRenderer->startPreview();
+    videoRenderer->startPreview();
 }
 
 QSize AalViewfinderSettingsControl::currentSize() const
@@ -172,7 +164,9 @@
     }
 
     // Choose optimal resolution based on the current camera's aspect ratio
-    m_currentSize = chooseOptimalSize(m_availableSizes);
+    if (m_currentSize.isEmpty()) {
+        m_currentSize = chooseOptimalSize(m_availableSizes);
+    }
     android_camera_set_preview_size(control, m_currentSize.width(), m_currentSize.height());
 
     android_camera_get_preview_fps_range(control, &m_minFPS, &m_maxFPS);
@@ -211,16 +205,8 @@
         if (m_aspectRatio == 0) {
             // There are resolutions supported, choose one non-optimal one):
             return sizes[1];
-        }
-
-        QList<QSize>::const_iterator it = sizes.begin();
-        while (it != sizes.end()) {
-            const float ratio = (float)(*it).width() / (float)(*it).height();
-            const float EPSILON = 10e-3;
-            if (fabs(ratio - m_aspectRatio) < EPSILON) {
-                return *it;
-            }
-            ++it;
+        } else {
+            return m_service->selectSizeWithAspectRatio(sizes, m_aspectRatio);
         }
     }
 
 
=== modified file 'src/aalviewfindersettingscontrol.h'
--- src/aalviewfindersettingscontrol.h	2013-06-21 15:57:39 +0000
+++ src/aalviewfindersettingscontrol.h	2015-11-17 15:24:47 +0000
@@ -35,7 +35,6 @@
     void setViewfinderParameter(ViewfinderParameter parameter, const QVariant & value);
     QVariant viewfinderParameter(ViewfinderParameter parameter) const;
 
-    void setSize(const QSize &size);
     QSize currentSize() const;
     const QList<QSize> &supportedSizes() const;
 
@@ -47,6 +46,7 @@
     static void sizeCB(void* ctx, int width, int height);
 
 private:
+    void setSize(const QSize &size);
     QSize chooseOptimalSize(const QList<QSize> &sizes) const;
 
     AalCameraService *m_service;
 
=== modified file 'src/src.pro'
--- src/src.pro	2015-06-24 04:36:42 +0000
+++ src/src.pro	2015-11-17 15:24:47 +0000
@@ -9,16 +9,8 @@
 target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS = target
 
-INCLUDEPATH += /usr/include/libqtubuntu-media-signals
-LIBS += \
-    -lcamera \
-    -lmedia \
-    -lqtubuntu-media-signals \
-    -lpulse \
-    -lpulse-simple
-
 CONFIG += link_pkgconfig
-PKGCONFIG += exiv2
+PKGCONFIG += exiv2 libqtubuntu-media-signals libmedia libcamera hybris-egl-platform libpulse-simple
 
 OTHER_FILES += aalcamera.json
 
 
=== modified file 'unittests/aalcameracontrol/aalcameraservice.cpp'
--- unittests/aalcameracontrol/aalcameraservice.cpp	2013-07-26 16:46:16 +0000
+++ unittests/aalcameracontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -54,6 +54,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return true;
@@ -81,3 +89,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalcameraexposurecontrol/aalcameraservice.cpp'
--- unittests/aalcameraexposurecontrol/aalcameraservice.cpp	2014-07-15 12:38:55 +0000
+++ unittests/aalcameraexposurecontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -66,6 +66,14 @@
     android_camera_disconnect(m_androidControl);
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     m_exposureControl->init(camControl, listener);
@@ -74,3 +82,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalcameraflashcontrol/aalcameraservice.cpp'
--- unittests/aalcameraflashcontrol/aalcameraservice.cpp	2013-08-05 07:29:41 +0000
+++ unittests/aalcameraflashcontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -57,6 +57,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);
@@ -76,3 +84,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalcamerafocuscontrol/aalcameraservice.cpp'
--- unittests/aalcamerafocuscontrol/aalcameraservice.cpp	2013-02-11 15:56:21 +0000
+++ unittests/aalcamerafocuscontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -54,6 +54,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);
@@ -63,3 +71,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalcamerazoomcontrol/aalcameraservice.cpp'
--- unittests/aalcamerazoomcontrol/aalcameraservice.cpp	2013-07-23 16:02:22 +0000
+++ unittests/aalcamerazoomcontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -68,6 +68,14 @@
     android_camera_disconnect(m_androidControl);
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     m_zoomControl->init(camControl, listener);
@@ -76,3 +84,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalimagecapturecontrol/aalcameraservice.cpp'
--- unittests/aalimagecapturecontrol/aalcameraservice.cpp	2013-02-14 19:37:36 +0000
+++ unittests/aalimagecapturecontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -54,6 +54,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);
@@ -73,3 +81,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp'
--- unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp	2014-11-24 11:16:57 +0000
+++ unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp	2015-11-17 15:24:47 +0000
@@ -76,14 +76,10 @@
     Q_UNUSED(control);
 }
 
-void AalImageEncoderControl::setSize(const QSize &size)
-{
-    Q_UNUSED(size);
-}
-
-void AalImageEncoderControl::setThumbnailSize(const QSize &size)
-{
-    Q_UNUSED(size);
+bool AalImageEncoderControl::setSize(const QSize &size)
+{
+    Q_UNUSED(size);
+    return true;
 }
 
 void AalImageEncoderControl::resetAllSettings()
 
=== modified file 'unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp'
--- unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp	2014-09-29 10:05:25 +0000
+++ unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp	2015-11-17 15:24:47 +0000
@@ -31,11 +31,6 @@
     void initTestCase();
     void cleanupTestCase();
 
-    void chooseOptimalSize16by9();
-    void chooseOptimalSizeEmpty();
-
-    void priorityAspectRatio();
-
     void updateEXIF();
 
 private:
@@ -57,45 +52,6 @@
     delete m_service;
 }
 
-void tst_AalImageCaptureControl::chooseOptimalSize16by9()
-{
-    Q_ASSERT(m_service->isBackCameraUsed());
-
-    m_icControl->m_aspectRatio = 16.0f / 9.0f;
-    QList<QSize> resolutions;
-    resolutions.append(QSize(1920, 1080));
-    resolutions.append(QSize(1280, 720));
-    resolutions.append(QSize(960, 720));
-
-    QCOMPARE(m_icControl->chooseOptimalSize(resolutions), QSize(1920, 1080));
-}
-
-void tst_AalImageCaptureControl::chooseOptimalSizeEmpty()
-{
-    m_icControl->m_aspectRatio = 4.0f / 3.0f;
-    QList<QSize> resolutions;
-
-    QCOMPARE(m_icControl->chooseOptimalSize(resolutions), QSize());
-}
-
-void tst_AalImageCaptureControl::priorityAspectRatio()
-{
-    Q_ASSERT(m_service->isBackCameraUsed());
-
-    QList<float> backAspectRatios;
-    backAspectRatios.append(16.0f / 9.0f);
-    backAspectRatios.append(15.0f / 10.0f);
-    backAspectRatios.append(4.0f / 3.0f);
-    backAspectRatios.append(5.0f / 4.0f);
-    m_icControl->getPriorityAspectRatios();
-    for (uint8_t i=0; i<4; ++i) {
-        const float EPSILON = 10e-2;
-        qDebug() << "m_icControl->m_prioritizedAspectRatios[i]: " << m_icControl->m_prioritizedAspectRatios[i] << endl;
-        qDebug() << "backAspectRatios[i]: " << backAspectRatios[i] << endl;
-        Q_ASSERT(fabs(m_icControl->m_prioritizedAspectRatios[i] - backAspectRatios[i]) < EPSILON);
-    }
-}
-
 void tst_AalImageCaptureControl::updateEXIF()
 {
     bool result;
 
=== modified file 'unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp'
--- unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp	2013-08-01 10:41:04 +0000
+++ unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -54,6 +54,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return true;
@@ -65,11 +73,6 @@
     Q_UNUSED(listener);
 }
 
-bool AalCameraService::isReady() const
-{
-    return true;
-}
-
 bool AalCameraService::isRecording() const
 {
     return false;
@@ -78,3 +81,10 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    Q_UNUSED(sizes);
+    Q_UNUSED(targetAspectRatio);
+    return QSize();
+}
 
=== modified file 'unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp'
--- unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp	2014-10-27 17:25:50 +0000
+++ unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp	2015-11-17 15:24:47 +0000
@@ -61,9 +61,10 @@
     Q_UNUSED(control);
 }
 
-void AalImageEncoderControl::setSize(const QSize &size)
+bool AalImageEncoderControl::setSize(const QSize &size)
 {
     Q_UNUSED(size);
+    return true;
 }
 
 void AalImageEncoderControl::resetAllSettings()
 
=== modified file 'unittests/aalviewfindersettingscontrol/aalcameraservice.cpp'
--- unittests/aalviewfindersettingscontrol/aalcameraservice.cpp	2013-02-11 15:56:21 +0000
+++ unittests/aalviewfindersettingscontrol/aalcameraservice.cpp	2015-11-17 15:24:47 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "aalcameraservice.h"
+#include <cmath>
 
 AalCameraService *AalCameraService::m_service = 0;
 
@@ -54,6 +55,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);
@@ -73,3 +82,28 @@
 void AalCameraService::updateCaptureReady()
 {
 }
+
+QSize AalCameraService::selectSizeWithAspectRatio(const QList<QSize> &sizes, float targetAspectRatio) const
+{
+    QSize selectedSize;
+    long selectedPixelCount = 0;
+    const float EPSILON = 0.02;
+
+    if (!sizes.empty()) {
+        // Loop over all sizes until we find the highest one that matches targetAspectRatio.
+        QList<QSize>::const_iterator it = sizes.begin();
+        while (it != sizes.end()) {
+            QSize size = *it;
+            const float aspectRatio = (float)size.width() / (float)size.height();
+            const long pixelCount = (long)size.width() * (long)size.height();
+            if (fabs(aspectRatio - targetAspectRatio) < EPSILON && pixelCount > selectedPixelCount) {
+                selectedSize = size;
+                selectedPixelCount = pixelCount;
+            }
+            ++it;
+        }
+    }
+
+    return selectedSize;
+}
+
 
=== modified file 'unittests/stubs/aalcameraservice_stub.cpp'
--- unittests/stubs/aalcameraservice_stub.cpp	2013-06-22 07:29:20 +0000
+++ unittests/stubs/aalcameraservice_stub.cpp	2015-11-17 15:24:47 +0000
@@ -65,6 +65,14 @@
 {
 }
 
+void AalCameraService::startPreview()
+{
+}
+
+void AalCameraService::stopPreview()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     delete m_androidControl;