Merge commit 'edadcfadf71ac23d301a1b6fb186883d' into next

6 files changed, 184 insertions, 60 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0a3a9be..1ddae18 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,42 @@
+2009-03-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Added loading status to the log's plugin list.
+        set_gst_plugin_path now compiles for windows.
+        * linden/indra/newview/llappviewer.cpp:
+        Removed unnecessary headers.
+
+
+        * linden/indra/cmake/00-Common.cmake
+        Added VS optimizations to cmake
+        Added flag for multi-core compiling in VS2005
+
+
+2009-03-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Improved set_gst_plugin_path, more comprehensive path.
+        Also tried to tidy up a bit.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Moved Windows GST_PLUGIN_PATH setup to LLMediaImplGStreamer.
+        LLAppViewer::gst_plugin_path -->
+           LLMediaImplGStreamer::set_gst_plugin_path
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.h:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Print out the plugins gstreamer finds, for debugging.
+
+
 2009-03-27  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index c41591f..27838d6 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -57,6 +57,21 @@ if (WINDOWS)
       /Zc:wchar_t-
       )
   endif (MSVC80 OR MSVC90)
+
+  # VS optimization flags
+  if(MSVC80)
+
+    set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
+
+    set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
+      CACHE STRING "C++ compiler release options" FORCE)
+
+  add_definitions(
+      /MP${NUMBER_OF_CORES}
+      )
+
+  endif (MSVC80)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index e38dc29..952e22f 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -48,6 +48,8 @@ extern "C" {
 
 #if LL_WINDOWS
         #pragma warning(default : 4244)
+#include <direct.h>
+#include <stdlib.h>
 #endif
 
 #include "llmediamanager.h"
@@ -175,6 +177,8 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 // Init the glib type system - we need it.
                 g_type_init();
 
+                set_gst_plugin_path();
+
                 // Protect against GStreamer resetting the locale, yuck.
                 static std::string saved_locale;
                 saved_locale = setlocale(LC_ALL, NULL);
@@ -189,12 +193,89 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
 
+
+                // List the plugins GStreamer can find
+                LL_DEBUGS("MediaImpl") << "Found GStreamer plugins:" << LL_ENDL;
+                GList *list;
+                GstRegistry *registry = gst_registry_get_default();
+                std::string loaded = "";
+                for (list = gst_registry_get_plugin_list(registry);
+                     list != NULL;
+                     list = g_list_next(list))
+                {        
+                        GstPlugin *list_plugin = (GstPlugin *)list->data;
+                        (bool)gst_plugin_is_loaded(list_plugin) ? loaded = "Yes" : loaded = "No";
+                        LL_DEBUGS("MediaImpl") << gst_plugin_get_name(list_plugin) << ", loaded? " << loaded << LL_ENDL;
+                }
+                gst_plugin_list_free(list);
+
+
                 done_init = true;
         }
         return true;
 }
 
 
+void LLMediaImplGStreamer::set_gst_plugin_path()
+{
+        // Only needed for Windows.
+        // Linux sets in wrapper.sh, Mac sets in Info-Imprudence.plist
+#ifdef LL_WINDOWS
+
+        char* imp_cwd;
+
+        // Get the current working directory: 
+        imp_cwd = _getcwd(NULL,0);
+
+        if(imp_cwd == NULL)
+        {
+                LL_DEBUGS("MediaImpl") << "_getcwd failed, not setting GST_PLUGIN_PATH."
+                                         << LL_ENDL;
+        }
+        else
+        {
+                LL_DEBUGS("MediaImpl") << "Imprudence is installed at "
+                                         << imp_cwd << LL_ENDL;
+
+                // Grab the current path, if it's set.
+                std::string old_plugin_path = "";
+                char *old_path = getenv("GST_PLUGIN_PATH");
+                if(old_path == NULL)
+                {
+                        LL_DEBUGS("MediaImpl") << "Did not find user-set GST_PLUGIN_PATH."
+                                                 << LL_ENDL;
+                }
+                else
+                {
+                        old_plugin_path = ";" + std::string( old_path );
+                }
+
+
+                // Search both Imprudence and Imprudence\lib\gstreamer-plugins.
+                // If those fail, search the path the user has set, if any.
+                std::string plugin_path =
+                  "GST_PLUGIN_PATH=" +
+                  std::string(imp_cwd) + "\\lib\\gstreamer-plugins;" +
+                  std::string(imp_cwd) +
+                  old_plugin_path;
+
+                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
+                // Returns 0 on success
+                if(_putenv( (char*)plugin_path.c_str() ))
+                {       
+                        LL_WARNS("MediaImpl") << "Setting environment variable failed!" << LL_ENDL;
+                }
+                else
+                {
+                        LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to "
+                                                                         << getenv("GST_PLUGIN_PATH") << LL_ENDL;
+                }
+        }
+
+#endif //LL_WINDOWS
+}
+
+
 bool LLMediaImplGStreamer::closedown()
 {
         return true;
@@ -572,20 +653,23 @@ bool LLMediaImplGStreamer::stop()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin));
-        gst_object_unref(pipeline);
-        
-        gst_element_set_state(pipeline, GST_STATE_READY);
+        GstStateChangeReturn state_change;
 
