Merge commit 'origin/gst-thread-fix' into mac

2 files changed, 36 insertions, 31 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 7eb2b7b..885ba7f 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -591,9 +591,6 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
 
         mState = GST_STATE_READY;
 
-        // navigateTo implicitly plays, too.
-        play();
-
         return true;
 }
 
@@ -792,6 +789,13 @@ bool LLMediaImplGStreamer::play()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
+
+        if( getState() == GST_STATE_PLAYING )
+        {
+                LL_DEBUGS("MediaImpl") << "... but already playing." << LL_ENDL;
+                return true;
+        }
+
         // Clean up the existing thread, if any.
         if( mPlayThread != NULL && mPlayThread->isStopped())
         {
@@ -813,9 +817,6 @@ bool LLMediaImplGStreamer::play()
 
 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);
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 32e6bd1..d1566e3 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -57,6 +57,8 @@ class LLMediaImplMaker;
 class LLMediaImplGStreamer:
         public LLMediaImplCommon
 {
+        friend class LLGstPlayThread;
+
         public:
                 LLMediaImplGStreamer ();
                 virtual ~LLMediaImplGStreamer ();
@@ -95,33 +97,35 @@ class LLMediaImplGStreamer:
                 /* virtual */ int getTextureFormatType() const;
                 /* virtual */ int getTextureFormatInternal() const;
                 /* virtual */ bool seek( double time );
-            /* virtual */ bool setVolume( float volume );
+                /* virtual */ bool setVolume( float volume );
 
-                void startPlay();
+                LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
+        protected:
+
+                void startPlay();
 
-                LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
         private:
 
-                // misc
-                bool unload();
-                bool pause();
-                bool stop();
-                bool play();
-                        
-                static gboolean bus_callback (GstBus     *bus,
-                                              GstMessage *message,
-                                              gpointer    data);
-                unsigned char* mediaData;
-                int mMediaRowbytes;
+                // misc
+                bool unload();
+                bool pause();
+                bool stop();
+                bool play();
+
+                static gboolean bus_callback (GstBus     *bus,
+                                              GstMessage *message,
+                                              gpointer    data);
 
-                int mTextureFormatPrimary;
-                int mTextureFormatType;
+                unsigned char* mediaData;
+                int mMediaRowbytes;
+                int mTextureFormatPrimary;
+                int mTextureFormatType;
 
-                // GStreamer-specific
-                GMainLoop *mPump; // event pump for this media
-                GstElement *mPlaybin;
+                // GStreamer-specific
+                GMainLoop *mPump; // event pump for this media
+                GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
                 GstState mState;
                 GstState getState() const { return mState; }
@@ -131,12 +135,12 @@ class LLMediaImplGStreamer:
 
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker
 {
-public: 
-        LLMediaImplGStreamerMaker();
-        LLMediaImplGStreamer* create()
-        {
-                return new LLMediaImplGStreamer();
-        }
+        public: 
+                LLMediaImplGStreamerMaker();
+                LLMediaImplGStreamer* create()
+                {
+                        return new LLMediaImplGStreamer();
+                }
 };
 
 /////////////////////////////////////////////////////////////////////////