Merge lp:~schwann/qtubuntu-camera/camera-fast-finger-corrupt into lp:qtubuntu-camera

[Günter Schwann]

The camera needs some frames to be ready for capture LP: #1125302

The camera needs some frames to be ready for capture LP: #1125302

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

good

review: Approve

=== modified file 'src/aalvideorenderercontrol.cpp'
--- src/aalvideorenderercontrol.cpp	2013-06-21 10:24:02 +0000
+++ src/aalvideorenderercontrol.cpp	2013-07-18 14:33:37 +0000
@@ -29,6 +29,8 @@
 #include <QUrl>
 #include <QVideoSurfaceFormat>
 
+const int MIN_FRAME_COUNT = 8; // minimal number of frames to be ready for capture
+
 class AalGLTextureBuffer : public QAbstractVideoBuffer
 {
 public:
@@ -71,7 +73,7 @@
      m_service(service),
      m_viewFinderRunning(false),
      m_textureId(0),
-     m_firstFrame(true)
+     m_frameCount(0)
 {
     // Get notified when qtvideo-node creates a GL texture
     connect(SharedSignal::instance(), SIGNAL(textureCreated(unsigned int)), this, SLOT(onTextureCreated(unsigned int)));
@@ -130,6 +132,7 @@
         m_surface->stop();
 
     m_viewFinderRunning = false;
+    m_frameCount = 0;
 
     m_service->updateCaptureReady();
 }
@@ -139,7 +142,7 @@
     // m_textureId can be (and will be) 0 if this is the first video frame since this
     // is how a ShaderVideoNode instance gets created and ultimately how m_textureId
     // get set.
-    if (!m_surface || (!m_textureId && !m_firstFrame) || !m_service->androidControl())
+    if (!m_surface || (!m_textureId && !m_frameCount==0) || !m_service->androidControl())
         return;
 
     QSize vfSize = m_service->viewfinderControl()->currentSize();
@@ -163,8 +166,10 @@
         m_surface->present(frame);
     }
 
-    if (m_firstFrame)
-        m_firstFrame = false;
+    ++m_frameCount;
+    if (m_frameCount == MIN_FRAME_COUNT) {
+        m_service->updateCaptureReady();
+    }
 }
 
 void AalVideoRendererControl::onTextureCreated(GLuint textureID)
@@ -202,5 +207,5 @@
 
 bool AalVideoRendererControl::isViewfinderRunning() const
 {
-    return m_viewFinderRunning;
+    return m_viewFinderRunning && m_frameCount >= MIN_FRAME_COUNT;
 }

=== modified file 'src/aalvideorenderercontrol.h'
--- src/aalvideorenderercontrol.h	2013-06-21 10:24:02 +0000
+++ src/aalvideorenderercontrol.h	2013-07-18 14:33:37 +0000
@@ -64,7 +64,7 @@
     GLuint m_textureId;
     QImage m_preview;
 
-    bool m_firstFrame;
+    int m_frameCount;
 };
 
 #endif