Merge lp:~rsalveti/kubuntu-packaging/qgstreamercapturesession_avoid_race_eos into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

[Ricardo Salveti]

Avoid races when sending EOS, making sure pipeline is in playing state first (LP: #1433563)

Avoid races when sending EOS, making sure pipeline is in playing state first (LP: #1433563)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtmultimedia-opensource-src-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtmultimedia-opensource-src-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtmultimedia-opensource-src-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtmultimedia-opensource-src-ci/5/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-18 10:17:52 +0000
+++ debian/changelog	2015-04-21 05:23:35 +0000
@@ -1,3 +1,11 @@
+qtmultimedia-opensource-src (5.4.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/debian/patches/qgstreamercapturesession_avoid_race_eos.patch:
+    - Avoid races when sending EOS, making sure pipeline is in playing state
+      first (LP: #1433563)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Sun, 19 Apr 2015 20:13:29 -0300
+
 qtmultimedia-opensource-src (5.4.1-1ubuntu1) vivid; urgency=medium
 
   * New upstream release.

=== added file 'debian/patches/qgstreamercapturesession_avoid_race_eos.patch'
--- debian/patches/qgstreamercapturesession_avoid_race_eos.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/qgstreamercapturesession_avoid_race_eos.patch	2015-04-21 05:23:35 +0000
@@ -0,0 +1,24 @@
+Author: Ricardo Salveti de Araujo <[e-mail]>
+Title: Avoid races when sending EOS, making sure pipeline is in playing state first
+Forwarded: yes
+Bug: https://bugreports.qt.io/browse/QTBUG-45707
+Bug-Ubuntu: https://launchpad.net/bugs/1433563
+
+Index: qtmultimedia-opensource-src-5.4.1/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+===================================================================
+--- qtmultimedia-opensource-src-5.4.1.orig/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
++++ qtmultimedia-opensource-src-5.4.1/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+@@ -828,11 +828,11 @@ void QGstreamerCaptureSession::setState(
+             if (!m_waitingForEos) {
+                 m_waitingForEos = true;
+                 //qDebug() << "Waiting for EOS";
++                // Unless gstreamer is in GST_STATE_PLAYING our EOS message will not be received.
++                gst_element_set_state(m_pipeline, GST_STATE_PLAYING);
+                 //with live sources it's necessary to send EOS even to pipeline
+                 //before going to STOPPED state
+                 gst_element_send_event(m_pipeline, gst_event_new_eos());
+-                // Unless gstreamer is in GST_STATE_PLAYING our EOS message will not be received.
+-                gst_element_set_state(m_pipeline, GST_STATE_PLAYING);
+ 
+                 return;
+             } else {

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-02-09 11:36:01 +0000
+++ debian/patches/series	2015-04-21 05:23:35 +0000
@@ -1,3 +1,4 @@
 rpath_nonlinux.diff
 skip_failing_tests.patch
 adding_media_role_property.patch
+qgstreamercapturesession_avoid_race_eos.patch