Merge branch gst-thread into gst-revamp

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

6 files changed, 175 insertions, 8 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a4c3415..f99ebae 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,26 @@
+2009-04-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        LLMediaImplGStreamer creates new thread for playing.
+        This keeps the viewer responsive while GStreamer does its thing.
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
+        * linden/indra/llmedia/llgstplaythread.cpp: 
+        Added LLGstPlayThread class.
+        * linden/indra/llmedia/llgstplaythread.h: 
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt: 
+        Ditto.
+
+
+2009-04-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Refactored the heart of the GST play code to startPlay().
+
+
 2009-04-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llviewermedia.cpp:
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 0440153..0e5b261 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -31,6 +31,7 @@ set(llmedia_SOURCE_FILES
     llmediamanager.cpp
     llmediaimplgstreamer.cpp
     llmediaimplgstreamervidplug.cpp
+    llgstplaythread.cpp
     )
     
 set(llmedia_HEADER_FILES
@@ -47,6 +48,7 @@ set(llmedia_HEADER_FILES
     llmediaobserver.h
     llmediaimplgstreamer.h
     llmediaimplgstreamervidplug.h
+    llgstplaythread.h
     )
 
   # Work around a bad interaction between broken gstreamer headers and
diff --git a/linden/indra/llmedia/llgstplaythread.cpp b/linden/indra/llmedia/llgstplaythread.cpp
new file mode 100644
index 0000000..152f9d9
--- /dev/null
+++ b/linden/indra/llmedia/llgstplaythread.cpp
@@ -0,0 +1,54 @@
+/** 
+ * @file llgstplaythread.cpp
+ * @author Jacek Antonelli
+ * @brief GStreamer playback management thread class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Jacek Antonelli
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code.  View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * $/LicenseInfo$
+ */
+
+#include "llgstplaythread.h"
+#include "llmediaimplgstreamer.h"
+
+LLGstPlayThread::
+LLGstPlayThread( LLMediaImplCommon *impl,
+                 const std::string& name, apr_pool_t *poolp ):
+        LLThread( name, poolp ),
+        mMediaImpl( impl )
+{
+}
+
+
+LLGstPlayThread::~LLGstPlayThread()
+{
+}
+
+
+// virtual
+void LLGstPlayThread::run()
+{
+        ((LLMediaImplGStreamer *)mMediaImpl)->startPlay();
+}
diff --git a/linden/indra/llmedia/llgstplaythread.h b/linden/indra/llmedia/llgstplaythread.h
new file mode 100644
index 0000000..c3c36a7
--- /dev/null
+++ b/linden/indra/llmedia/llgstplaythread.h
@@ -0,0 +1,62 @@
+/** 
+ * @file llgstplaythread.h
+ * @author Jacek Antonelli
+ * @brief GStreamer playback management thread class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Jacek Antonelli
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code.  View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * $/LicenseInfo$
+ */
+
+
+#ifndef LL_LLGSTPLAYTHREAD_H
+#define LL_LLGSTPLAYTHREAD_H
+
+#include "linden_common.h"
+
+#include "llthread.h"
+#include "llmediaimplcommon.h"
+
+class LLGstPlayThread: public LLThread
+{
+        public:
+
+                LLGstPlayThread( LLMediaImplCommon *impl,
+                                 const std::string& name, apr_pool_t *poolp );
+
+                ~LLGstPlayThread();
+
+                virtual void run();
+
+        private:
+
+                // Actually, this will really only be an LLMediaImplGStreamer.
+                // But we have to jump through some hoops to mutual pointer-holding.
+                // There may be a better way, but I don't have the motivation to find it.
+                LLMediaImplCommon *mMediaImpl;
+};
+
+
+#endif // LL_LLGSTPLAYTHREAD_H
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 271bb5e..7ae6b02 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -39,6 +39,7 @@
         #pragma warning(disable : 4244)
 #endif
 
+#include "linden_common.h"
 #include "llmediaimplgstreamer.h"
 
 extern "C" {
@@ -56,9 +57,8 @@ extern "C" {
 #include "llmediaimplregister.h"
 
 #include "llmediaimplgstreamervidplug.h"
+#include "llgstplaythread.h"
 
-#include "llerror.h"
-#include "linden_common.h"
 
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplGStreamerReg( "LLMediaImplGStreamer", new LLMediaImplGStreamerMaker() );
@@ -85,7 +85,8 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
-    mState( GST_STATE_NULL )
+        mState( GST_STATE_NULL ),
+        mPlayThread ( NULL )
 {
         startup( NULL );  // Startup gstreamer if it hasn't been already.
 
@@ -737,6 +738,30 @@ bool LLMediaImplGStreamer::play()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
+        // Clean up the existing thread, if any.
+        if( mPlayThread != NULL && mPlayThread->isStopped())
+        {
+                delete mPlayThread;
+                mPlayThread = NULL;
+        }
+
+        if( mPlayThread == NULL )
+        {
+                // Make a new thread to start playing. This keeps the viewer
+                // responsive while the stream is resolved and buffered.
+                mPlayThread = new LLGstPlayThread( (LLMediaImplCommon *)this, "GstPlayThread", NULL);
+                mPlayThread->start();
+        }
+
+        return true;
+}
+
+
+void LLMediaImplGStreamer::startPlay()
+{
+        GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin));
+        gst_object_unref(pipeline);
+        
         GstStateChangeReturn state_change;
 
         state_change = gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
@@ -753,11 +778,6 @@ bool LLMediaImplGStreamer::play()
                 // We also force a stop in case the operations don't sync
                 setStatus(LLMediaBase::STATUS_UNKNOWN);
                 stop();
-                return false;
-        }
-        else
-        {
-                return true;
         }
 }
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 37eaf53..32e6bd1 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -48,6 +48,7 @@ extern "C" {
 }
 
 #include "llmediaimplgstreamervidplug.h"
+#include "llgstplaythread.h"
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -96,6 +97,9 @@ class LLMediaImplGStreamer:
                 /* virtual */ bool seek( double time );
             /* virtual */ bool setVolume( float volume );
 
+                void startPlay();
+
+
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
         private:
@@ -121,6 +125,8 @@ class LLMediaImplGStreamer:
                 GstSLVideo *mVideoSink;
                 GstState mState;
                 GstState getState() const { return mState; }
+
+                LLGstPlayThread *mPlayThread;
 };
 
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker