llmediaplugins first step

1 files changed, 168 insertions, 84 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index f2c0e88..25e96d4 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -1,5 +1,5 @@
 /**
- * @file llmediaimplgstreamervidplug.h
+ * @file llmediaimplgstreamervidplug.cpp
  * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
@@ -30,7 +30,7 @@
  * $/LicenseInfo$
  */
 
-///#if LL_GSTREAMER_ENABLED
+#if LL_GSTREAMER010_ENABLED
 
 #include "linden_common.h"
 
@@ -38,30 +38,21 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideosink.h>
 
-#include "llthread.h"
+#include "llmediaimplgstreamer_syms.h"
+#include "llmediaimplgstreamertriviallogging.h"
 
 #include "llmediaimplgstreamervidplug.h"
 
+
 GST_DEBUG_CATEGORY_STATIC (gst_slvideo_debug);
 #define GST_CAT_DEFAULT gst_slvideo_debug
 
-/* Filter signals and args */
-enum
-{
-        /* FILL ME */
-        LAST_SIGNAL
-};
-
-enum
-{
-        ARG_0
-};
 
-#define SLV_SIZECAPS ", width=(int){1,2,4,8,16,32,64,128,256,512,1024}, height=(int){1,2,4,8,16,32,64,128,256,512,1024} "
-#define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS ";" GST_VIDEO_CAPS_BGRx SLV_SIZECAPS
+#define SLV_SIZECAPS ", width=(int)[1,2048], height=(int)[1,2048] "
+#define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS
 
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
-    "sink",
+    (gchar*)"sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS (SLV_ALLCAPS)
@@ -87,9 +78,9 @@ gst_slvideo_base_init (gpointer gclass)
         };
         GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
         
-        gst_element_class_add_pad_template (element_class,
-                              gst_static_pad_template_get (&sink_factory));
-        gst_element_class_set_details (element_class, &element_details);
+        llgst_element_class_add_pad_template (element_class,
+                              llgst_static_pad_template_get (&sink_factory));
+        llgst_element_class_set_details (element_class, &element_details);
 }
 
 
@@ -100,7 +91,7 @@ gst_slvideo_finalize (GObject * object)
         slvideo = GST_SLVIDEO (object);
         if (slvideo->caps)
         {
-                gst_caps_unref(slvideo->caps);
+                llgst_caps_unref(slvideo->caps);
         }
 
         G_OBJECT_CLASS(parent_class)->finalize (object);
@@ -111,7 +102,7 @@ static GstFlowReturn
 gst_slvideo_show_frame (GstBaseSink * bsink, GstBuffer * buf)
 {
         GstSLVideo *slvideo;
-        g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
+        llg_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
         
         slvideo = GST_SLVIDEO(bsink);
         
@@ -204,7 +195,7 @@ gst_slvideo_get_caps (GstBaseSink * bsink)
         GstSLVideo *slvideo;
         slvideo = GST_SLVIDEO(bsink);
         
-        return gst_caps_ref (slvideo->caps);
+        return llgst_caps_ref (slvideo->caps);
 }
 
 