-        if (mState == GST_STATE_PLAYING)
-                mState = GST_STATE_VOID_PENDING;
-        else
-                mState = GST_STATE_READY; 
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_READY);
 
-        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;
+        LL_DEBUGS("MediaImpl") << "result: " 
+                                                        << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
-        return true;
+        if (state_change == GST_STATE_CHANGE_FAILURE)
+        {
+                LL_WARNS("MediaImpl") << "could not stop stream!" << LL_ENDL;
+                return false;
+        }
+        else
+        {
+                mState = GST_STATE_READY;
+                return true;
+        }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -597,25 +681,28 @@ bool LLMediaImplGStreamer::play()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin));
-        gst_object_unref(pipeline);
-        
-        gst_element_set_state(pipeline, GST_STATE_PLAYING);
-        mState = GST_STATE_PLAYING;
-        /*gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
-        mState = GST_STATE_PLAYING;*/
+        GstStateChangeReturn state_change;
 
-        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;
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
+
+        LL_DEBUGS("MediaImpl") << "result: " 
+                                                        << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
         // Check to make sure playing was successful. If not, stop.
+        // NOTE: state_change is almost always GST_STATE_CHANGE_ASYNC
         if (state_change == GST_STATE_CHANGE_FAILURE)
         {
-                setStatus(LLMediaBase::STATUS_STOPPED);
+                // If failing from a bad stream, go into pending state
+                // (this is stopped at the callback)
+                mState = GST_STATE_VOID_PENDING;
                 stop();
+                return false;
+        }
+        else
+        {
+                mState = GST_STATE_PLAYING;
+                return true;
         }
-
-        return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -627,13 +714,23 @@ bool LLMediaImplGStreamer::pause()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        gst_element_set_state(mPlaybin, GST_STATE_PAUSED);
-        mState = GST_STATE_PAUSED;
-        
-        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;
+        GstStateChangeReturn state_change;
 
-        return true;
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_PAUSED);
+
+        LL_DEBUGS("MediaImpl") << "result: " 
+                                                        << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
+
+        if (state_change == GST_STATE_CHANGE_FAILURE)
+        {
+                LL_WARNS("MediaImpl") << "could not pause stream!" << LL_ENDL;
+                return false;
+        }
+        else
+        {
+                mState = GST_STATE_PAUSED;
+                return true;
+        }
 };
 
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index dec970a..2918416 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -66,6 +66,9 @@ class LLMediaImplGStreamer:
                 static bool startup( LLMediaManagerData* init_data );
                 static bool closedown();
 
+                // Sets GST_PLUGIN_PATH env var for GStreamer.
+                static void set_gst_plugin_path();
+
                 /* virtual */ std::string getVersion();
                 /* virtual */ bool navigateTo( const std::string url );
                 /* virtual */ bool updateMedia();
@@ -79,6 +82,7 @@ class LLMediaImplGStreamer:
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
         private:
+
                 // misc
                 bool unload();
                 bool pause();
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 15ce1a3..b2bfccf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -75,9 +75,6 @@
 
 #if LL_WINDOWS
         #include "llwindebug.h"
-        #include <direct.h>
-        #include <errno.h>
-        #include <stdlib.h>
 #endif
 
 #if LL_WINDOWS
@@ -320,30 +317,6 @@ std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
 
-void LLAppViewer::gst_plugin_path()
-{
-#ifdef LL_WINDOWS
-        char* buffer;
-
-        // Get the current working directory: 
-        if((buffer = _getcwd(NULL,0)) == NULL)
-        {
-                LL_INFOS("InitInfo") << "_getcwd error" << LL_ENDL;
-        }
-        else
-        {
-                LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL;
-                
-                std::string plugin_path = "GST_PLUGIN_PATH=" + std::string(buffer) + "\\lib\\gstreamer-plugins";
-
-                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
-                const char* gst_plugin_path = plugin_path.c_str();
-                putenv(gst_plugin_path);
-                LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL;
-        }
-#endif //LL_WINDOWS
-}
-
 void idle_afk_check()
 {
         // check idle timers
@@ -643,8 +616,6 @@ bool LLAppViewer::init()
         LL_VERSION_PATCH, 
         LL_VERSION_BUILD );
 
-        gst_plugin_path();
-
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 2083a93..58dc835 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -138,8 +138,6 @@ public:
 
 protected:
 
-        void gst_plugin_path(); // Sets GST_PLUGIN_PATH environment variable for GStreamer.
-
         virtual bool initWindow(); // Initialize the viewer's window.
         virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
         virtual void initConsole() {}; // Initialize OS level debugging console.