Fixed merge conflicts

5 files changed, 102 insertions, 2 deletions

diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index b5b9420..bf54a22 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -61,6 +61,21 @@ class LLMediaBase
                 // undoes everything init() didm called by the media manager when destroying a source
                 virtual bool reset() = 0;
 
+
+                /* Mirrors GStreamer debug levels. */
+                enum EDebugLevel {
+                  DEBUG_LEVEL_NONE = 0,
+                  DEBUG_LEVEL_ERROR,
+                  DEBUG_LEVEL_WARNING,
+                  DEBUG_LEVEL_INFO,
+                  DEBUG_LEVEL_DEBUG,
+                  DEBUG_LEVEL_LOG,
+                  DEBUG_LEVEL_COUNT,
+                };
+
+    /* Set the debug verbosity level. Only implemented for GStreamer. */
+    virtual bool setDebugLevel( EDebugLevel level ) = 0;
+
                 // accessor for MIME type
                 virtual bool setMimeType( const std::string mime_type ) = 0;
                 virtual std::string getMimeType() const = 0;
diff --git a/linden/indra/llmedia/llmediaimplcommon.cpp b/linden/indra/llmedia/llmediaimplcommon.cpp
index abb61e1..48b3973 100644
--- a/linden/indra/llmedia/llmediaimplcommon.cpp
+++ b/linden/indra/llmedia/llmediaimplcommon.cpp
@@ -66,7 +66,8 @@ LLMediaImplCommon::LLMediaImplCommon() :
         mCommand( LLMediaBase::COMMAND_NONE ),
         mStatus( LLMediaBase::STATUS_UNKNOWN ),
         mVolume( 0 ),
-        mLooping( false )
+        mLooping( false ),
+        mDebugLevel( LLMediaBase::DEBUG_LEVEL_NONE )
 {
 }
 
@@ -92,6 +93,15 @@ bool LLMediaImplCommon::reset()
 
 ////////////////////////////////////////////////////////////////////////////////
 // virtual (derives from LLMediaBase)
+bool LLMediaImplCommon::setDebugLevel( LLMediaBase::EDebugLevel level )
+{
+        mDebugLevel = level;
+
+        return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual (derives from LLMediaBase)
 bool LLMediaImplCommon::setMimeType( const std::string mime_type )
 {
         mMimeType = mime_type;
diff --git a/linden/indra/llmedia/llmediaimplcommon.h b/linden/indra/llmedia/llmediaimplcommon.h
index aa6c4d5..8a726f1 100644
--- a/linden/indra/llmedia/llmediaimplcommon.h
+++ b/linden/indra/llmedia/llmediaimplcommon.h
@@ -54,6 +54,7 @@ class LLMediaImplCommon :
                 // housekeeping
                 virtual bool init();
                 virtual bool reset();
+                virtual bool setDebugLevel( LLMediaBase::EDebugLevel level );
                 virtual bool setMimeType( const std::string url );
                 virtual std::string getMimeType() const;
                 virtual std::string getMediaURL() const;
@@ -156,6 +157,7 @@ class LLMediaImplCommon :
                 LLMediaBase::ECommand mCommand;
                 LLMediaBase::EStatus mStatus;
                 bool mLooping;
+                LLMediaBase::EDebugLevel mDebugLevel;
 };
 
 #endif  // LLMEDIAIMPLCOMMON_H
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 8ffb7c8..271bb5e 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -189,7 +189,11 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                         return false;
                 }
                 setlocale(LC_ALL, saved_locale.c_str() );
-                
+
+                // Set up logging facilities
+                gst_debug_remove_log_function( gst_debug_log_default );
+                gst_debug_add_log_function( gstreamer_log, NULL );
+
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
 
@@ -276,12 +280,64 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
 }
 
 
+void LLMediaImplGStreamer::gstreamer_log(GstDebugCategory *category,
+                                         GstDebugLevel level,
+                                         const gchar *file,
+                                         const gchar *function,
+                                         gint line,
+                                         GObject *object,
+                                         GstDebugMessage *message,
+                                         gpointer data)
+{
+        std::stringstream log(std::stringstream::out);
+
+        // Log format example:
+        // 
+        // GST_ELEMENT_PADS: removing pad 'sink' (in gstelement.c:757:gst_element_remove_pad)
+        // 
+        log << gst_debug_category_get_name( category ) << ": "
+            << gst_debug_message_get(message) << " "
+            << "(in " << file << ":" << line << ":" << function << ")";
+
+        switch( level )
+        {
+                case GST_LEVEL_ERROR:
+                        LL_ERRS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_WARNING:
+                        LL_WARNS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_DEBUG:
+                        LL_DEBUGS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_INFO:
+                        LL_INFOS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                default:
+                        // Do nothing.
+                        break;
+        }
+}
+
+
 bool LLMediaImplGStreamer::closedown()
 {
         return true;
 }
 
 
+bool LLMediaImplGStreamer::setDebugLevel( LLMediaBase::EDebugLevel level )
+{
+        // Do parent class stuff.
+        LLMediaImplCommon::setDebugLevel(level);
+
+        // Set GStreamer verbosity.
+        gst_debug_set_default_threshold( (GstDebugLevel)level );
+
+        return true;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Uncomment the line below to enable spammy debug data.
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 2918416..37eaf53 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -69,6 +69,23 @@ class LLMediaImplGStreamer:
                 // Sets GST_PLUGIN_PATH env var for GStreamer.
                 static void set_gst_plugin_path();
 
+                /* virtual */ bool setDebugLevel( LLMediaBase::EDebugLevel level );
+
+                // Function given to GStreamer for handling debug messages
+                static void gstreamer_log(GstDebugCategory *category,
+                                          GstDebugLevel level,
+                                          const gchar *file,
+                                          const gchar *function,
+                                          gint line,
+                                          GObject *object,
+                                          GstDebugMessage *message,
+                                          gpointer data)
+#if __GNUC__
+                                          // recommended by the gstreamer docs
+                                          G_GNUC_NO_INSTRUMENT
+#endif
+                                          ;
+
                 /* virtual */ std::string getVersion();
                 /* virtual */ bool navigateTo( const std::string url );
                 /* virtual */ bool updateMedia();