Merge lp:~fboucault/qtubuntu-camera/unloaded_when_inactive into lp:qtubuntu-camera/staging

[Florian Boucault]

Fixed QCamera::LoadedState so that it only disables the viewfinder but keeps the camera stack loaded.
Automatically set the state to QCamera::UnloadedState when the application becomes inactive. Restore
state when application becomes active again.

[Ugo Riboni (uriboni)]

Some minor comments, but otherwise code only looks good.

review: Needs Fixing (code)

[Ugo Riboni (uriboni)]

Works well functionally

review: Approve (functional)

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

163. By Florian Boucault on 2015-12-08

Readded necessary check

164. By Florian Boucault on 2015-12-08

Homogeneous warning messages

[Ugo Riboni (uriboni)]

LGTM

review: Approve

=== modified file 'src/aalcameracontrol.cpp'
--- src/aalcameracontrol.cpp	2015-12-02 08:26:32 +0000
+++ src/aalcameracontrol.cpp	2015-12-08 15:15:50 +0000
@@ -57,7 +57,7 @@
                 return;
             }
         } else {
-            m_service->disconnectCamera();
+            m_service->stopPreview();
         }
     } else if (state == QCamera::UnloadedState) {
         m_service->disconnectCamera();

=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2015-12-02 08:26:32 +0000
+++ src/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -32,6 +32,7 @@
 
 #include <hybris/camera/camera_compatibility_layer.h>
 
+#include <QtGui/QGuiApplication>
 #include <QDebug>
 #include <cmath>
 
@@ -40,7 +41,8 @@
 AalCameraService::AalCameraService(QObject *parent):
     QMediaService(parent),
     m_androidControl(0),
-    m_androidListener(0)
+    m_androidListener(0),
+    m_restoreStateWhenApplicationActive(false)
 {
     m_service = this;
 
@@ -58,6 +60,10 @@
     m_videoOutput = new AalVideoRendererControl(this);
     m_viewfinderControl = new AalViewfinderSettingsControl(this);
     m_exposureControl = new AalCameraExposureControl(this);
+
+    QGuiApplication* application = qobject_cast<QGuiApplication*>(QGuiApplication::instance());
+    connect(application, &QGuiApplication::applicationStateChanged,
+            this, &AalCameraService::onApplicationStateChanged);
 }
 
 AalCameraService::~AalCameraService()
@@ -205,6 +211,15 @@
     }
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    if (m_videoOutput) {
+        return m_videoOutput->isPreviewStarted();
+    } else {
+        return false;
+    }
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return m_cameraControl->state() == QCamera::ActiveState;
@@ -256,12 +271,27 @@
         ready = false;
     if (m_focusControl->isFocusBusy())
         ready = false;
-    if (!m_videoOutput->isViewfinderRunning())
+    if (!isPreviewStarted())
         ready = false;
 
     m_imageCaptureControl->setReady(ready);
 }
 
