First LL update of plugins, mainly documentation

1 files changed, 17 insertions, 18 deletions

diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index 25e96d4..ef8ff58 100644
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -52,7 +52,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_slvideo_debug);
 #define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS
 
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
-    (gchar*)"sink",
+    "sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (SLV_ALLCAPS)
@@ -106,11 +106,10 @@ gst_slvideo_show_frame (GstBaseSink * bsink, GstBuffer * buf)
         
         slvideo = GST_SLVIDEO(bsink);
         
-#if 0
-        fprintf(stderr, "\n\ntransferring a frame of %dx%d <- %p (%d)\n\n",
-                slvideo->width, slvideo->height, GST_BUFFER_DATA(buf),
-                slvideo->format);
-#endif
+        DEBUGMSG("transferring a frame of %dx%d <- %p (%d)",
+                 slvideo->width, slvideo->height, GST_BUFFER_DATA(buf),
+                 slvideo->format);
+
         if (GST_BUFFER_DATA(buf))
         {
                 // copy frame and frame info into neutral territory
@@ -335,7 +334,7 @@ gst_slvideo_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
 #define MAXDEPTHHACK 4
         
         GST_OBJECT_LOCK(slvideo);
-        if (slvideo->resize_forced)
+        if (slvideo->resize_forced_always) // app is giving us a fixed size to work with
         {
                 gint slwantwidth, slwantheight;
                 slwantwidth = slvideo->resize_try_width;
@@ -384,6 +383,8 @@ gst_slvideo_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
                 }
         }
 
+        GST_OBJECT_UNLOCK(slvideo);
+
         if (!made_bufferdata_ptr) // need to fallback to malloc at original size
         {
                 GST_BUFFER_SIZE(newbuf) = width * height * MAXDEPTHHACK;
@@ -392,8 +393,6 @@ gst_slvideo_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
                 llgst_buffer_set_caps (GST_BUFFER_CAST(newbuf), caps);
         }
 
-        GST_OBJECT_UNLOCK(slvideo);
-
         *buf = GST_BUFFER_CAST(newbuf);
 
         return GST_FLOW_OK;
@@ -457,7 +456,7 @@ gst_slvideo_init (GstSLVideo * filter,
         filter->retained_frame_format = SLV_PF_UNKNOWN;
         GstCaps *caps = llgst_caps_from_string (SLV_ALLCAPS);
         llgst_caps_replace (&filter->caps, caps);
-        filter->resize_forced = false;
+        filter->resize_forced_always = false;
         filter->resize_try_width = -1;
         filter->resize_try_height = -1;
         GST_OBJECT_UNLOCK(filter);
@@ -498,12 +497,12 @@ gst_slvideo_get_property (GObject * object, guint prop_id,
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-        DEBUGMSG("\n\n\nPLUGIN INIT\n\n\n");
+        DEBUGMSG("PLUGIN INIT");
 
         GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, (gchar*)"private-slvideo-plugin",
                                  0, (gchar*)"Second Life Video Sink");
 
-        return llgst_element_register (plugin, (gchar*)"private-slvideo",
+        return llgst_element_register (plugin, "private-slvideo",
                                        GST_RANK_NONE, GST_TYPE_SLVIDEO);
 }
 
@@ -519,14 +518,14 @@ void gst_slvideo_init_class (void)
         // this macro quietly refers to PACKAGE internally
         static GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
                                   GST_VERSION_MINOR,
-                                  (gchar*)"private-slvideoplugin",
-                                  (gchar*)"SL Video sink plugin",
-                                  plugin_init, (gchar*)"0.1", (gchar*)GST_LICENSE_UNKNOWN,
-                                  (gchar*)"Second Life",
-                                  (gchar*)"http://www.secondlife.com/");
+                                  "private-slvideoplugin", 
+                                  "SL Video sink plugin",
+                                  plugin_init, "0.1", GST_LICENSE_UNKNOWN,
+                                  "Second Life",
+                                  "http://www.secondlife.com/");
 #undef PACKAGE
         ll_gst_plugin_register_static (&gst_plugin_desc);
-        DEBUGMSG(stderr, "\n\n\nCLASS INIT\n\n\n");
+        DEBUGMSG("CLASS INIT");
 }
 
 #endif // LL_GSTREAMER010_ENABLED