From b4d03dc82f6d282582dda2137fadd54f97d3b9a7 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Wed, 25 Nov 2015 16:27:08 +0100
Subject: GStreamer: fix GstAppSrc usage.

Allow our GstAppSrc wrapper to be reconfigured with a new GstAppSrc
object. This is necessary because that object changes every time
playback is restarted, even for the same source. The consequence of
not allowing the reconfigure was that playback for a given qrc media
would only work the first time; any subsequent calls to play() would
not work since our wrapper wouldn't know about the new GstAppSrc object
and therefore wouldn't be able to produce any data.

Also improved management of the wrapper lifecycle.

Task-number: QTBUG-49531
Change-Id: I905afb6848cc7e9a563b4edc2c5875cdd7e53d21
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
---
 src/gsttools/qgstappsrc.cpp | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'src/gsttools')

diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp
index 66c384992..c2b2faeb1 100644
--- a/src/gsttools/qgstappsrc.cpp
+++ b/src/gsttools/qgstappsrc.cpp
@@ -41,7 +41,6 @@ QGstAppSrc::QGstAppSrc(QObject *parent)
     ,m_appSrc(0)
     ,m_sequential(false)
     ,m_maxBytes(0)
-    ,m_setup(false)
     ,m_dataRequestSize(~0)
     ,m_dataRequested(false)
     ,m_enoughData(false)
@@ -60,11 +59,13 @@ QGstAppSrc::~QGstAppSrc()
 
 bool QGstAppSrc::setup(GstElement* appsrc)
 {
-    if (m_setup || m_stream == 0 || appsrc == 0)
-        return false;
-
-    if (m_appSrc)
+    if (m_appSrc) {
         gst_object_unref(G_OBJECT(m_appSrc));
+        m_appSrc = 0;
+    }
+
+    if (!appsrc || !m_stream)
+        return false;
 
     m_appSrc = GST_APP_SRC(appsrc);
     gst_object_ref(G_OBJECT(m_appSrc));
@@ -79,32 +80,35 @@ bool QGstAppSrc::setup(GstElement* appsrc)
     gst_app_src_set_stream_type(m_appSrc, m_streamType);
     gst_app_src_set_size(m_appSrc, (m_sequential) ? -1 : m_stream->size());
 
-    return  m_setup = true;
+    return true;
 }
 
 void QGstAppSrc::setStream(QIODevice *stream)
 {
-    if (stream == 0)
-        return;
     if (m_stream) {
         disconnect(m_stream, SIGNAL(readyRead()), this, SLOT(onDataReady()));
         disconnect(m_stream, SIGNAL(destroyed()), this, SLOT(streamDestroyed()));
+        m_stream = 0;
     }
-    if (m_appSrc)
+
+    if (m_appSrc) {
         gst_object_unref(G_OBJECT(m_appSrc));
+        m_appSrc = 0;
+    }
 
     m_dataRequestSize = ~0;
     m_dataRequested = false;
     m_enoughData = false;
     m_forceData = false;
+    m_sequential = false;
     m_maxBytes = 0;
 
-    m_appSrc = 0;
-    m_stream = stream;
-    connect(m_stream, SIGNAL(destroyed()), SLOT(streamDestroyed()));
-    connect(m_stream, SIGNAL(readyRead()), this, SLOT(onDataReady()));
-    m_sequential = m_stream->isSequential();
-    m_setup = false;
+    if (stream) {
+        m_stream = stream;
+        connect(m_stream, SIGNAL(destroyed()), SLOT(streamDestroyed()));
+        connect(m_stream, SIGNAL(readyRead()), this, SLOT(onDataReady()));
+        m_sequential = m_stream->isSequential();
+    }
 }
 
 QIODevice *QGstAppSrc::stream() const
@@ -135,7 +139,7 @@ void QGstAppSrc::streamDestroyed()
 
 void QGstAppSrc::pushDataToAppSrc()
 {
-    if (!isStreamValid() || !m_setup)
+    if (!isStreamValid() || !m_appSrc)
         return;
 
     if (m_dataRequested && !m_enoughData) {
@@ -242,6 +246,9 @@ void QGstAppSrc::destroy_notify(gpointer data)
 
 void QGstAppSrc::sendEOS()
 {
+    if (!m_appSrc)
+        return;
+
     gst_app_src_end_of_stream(GST_APP_SRC(m_appSrc));
     if (isStreamValid() && !stream()->isSequential())
         stream()->reset();
-- 
cgit v1.2.3