@@ -214,42 +205,37 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
 {
         GstSLVideo *filter;
         GstStructure *structure;
-        GstCaps *intersection;
         
         GST_DEBUG ("set caps with %" GST_PTR_FORMAT, caps);
         
         filter = GST_SLVIDEO(bsink);
-        
-        intersection = gst_caps_intersect (filter->caps, caps);
-        if (gst_caps_is_empty (intersection))
-        {
-                // no overlap between our caps and requested caps
-                return FALSE;
-        }
-        gst_caps_unref(intersection);
-        
-        int width = 0;
-        int height = 0;
+
+        int width, height;
         gboolean ret;
         const GValue *fps;
         const GValue *par;
-        structure = gst_caps_get_structure (caps, 0);
-        ret = gst_structure_get_int (structure, "width", &width);
-        ret = ret && gst_structure_get_int (structure, "height", &height);
-        fps = gst_structure_get_value (structure, "framerate");
+        structure = llgst_caps_get_structure (caps, 0);
+        ret = llgst_structure_get_int (structure, "width", &width);
+        ret = ret && llgst_structure_get_int (structure, "height", &height);
+        fps = llgst_structure_get_value (structure, "framerate");
         ret = ret && (fps != NULL);
-        par = gst_structure_get_value (structure, "pixel-aspect-ratio");
+        par = llgst_structure_get_value (structure, "pixel-aspect-ratio");
         if (!ret)
                 return FALSE;
 
+        INFOMSG("** filter caps set with width=%d, height=%d", width, height);
+
+        GST_OBJECT_LOCK(filter);
+
         filter->width = width;
         filter->height = height;
-        filter->fps_n = gst_value_get_fraction_numerator(fps);
-        filter->fps_d = gst_value_get_fraction_denominator(fps);
+
+        filter->fps_n = llgst_value_get_fraction_numerator(fps);
+        filter->fps_d = llgst_value_get_fraction_denominator(fps);
         if (par)
         {
-                filter->par_n = gst_value_get_fraction_numerator(par);
-                filter->par_d = gst_value_get_fraction_denominator(par);
+                filter->par_n = llgst_value_get_fraction_numerator(par);
+                filter->par_d = llgst_value_get_fraction_denominator(par);
         }
         else
         {
@@ -259,16 +245,18 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
         GST_VIDEO_SINK_WIDTH(filter) = width;
         GST_VIDEO_SINK_HEIGHT(filter) = height;
         
+        // crufty lump - we *always* accept *only* RGBX now.
+        /*
         filter->format = SLV_PF_UNKNOWN;
-        if (0 == strcmp(gst_structure_get_name(structure),
+        if (0 == strcmp(llgst_structure_get_name(structure),
                         "video/x-raw-rgb"))
         {
                 int red_mask;
                 int green_mask;
                 int blue_mask;
-                gst_structure_get_int(structure, "red_mask", &red_mask);
-                gst_structure_get_int(structure, "green_mask", &green_mask);
-                gst_structure_get_int(structure, "blue_mask", &blue_mask);
+                llgst_structure_get_int(structure, "red_mask", &red_mask);
+                llgst_structure_get_int(structure, "green_mask", &green_mask);
+                llgst_structure_get_int(structure, "blue_mask", &blue_mask);
                 if ((unsigned int)red_mask   == 0xFF000000 &&
                     (unsigned int)green_mask == 0x00FF0000 &&
                     (unsigned int)blue_mask  == 0x0000FF00)
@@ -282,8 +270,12 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
                         filter->format = SLV_PF_BGRX;
                         //fprintf(stderr, "\n\nPIXEL FORMAT BGR\n\n");
                 }
-        }
+                }*/
         
+        filter->format = SLV_PF_RGBX;
+
+        GST_OBJECT_UNLOCK(filter);
+
         return TRUE;
 }
 
@@ -317,6 +309,97 @@ gst_slvideo_stop (GstBaseSink * bsink)
 }
 
 
