diff options
| author | McCabe Maxsted | 2009-03-27 20:36:13 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-03-27 20:36:13 -0700 |
| commit | 1f8e02f1bff0e38e692e64be9bc1ae413fa62787 (patch) | |
| tree | 37670eab052f78faae7ec7fd0af9230d209e20da /linden | |
| parent | Merge branch 'gst-revamp' into lineendings (diff) | |
| download | meta-impy-1f8e02f1bff0e38e692e64be9bc1ae413fa62787.zip meta-impy-1f8e02f1bff0e38e692e64be9bc1ae413fa62787.tar.gz meta-impy-1f8e02f1bff0e38e692e64be9bc1ae413fa62787.tar.bz2 meta-impy-1f8e02f1bff0e38e692e64be9bc1ae413fa62787.tar.xz | |
Fixed video streams freezing the viewer
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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() | |||
| 582 | else | 582 | else |
| 583 | mState = GST_STATE_READY; | 583 | mState = GST_STATE_READY; |
| 584 | 584 | ||
| 585 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 585 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5); |
| 586 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; | 586 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; |
| 587 | 587 | ||
| 588 | return true; | 588 | return true; |
| @@ -605,7 +605,7 @@ bool LLMediaImplGStreamer::play() | |||
| 605 | /*gst_element_set_state(mPlaybin, GST_STATE_PLAYING); | 605 | /*gst_element_set_state(mPlaybin, GST_STATE_PLAYING); |
| 606 | mState = GST_STATE_PLAYING;*/ | 606 | mState = GST_STATE_PLAYING;*/ |
| 607 | 607 | ||
| 608 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 608 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5); |
| 609 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; | 609 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; |
| 610 | 610 | ||
| 611 | // Check to make sure playing was successful. If not, stop. | 611 | // Check to make sure playing was successful. If not, stop. |
| @@ -630,7 +630,7 @@ bool LLMediaImplGStreamer::pause() | |||
| 630 | gst_element_set_state(mPlaybin, GST_STATE_PAUSED); | 630 | gst_element_set_state(mPlaybin, GST_STATE_PAUSED); |
| 631 | mState = GST_STATE_PAUSED; | 631 | mState = GST_STATE_PAUSED; |
| 632 | 632 | ||
| 633 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE); | 633 | GstStateChangeReturn state_change = gst_element_get_state(mPlaybin, NULL, NULL, GST_MSECOND*5); |
| 634 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; | 634 | LL_DEBUGS("MediaImpl") << "get_state: " << gst_element_state_change_return_get_name(state_change) << LL_ENDL; |
| 635 | 635 | ||
| 636 | return true; | 636 | return true; |