aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-30 00:22:08 -0700
committerMcCabe Maxsted2009-01-30 00:22:08 -0700
commit4cd1e71f791a3e760da4f3a5a1ba7ebca90d170c (patch)
tree27b9026d3d8092ba376cfc5b624d2f9149706afd /linden/indra/llmedia
parentPlugin path set via string (diff)
downloadmeta-impy-4cd1e71f791a3e760da4f3a5a1ba7ebca90d170c.zip
meta-impy-4cd1e71f791a3e760da4f3a5a1ba7ebca90d170c.tar.gz
meta-impy-4cd1e71f791a3e760da4f3a5a1ba7ebca90d170c.tar.bz2
meta-impy-4cd1e71f791a3e760da4f3a5a1ba7ebca90d170c.tar.xz
Removed spammy gstreamer debug messages
Diffstat (limited to 'linden/indra/llmedia')
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d889f6f..18afc45 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -248,7 +248,9 @@ static const char* get_gst_state_name(GstState state)
248//static 248//static
249gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gpointer data) 249gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gpointer data)
250{ 250{
251#ifdef LL_GST_REPORT_STATE_CHANGES
251 LL_DEBUGS("MediaCallback") << "Got GST message type: " << LLGST_MESSAGE_TYPE_NAME (message) << LL_ENDL; 252 LL_DEBUGS("MediaCallback") << "Got GST message type: " << LLGST_MESSAGE_TYPE_NAME (message) << LL_ENDL;
253#endif
252 254
253 LLMediaImplGStreamer *impl = (LLMediaImplGStreamer*)data; 255 LLMediaImplGStreamer *impl = (LLMediaImplGStreamer*)data;
254 256
@@ -261,7 +263,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
261 { 263 {
262 gint percent = 0; 264 gint percent = 0;
263 llgst_message_parse_buffering(message, &percent); 265 llgst_message_parse_buffering(message, &percent);
266#ifdef LL_GST_REPORT_STATE_CHANGES
264 LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL; 267 LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL;
268#endif
265 LLMediaEvent event( impl, percent ); 269 LLMediaEvent event( impl, percent );
266 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event ); 270 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
267 } 271 }
@@ -286,11 +290,15 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
286 case GST_STATE_VOID_PENDING: 290 case GST_STATE_VOID_PENDING:
287 break; 291 break;
288 case GST_STATE_NULL: 292 case GST_STATE_NULL:
293#ifdef LL_GST_REPORT_STATE_CHANGES
289 LL_DEBUGS("MediaImpl") << "State changed to NULL" << LL_ENDL; 294 LL_DEBUGS("MediaImpl") << "State changed to NULL" << LL_ENDL;
295#endif
290 if (impl->getState() == GST_STATE_PLAYING) 296 if (impl->getState() == GST_STATE_PLAYING)
291 { // We got stoped by gstremer... 297 { // We got stoped by gstremer...
292 impl->play(); 298 impl->play();
299#ifdef LL_GST_REPORT_STATE_CHANGES
293 LL_DEBUGS("MediaImpl") << "Trying to restart." << LL_ENDL; 300 LL_DEBUGS("MediaImpl") << "Trying to restart." << LL_ENDL;
301#endif
294 } 302 }
295 break; 303 break;
296 case GST_STATE_READY: 304 case GST_STATE_READY:
@@ -476,7 +484,9 @@ bool LLMediaImplGStreamer::updateMedia()
476#endif 484#endif
477 || NULL == mPlaybin) 485 || NULL == mPlaybin)
478 { 486 {
487#ifdef LL_GST_REPORT_STATE_CHANGES
479 LL_DEBUGS("MediaImpl") << "dead media..." << LL_ENDL; 488 LL_DEBUGS("MediaImpl") << "dead media..." << LL_ENDL;
489#endif
480 return false; 490 return false;
481 } 491 }
482 492
@@ -528,7 +538,9 @@ bool LLMediaImplGStreamer::updateMedia()
528 GST_OBJECT_LOCK(mVideoSink); 538 GST_OBJECT_LOCK(mVideoSink);
529 if (mVideoSink->retained_frame_ready) 539 if (mVideoSink->retained_frame_ready)
530 { 540 {
541#ifdef LL_GST_REPORT_STATE_CHANGES
531 LL_DEBUGS("MediaImpl") <<"NEW FRAME " << LL_ENDL; 542 LL_DEBUGS("MediaImpl") <<"NEW FRAME " << LL_ENDL;
543#endif
532 if (mVideoSink->retained_frame_width != getMediaWidth() || 544 if (mVideoSink->retained_frame_width != getMediaWidth() ||
533 mVideoSink->retained_frame_height != getMediaHeight()) 545 mVideoSink->retained_frame_height != getMediaHeight())
534 // *TODO: also check for change in format 546 // *TODO: also check for change in format