+static GstFlowReturn
+gst_slvideo_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
+                          GstCaps * caps, GstBuffer ** buf)
+{
+        gint width, height;
+        GstStructure *structure = NULL;
+        GstSLVideo *slvideo;
+        slvideo = GST_SLVIDEO(bsink);
+
+        // caps == requested caps
+        // we can ignore these and reverse-negotiate our preferred dimensions with
+        // the peer if we like - we need to do this to obey dynamic resize requests
+        // flowing in from the app.
+        structure = llgst_caps_get_structure (caps, 0);
+        if (!llgst_structure_get_int(structure, "width", &width) ||
+            !llgst_structure_get_int(structure, "height", &height))
+        {
+                GST_WARNING_OBJECT (slvideo, "no width/height in caps %" GST_PTR_FORMAT, caps);
+                return GST_FLOW_NOT_NEGOTIATED;
+        }
+
+        GstBuffer *newbuf = llgst_buffer_new();
+        bool made_bufferdata_ptr = false;
+#define MAXDEPTHHACK 4
+        
+        GST_OBJECT_LOCK(slvideo);
+        if (slvideo->resize_forced)
+        {
+                gint slwantwidth, slwantheight;
+                slwantwidth = slvideo->resize_try_width;
+                slwantheight = slvideo->resize_try_height;
+        
+                if (slwantwidth != width ||
+                    slwantheight != height)
+                {
+                        // don't like requested caps, we will issue our own suggestion - copy
+                        // the requested caps but substitute our own width and height and see
+                        // if our peer is happy with that.
+                
+                        GstCaps *desired_caps;
+                        GstStructure *desired_struct;
+                        desired_caps = llgst_caps_copy (caps);
+                        desired_struct = llgst_caps_get_structure (desired_caps, 0);
+                        
+                        GValue value = {0};
+                        g_value_init(&value, G_TYPE_INT);
+                        g_value_set_int(&value, slwantwidth);
+                        llgst_structure_set_value (desired_struct, "width", &value);
+                        g_value_unset(&value);
+                        g_value_init(&value, G_TYPE_INT);
+                        g_value_set_int(&value, slwantheight);
+                        llgst_structure_set_value (desired_struct, "height", &value);
+                        
+                        if (llgst_pad_peer_accept_caps (GST_VIDEO_SINK_PAD (slvideo),
+                                                        desired_caps))
+                        {
+                                // todo: re-use buffers from a pool?
+                                // todo: set MALLOCDATA to null, set DATA to point straight to shm?
+                                
+                                // peer likes our cap suggestion
+                                DEBUGMSG("peer loves us :)");
+                                GST_BUFFER_SIZE(newbuf) = slwantwidth * slwantheight * MAXDEPTHHACK;
+                                GST_BUFFER_MALLOCDATA(newbuf) = (guint8*)g_malloc(GST_BUFFER_SIZE(newbuf));
+                                GST_BUFFER_DATA(newbuf) = GST_BUFFER_MALLOCDATA(newbuf);
+                                llgst_buffer_set_caps (GST_BUFFER_CAST(newbuf), desired_caps);
+
+                                made_bufferdata_ptr = true;
+                        } else {
+                                // peer hates our cap suggestion
+                                INFOMSG("peer hates us :(");
+                                llgst_caps_unref(desired_caps);
+                        }
+                }
+        }
+
+        if (!made_bufferdata_ptr) // need to fallback to malloc at original size
+        {
+                GST_BUFFER_SIZE(newbuf) = width * height * MAXDEPTHHACK;
+                GST_BUFFER_MALLOCDATA(newbuf) = (guint8*)g_malloc(GST_BUFFER_SIZE(newbuf));
+                GST_BUFFER_DATA(newbuf) = GST_BUFFER_MALLOCDATA(newbuf);
+                llgst_buffer_set_caps (GST_BUFFER_CAST(newbuf), caps);
+        }
+
+        GST_OBJECT_UNLOCK(slvideo);
+
+        *buf = GST_BUFFER_CAST(newbuf);
+
+        return GST_FLOW_OK;
+}
+
+
 /* initialize the plugin's class */
 static void
 gst_slvideo_class_init (GstSLVideoClass * klass)
@@ -338,7 +421,7 @@ gst_slvideo_class_init (GstSLVideoClass * klass)
 #define LLGST_DEBUG_FUNCPTR(p) (p)
         gstbasesink_class->get_caps = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_caps);
         gstbasesink_class->set_caps = LLGST_DEBUG_FUNCPTR( gst_slvideo_set_caps);
-        //gstbasesink_class->buffer_alloc=LLGST_DEBUG_FUNCPTR(gst_slvideo_buffer_alloc);
+        gstbasesink_class->buffer_alloc=LLGST_DEBUG_FUNCPTR(gst_slvideo_buffer_alloc);
         //gstbasesink_class->get_times = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_times);
         gstbasesink_class->preroll = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
         gstbasesink_class->render = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
@@ -351,20 +434,6 @@ gst_slvideo_class_init (GstSLVideoClass * klass)
 }
 
 
-static void
-gst_slvideo_update_caps (GstSLVideo * slvideo)
-{
-        GstCaps *caps;
-
-        // GStreamer will automatically convert colourspace if necessary.
-        // GStreamer will automatically resize media to one of these enumerated
-        // powers-of-two that we ask for (yay GStreamer!)
-        caps = gst_caps_from_string (SLV_ALLCAPS);
-        
-        gst_caps_replace (&slvideo->caps, caps);
-}
-
-
 /* initialize the new element
  * instantiate pads and add them to element
  * set functions
@@ -374,6 +443,7 @@ static void
 gst_slvideo_init (GstSLVideo * filter,
                   GstSLVideoClass * gclass)
 {
+        filter->caps = NULL;
         filter->width = -1;
         filter->height = -1;
 
@@ -385,19 +455,24 @@ gst_slvideo_init (GstSLVideo * filter,
         filter->retained_frame_width = filter->width;
         filter->retained_frame_height = filter->height;
         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_try_width = -1;
+        filter->resize_try_height = -1;
         GST_OBJECT_UNLOCK(filter);
-        
-        gst_slvideo_update_caps(filter);
 }
 
 static void
 gst_slvideo_set_property (GObject * object, guint prop_id,
                           const GValue * value, GParamSpec * pspec)
 {
-        g_return_if_fail (GST_IS_SLVIDEO (object));
+        llg_return_if_fail (GST_IS_SLVIDEO (object));
         
-        if (prop_id) {
+        switch (prop_id) {
+        default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
         }
 }
 
@@ -405,10 +480,12 @@ static void
 gst_slvideo_get_property (GObject * object, guint prop_id,
                           GValue * value, GParamSpec * pspec)
 {
-        g_return_if_fail (GST_IS_SLVIDEO (object));
+        llg_return_if_fail (GST_IS_SLVIDEO (object));
 
-        if (prop_id) {
+        switch (prop_id) {
+        default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
         }
 }
 
@@ -421,28 +498,35 @@ gst_slvideo_get_property (GObject * object, guint prop_id,
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-        //fprintf(stderr, "\n\n\nPLUGIN INIT\n\n\n");
+        DEBUGMSG("\n\n\nPLUGIN INIT\n\n\n");
 
         GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, (gchar*)"private-slvideo-plugin",
                                  0, (gchar*)"Second Life Video Sink");
 
-        return gst_element_register (plugin, "private-slvideo",
+        return llgst_element_register (plugin, (gchar*)"private-slvideo",
                                        GST_RANK_NONE, GST_TYPE_SLVIDEO);
 }
 
-
+/* this is the structure that gstreamer looks for to register plugins
+ */
+/* NOTE: Can't rely upon GST_PLUGIN_DEFINE_STATIC to self-register, since
+   some g++ versions buggily avoid __attribute__((constructor)) functions -
+   so we provide an explicit plugin init function.
+ */
 void gst_slvideo_init_class (void)
 {
-        gst_plugin_register_static( GST_VERSION_MAJOR,
-                                    GST_VERSION_MINOR,
-                                    (const gchar *)"private-slvideoplugin", 
-                                    (gchar *)"SL Video sink plugin",
-                                    plugin_init,
-                                    (const gchar *)"0.1",
-                                    GST_LICENSE_UNKNOWN,
-                                    (const gchar *)"Second Life",
-                                    (const gchar *)"Second Life",
-                                    (const gchar *)"http://www.secondlife.com/" );
+#define PACKAGE "packagehack"
+        // 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/");
+#undef PACKAGE
+        ll_gst_plugin_register_static (&gst_plugin_desc);
+        DEBUGMSG(stderr, "\n\n\nCLASS INIT\n\n\n");
 }
 
-///#endif // LL_GSTREAMER_ENABLED
+#endif // LL_GSTREAMER010_ENABLED