+void AalCameraService::onApplicationStateChanged()
+{
+    QGuiApplication* application = qobject_cast<QGuiApplication*>(QGuiApplication::instance());
+    Qt::ApplicationState applicationState = application->applicationState();
+    if (applicationState == Qt::ApplicationActive) {
+        if (m_restoreStateWhenApplicationActive) {
+            m_cameraControl->setState(m_cameraStateWhenApplicationActive);
+        }
+    } else {
+        m_cameraStateWhenApplicationActive = m_cameraControl->state();
+        m_restoreStateWhenApplicationActive = true;
+        m_cameraControl->setState(QCamera::UnloadedState);
+    }
+}
+
 /*!
  * \brief AalCameraService::initControls initialize all the controls for a newly
  * connected camera

=== modified file 'src/aalcameraservice.h'
--- src/aalcameraservice.h	2015-10-15 13:20:33 +0000
+++ src/aalcameraservice.h	2015-12-08 15:15:50 +0000
@@ -19,6 +19,7 @@
 
 #include <QMediaService>
 #include <QSize>
+#include <QtMultimedia/QCamera>
 
 class AalCameraControl;
 class AalCameraFlashControl;
@@ -72,6 +73,7 @@
     void disconnectCamera();
     void startPreview();
     void stopPreview();
+    bool isPreviewStarted() const;
 
     bool isCameraActive() const;
     bool isBackCameraUsed() const;
@@ -87,6 +89,9 @@
 public Q_SLOTS:
     void updateCaptureReady();
 
+protected Q_SLOTS:
+    void onApplicationStateChanged();
+
 private:
     void initControls(CameraControl *camControl, CameraControlListener *listener);
 
@@ -110,6 +115,8 @@
     CameraControlListener *m_androidListener;
 
     StorageManager *m_storageManager;
+    bool m_restoreStateWhenApplicationActive;
+    QCamera::State m_cameraStateWhenApplicationActive;
 };
 
 #endif

=== modified file 'src/aalvideodeviceselectorcontrol.cpp'
--- src/aalvideodeviceselectorcontrol.cpp	2015-11-12 10:41:18 +0000
+++ src/aalvideodeviceselectorcontrol.cpp	2015-12-08 15:15:50 +0000
@@ -16,11 +16,13 @@
 
 #include "aalvideodeviceselectorcontrol.h"
 #include "aalcameraservice.h"
+#include "aalcameracontrol.h"
 #include "aalimageencodercontrol.h"
 #include "aalvideoencodersettingscontrol.h"
 #include "aalviewfindersettingscontrol.h"
 
 #include <QDebug>
+#include <QtMultimedia/QCamera>
 
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 
@@ -81,12 +83,16 @@
     if (m_service->isRecording())
         return;
 
+    m_service->stopPreview();
     m_service->disconnectCamera();
     m_service->viewfinderControl()->resetAllSettings();
     m_service->imageEncoderControl()->resetAllSettings();
     m_service->videoEncoderControl()->resetAllSettings();
     m_currentDevice = index;
-    if (m_service->isCameraActive()) {
+    QCamera::State state = m_service->cameraControl()->state();
+    if (state == QCamera::LoadedState) {
+        m_service->connectCamera();
+    } else if (state == QCamera::ActiveState) {
         m_service->connectCamera();
         m_service->startPreview();
     }

=== modified file 'src/aalvideorenderercontrol.cpp'
--- src/aalvideorenderercontrol.cpp	2015-11-17 15:24:37 +0000
+++ src/aalvideorenderercontrol.cpp	2015-12-08 15:15:50 +0000
@@ -29,8 +29,6 @@
 #include <QUrl>
 #include <QVideoSurfaceFormat>
 
-const int MIN_FRAME_COUNT = 8; // minimal number of frames to be ready for capture
-
 class AalGLTextureBuffer : public QAbstractVideoBuffer
 {
 public:
@@ -72,8 +70,8 @@
    , m_surface(0),
      m_service(service),
      m_viewFinderRunning(false),
-     m_textureId(0),
-     m_frameCount(0)
+     m_previewStarted(false),
+     m_textureId(0)
 {
     // Get notified when qtvideo-node creates a GL texture
     connect(SharedSignal::instance(), SIGNAL(textureCreated(unsigned int)), this, SLOT(onTextureCreated(unsigned int)));
@@ -101,71 +99,89 @@
 {
     Q_UNUSED(control);
     listener->on_preview_texture_needs_update_cb = &AalVideoRendererControl::updateViewfinderFrameCB;
+    // ensures a new texture will be created by qtvideo-node
     m_textureId = 0;
-    m_frameCount = 0;
 }
 
 void AalVideoRendererControl::startPreview()
 {
-    if (m_frameCount > 0)
-        return;
-    if (m_viewFinderRunning)
-        return;
+    if (m_previewStarted) {
+        return;
+    }
+    if (!m_service->androidControl()) {
+        qWarning() << "Can't start preview without a CameraControl";
+        return;
+    }
+    m_previewStarted = true;
 
     if (m_textureId) {
         CameraControl *cc = m_service->androidControl();
-        if (cc) {
-            android_camera_set_preview_texture(cc, m_textureId);
-            android_camera_start_preview(cc);
-            m_viewFinderRunning = true;
-            updateViewfinderFrame();
-        }
-    } else {
-        // requests a new texture
-        updateViewfinderFrame();
+        android_camera_set_preview_texture(cc, m_textureId);
+        android_camera_start_preview(cc);
     }
+
+    // if no texture ID is set to the frame passed to ShaderVideoNode,
+    // a texture ID will be generated and returned via the 'textureCreated' signal
+    // after calling updateViewfinderFrame()
+    updateViewfinderFrame();
+
     m_service->updateCaptureReady();
 }
 
 void AalVideoRendererControl::stopPreview()
 {
-    m_viewFinderRunning = false;
-
-    CameraControl *cc = m_service->androidControl();
-    if (cc) {
-        android_camera_stop_preview(cc);
-    }
-
-    if (m_surface && m_surface->isActive())
+    if (!m_previewStarted) {
+        return;
+    }
+    if (!m_service->androidControl()) {
+        qWarning() << "Can't stop preview without a CameraControl";
+        return;
+    }
+    if (!m_surface) {
+        qWarning() << "Can't stop preview without a QAbstractVideoSurface";
+        return;
+    }
+
+    if (m_surface->isActive()) {
         m_surface->stop();
-
-    m_frameCount = 0;
-
+    }
+
+    CameraControl *cc = m_service->androidControl();
+    android_camera_stop_preview(cc);
+    // FIXME: missing android_camera_set_preview_size(QSize())
+    android_camera_set_preview_texture(cc, 0);
+
+    m_previewStarted = false;
     m_service->updateCaptureReady();
 }
 
+bool AalVideoRendererControl::isPreviewStarted() const
+{
+    return m_previewStarted;
+}
+
 void AalVideoRendererControl::updateViewfinderFrame()
 {
+    if (!m_service->viewfinderControl()) {
+        qWarning() << "Can't draw video frame without a viewfinder settings control";
+        return;
+    }
+    if (!m_service->androidControl()) {
+        qWarning() << "Can't draw video frame without camera";
+        return;
+    }
     if (!m_surface) {
         qWarning() << "Can't draw video frame without surface";
         return;
     }
-    if (!m_service->androidControl()) {
-        qWarning() << "Can't draw video frame without camera";
-        return;
-    }
-    // if framecount is 0, then m_textureId can be 0, as this will request the
-    // texture from the render thread. (see code in qtvideo-node).
-    if (!m_textureId && m_frameCount > 0) {
-        qWarning() << "Can't draw video frame without texture" << m_frameCount;
-        return;
-    }
 
     QSize vfSize = m_service->viewfinderControl()->currentSize();
     QVideoFrame frame(new AalGLTextureBuffer(m_textureId), vfSize, QVideoFrame::Format_RGB32);
 
-    if (!frame.isValid())
+    if (!frame.isValid()) {
+        qWarning() << "Invalid frame";
         return;
+    }
 
     CameraControl *cc = m_service->androidControl();
     frame.setMetaData("CamControl", QVariant::fromValue((void*)cc));
@@ -181,23 +197,16 @@
     if (m_surface->isActive()) {
         m_surface->present(frame);
     }
-
-    ++m_frameCount;
-    if (m_frameCount == MIN_FRAME_COUNT) {
-        m_service->updateCaptureReady();
-    }
 }
 
 void AalVideoRendererControl::onTextureCreated(GLuint textureID)
 {
     m_textureId = textureID;
-    if (m_textureId) {
-        // as we got a new textureID
-        CameraControl *cc = m_service->androidControl();
-        if (cc) {
-            android_camera_set_preview_texture(cc, m_textureId);
+    CameraControl *cc = m_service->androidControl();
+    if (cc) {
+        android_camera_set_preview_texture(cc, m_textureId);
+        if (m_textureId && m_previewStarted) {
             android_camera_start_preview(cc);
-            m_viewFinderRunning = true;
         }
     }
     m_service->updateCaptureReady();
@@ -213,8 +222,9 @@
 {
     Q_UNUSED(context);
     AalVideoRendererControl *self = AalCameraService::instance()->videoOutputControl();
-    if (self->m_viewFinderRunning)
+    if (self->m_previewStarted) {
         QMetaObject::invokeMethod(self, "updateViewfinderFrame", Qt::QueuedConnection);
+    }
 }
 
 const QImage &AalVideoRendererControl::preview() const
@@ -231,8 +241,3 @@
     SharedSignal::instance()->setSnapshotSize(vfSize);
     SharedSignal::instance()->takeSnapshot(m_service->androidControl());
 }
-
-bool AalVideoRendererControl::isViewfinderRunning() const
-{
-    return m_viewFinderRunning && m_frameCount >= MIN_FRAME_COUNT;
-}

=== modified file 'src/aalvideorenderercontrol.h'
--- src/aalvideorenderercontrol.h	2013-07-18 14:29:13 +0000
+++ src/aalvideorenderercontrol.h	2015-12-08 15:15:50 +0000
@@ -40,7 +40,7 @@
     const QImage &preview() const;
     void createPreview();
 
-    bool isViewfinderRunning() const;
+    bool isPreviewStarted() const;
 
 public Q_SLOTS:
     void init(CameraControl *control, CameraControlListener *listener);
@@ -61,10 +61,9 @@
     AalCameraService *m_service;
 
     bool m_viewFinderRunning;
+    bool m_previewStarted;
     GLuint m_textureId;
     QImage m_preview;
-
-    int m_frameCount;
 };
 
 #endif

=== modified file 'src/aalviewfindersettingscontrol.cpp'
--- src/aalviewfindersettingscontrol.cpp	2015-11-17 15:24:37 +0000
+++ src/aalviewfindersettingscontrol.cpp	2015-12-08 15:15:50 +0000
@@ -108,10 +108,14 @@
 
     m_currentSize = size;
 
-    AalVideoRendererControl *videoRenderer = m_service->videoOutputControl();
-    videoRenderer->stopPreview();
+    bool wasPreviewStarted = m_service->isPreviewStarted();
+    if (wasPreviewStarted) {
+        m_service->stopPreview();
+    }
     android_camera_set_preview_size(cc, m_currentSize.width(), m_currentSize.height());
-    videoRenderer->startPreview();
+    if (wasPreviewStarted) {
+        m_service->startPreview();
+    }
 }
 
 QSize AalViewfinderSettingsControl::currentSize() const

=== modified file 'unittests/aalcameracontrol/aalcameraservice.cpp'
--- unittests/aalcameracontrol/aalcameraservice.cpp	2015-12-02 09:56:45 +0000
+++ unittests/aalcameracontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -65,6 +65,11 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return true;
@@ -78,6 +83,10 @@
 {
 }
 
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalcameraexposurecontrol/aalcameraservice.cpp'
--- unittests/aalcameraexposurecontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalcameraexposurecontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -74,6 +74,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     m_exposureControl->init(camControl, listener);

=== modified file 'unittests/aalcameraflashcontrol/aalcameraservice.cpp'
--- unittests/aalcameraflashcontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalcameraflashcontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -65,6 +65,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalcamerafocuscontrol/aalcameraservice.cpp'
--- unittests/aalcamerafocuscontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalcamerafocuscontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -62,6 +62,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalcamerazoomcontrol/aalcameraservice.cpp'
--- unittests/aalcamerazoomcontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalcamerazoomcontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -76,6 +76,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     m_zoomControl->init(camControl, listener);

=== modified file 'unittests/aalimagecapturecontrol/aalcameraservice.cpp'
--- unittests/aalimagecapturecontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalimagecapturecontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -62,6 +62,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp'
--- unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp	2013-06-21 10:24:02 +0000
+++ unittests/aalimagecapturecontrol/aalvideorenderercontrol.cpp	2015-12-08 15:15:50 +0000
@@ -55,9 +55,9 @@
 {
 }
 
-bool AalVideoRendererControl::isViewfinderRunning() const
+bool AalVideoRendererControl::isPreviewStarted() const
 {
-    return m_viewFinderRunning;
+    return true;
 }
 
 void AalVideoRendererControl::updateViewfinderFrame()

=== modified file 'unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp'
--- unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp	2015-10-15 13:20:33 +0000
+++ unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -62,11 +62,20 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
 bool AalCameraService::isCameraActive() const
 {
     return true;
 }
 
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalviewfindersettingscontrol/aalcameraservice.cpp'
--- unittests/aalviewfindersettingscontrol/aalcameraservice.cpp	2015-10-15 16:08:39 +0000
+++ unittests/aalviewfindersettingscontrol/aalcameraservice.cpp	2015-12-08 15:15:50 +0000
@@ -63,6 +63,15 @@
 {
 }
 
+bool AalCameraService::isPreviewStarted() const
+{
+    return true;
+}
+
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     Q_UNUSED(camControl);

=== modified file 'unittests/aalviewfindersettingscontrol/aalvideorenderercontrol.cpp'
--- unittests/aalviewfindersettingscontrol/aalvideorenderercontrol.cpp	2013-06-21 10:24:02 +0000
+++ unittests/aalviewfindersettingscontrol/aalvideorenderercontrol.cpp	2015-12-08 15:15:50 +0000
@@ -55,9 +55,9 @@
 {
 }
 
-bool AalVideoRendererControl::isViewfinderRunning() const
+bool AalVideoRendererControl::isPreviewStarted() const
 {
-    return m_viewFinderRunning;
+    return true;
 }
 
 void AalVideoRendererControl::updateViewfinderFrame()

=== modified file 'unittests/stubs/aalcameraservice_stub.cpp'
--- unittests/stubs/aalcameraservice_stub.cpp	2015-10-14 20:09:21 +0000
+++ unittests/stubs/aalcameraservice_stub.cpp	2015-12-08 15:15:50 +0000
@@ -73,6 +73,10 @@
 {
 }
 
+void AalCameraService::onApplicationStateChanged()
+{
+}
+
 void AalCameraService::initControls(CameraControl *camControl, CameraControlListener *listener)
 {
     delete m_androidControl;