Merge lp:~jhodapp/qtubuntu-camera/fix-1398861 into lp:qtubuntu-camera

[Jim Hodapp]

Make sure that Pulse stops reading the microphone stream when recording stops. Also make sure that the microphone reading worker thread stops cleanly on app termination.

Make sure that Pulse stops reading the microphone stream when recording stops. Also make sure that the microphone reading worker thread stops cleanly on app termination.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~jhodapp/qtubuntu-camera/fix-1398861]

123. By Jim Hodapp on 2014-12-03

Don't comment out updateAspectRatio in chooseOptimalSize()

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~jhodapp/qtubuntu-camera/fix-1398861]

124. By Jim Hodapp on 2014-12-03

Make sure we can still record more than one video by making sure we always have a valid m_workerThread instance.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, works as expected.

review: Approve

=== modified file 'src/aalmediarecordercontrol.cpp'
--- src/aalmediarecordercontrol.cpp	2014-11-18 18:24:52 +0000
+++ src/aalmediarecordercontrol.cpp	2014-12-03 22:17:37 +0000
@@ -63,7 +63,7 @@
     m_currentState(QMediaRecorder::StoppedState),
     m_currentStatus(QMediaRecorder::UnloadedStatus),
     m_recordingTimer(0),
-    m_workerThread(new QThread)
+    m_workerThread(0)
 {
 }
 
@@ -73,8 +73,6 @@
 AalMediaRecorderControl::~AalMediaRecorderControl()
 {
     delete m_recordingTimer;
-    m_workerThread->deleteLater();
-    m_audioCapture->deleteLater();
     deleteRecorder();
 }
 
@@ -170,6 +168,7 @@
         m_mediaRecorder = android_media_new_recorder();
 
         m_audioCapture = new AudioCapture(m_mediaRecorder);
+        m_workerThread = new QThread;
 
         if (m_audioCapture == 0) {
             qWarning() << "Unable to create new audio capture, audio recording won't function";
@@ -184,7 +183,14 @@
 
             // Finished signal is for when the workerThread is completed. Important to connect this so that
             // resources are cleaned up in the proper order and not leaked
-            ret = connect(m_workerThread, SIGNAL(finished()), m_audioCapture, SLOT(deleteLater()));
+            ret = connect(m_audioCapture, SIGNAL(finished()), m_workerThread, SLOT(quit()));
+            if (!ret)
+                qWarning() << "Failed to connect quit() to the m_audioCapture finished signal";
+            ret = connect(m_audioCapture, SIGNAL(finished()), m_audioCapture, SLOT(deleteLater()));
+            if (!ret)
+                qWarning() << "Failed to connect deleteLater() to the m_audioCapture finished signal";
+            // Clean up the worker thread after we finish recording
+            ret = connect(m_workerThread, SIGNAL(finished()), m_workerThread, SLOT(deleteLater()));
             if (!ret)
                 qWarning() << "Failed to connect deleteLater() to the m_workerThread finished signal";
             // startWorkerThread signal comes from an Android layer callback that resides down in

=== modified file 'src/audiocapture.cpp'
--- src/audiocapture.cpp	2014-07-31 16:44:03 +0000
+++ src/audiocapture.cpp	2014-12-03 22:17:37 +0000
@@ -95,6 +95,13 @@
                 && bytesWritten == readSize
                 && !m_flagExit);
 
+    // Make sure that Pulse stops reading the microphone when recording stops
+    if (m_paStream != NULL)
+    {
+        pa_simple_free(m_paStream);
+        m_paStream = NULL;
+    }
+
     Q_EMIT finished();
 }