From 1f8e02f1bff0e38e692e64be9bc1ae413fa62787 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 27 Mar 2009 20:36:13 -0700
Subject: Fixed video streams freezing the viewer

---
 linden/indra/llmedia/llmediaimplgstreamer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 98d6459..e38dc29 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -582,7 +582,7 @@ bool LLMediaImplGStreamer::stop()
 	else
 		mState = GST_STATE_READY; 
 
-	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
+	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5);
 	LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
 	return true;
@@ -605,7 +605,7 @@ bool LLMediaImplGStreamer::play()
 	/*gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
 	mState = GST_STATE_PLAYING;*/
 
-	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
+	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5);
 	LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
 	// Check to make sure playing was successful. If not, stop.
@@ -630,7 +630,7 @@ bool LLMediaImplGStreamer::pause()
 	gst_element_set_state(mPlaybin, GST_STATE_PAUSED);
 	mState = GST_STATE_PAUSED;
 	
-	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
+	GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5);
 	LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
 	return true;
-- 
cgit v1.1