gst/: UDP fixes, added uri handler.

Original commit message from CVS:
* gst/rtp/Makefile.am:
* gst/rtp/gstrtp.c: (plugin_init):
* gst/rtp/gstrtpdec.c: (gst_rtpdec_get_type),
(gst_rtpdec_class_init), (gst_rtpdec_init), (gst_rtpdec_chain_rtp),
(gst_rtpdec_chain_rtcp), (gst_rtpdec_set_property),
(gst_rtpdec_get_property), (gst_rtpdec_change_state),
(gst_rtpdec_plugin_init):
* gst/rtp/gstrtpdec.h:
* gst/udp/gstudpsink.c: (gst_udpsink_base_init),
(gst_udpsink_get_times), (gst_udpsink_render),
(gst_udpsink_change_state):
* gst/udp/gstudpsrc.c: (gst_udpsrc_get_type),
(gst_udpsrc_base_init), (gst_udpsrc_class_init), (gst_udpsrc_init),
(gst_udpsrc_loop), (gst_udpsrc_set_uri), (gst_udpsrc_set_property),
(gst_udpsrc_get_property), (gst_udpsrc_init_receive),
(gst_udpsrc_activate), (gst_udpsrc_change_state),
(gst_udpsrc_uri_get_type), (gst_udpsrc_uri_get_protocols),
(gst_udpsrc_uri_get_uri), (gst_udpsrc_uri_set_uri),
(gst_udpsrc_uri_handler_init):
* gst/udp/gstudpsrc.h:
UDP fixes, added uri handler.
Added rtpdec that will manage the RTP session in the future.

3 files changed, 174 insertions, 41 deletions

diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index 7f9206f9..93fb654b 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -161,26 +161,27 @@ static GstFlowReturn
 gst_udpsink_render (GstBaseSink * sink, GstBuffer * buffer)
 {
   GstUDPSink *udpsink;
-  guint tolen, i;
   gint tosend;
   guint8 *data;
 
   udpsink = GST_UDPSINK (sink);
 
-  tolen = sizeof (udpsink->theiraddr);
-
   tosend = GST_BUFFER_SIZE (buffer);
   data = GST_BUFFER_DATA (buffer);
 
   /* send in chunks of MTU */
   while (tosend > 0) {
-    if (sendto (udpsink->sock, data, udpsink->mtu,
-            0, (struct sockaddr *) &udpsink->theiraddr, tolen) == -1) {
+    gint psize;
+
+    psize = MIN (udpsink->mtu, tosend);
+    if (sendto (udpsink->sock, data, psize, 0,
+            (struct sockaddr *) &udpsink->theiraddr,
+            sizeof (udpsink->theiraddr)) == -1) {
       perror ("sending");
     }
 
-    data += udpsink->mtu;
-    tosend -= udpsink->mtu;
+    data += psize;
+    tosend -= psize;
   }
 
   return GST_FLOW_OK;
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index f6901a31..120d0c55 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -25,9 +25,6 @@
 #include "gstudpsrc.h"
 #include <unistd.h>
 
-#define UDP_DEFAULT_PORT		4951
-#define UDP_DEFAULT_MULTICAST_GROUP	"0.0.0.0"
-
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -47,18 +44,25 @@ enum
   LAST_SIGNAL
 };
 
+#define UDP_DEFAULT_PORT		4951
+#define UDP_DEFAULT_MULTICAST_GROUP	"0.0.0.0"
+#define UDP_DEFAULT_URI			"udp://0.0.0.0:4951"
+
 enum
 {
-  ARG_0,
-  ARG_PORT,
-  ARG_MULTICAST_GROUP
-      /* FILL ME */
+  PROP_0,
+  PROP_PORT,
+  PROP_MULTICAST_GROUP,
+  PROP_URI,
+  /* FILL ME */
 };
 
 static void gst_udpsrc_base_init (gpointer g_class);
 static void gst_udpsrc_class_init (GstUDPSrc * klass);
 static void gst_udpsrc_init (GstUDPSrc * udpsrc);
 
+static void gst_udpsrc_uri_handler_init (gpointer g_iface, gpointer iface_data);
+
 static void gst_udpsrc_loop (GstPad * pad);
 static GstElementStateReturn gst_udpsrc_change_state (GstElement * element);
 static gboolean gst_udpsrc_activate (GstPad * pad, GstActivateMode mode);
@@ -90,9 +94,17 @@ gst_udpsrc_get_type (void)
       (GInstanceInitFunc) gst_udpsrc_init,
       NULL
     };
+    static const GInterfaceInfo urihandler_info = {
+      gst_udpsrc_uri_handler_init,
+      NULL,
+      NULL
+    };
 
     udpsrc_type =
         g_type_register_static (GST_TYPE_ELEMENT, "GstUDPSrc", &udpsrc_info, 0);
+
+    g_type_add_interface_static (udpsrc_type, GST_TYPE_URI_HANDLER,
+        &urihandler_info);
   }
   return udpsrc_type;
 }
@@ -122,13 +134,18 @@ gst_udpsrc_class_init (GstUDPSrc * klass)
   gobject_class->set_property = gst_udpsrc_set_property;
   gobject_class->get_property = gst_udpsrc_get_property;
 
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PORT,
-      g_param_spec_int ("port", "port", "The port to receive the packets from",
-          0, 32768, UDP_DEFAULT_PORT, G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class, ARG_MULTICAST_GROUP,
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PORT,
+      g_param_spec_int ("port", "port",
+          "The port to receive the packets from, 0=allocate", 0, 32768,
+          UDP_DEFAULT_PORT, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_MULTICAST_GROUP,
       g_param_spec_string ("multicast_group", "multicast_group",
-          "The Address of multicast group to join",
-          UDP_DEFAULT_MULTICAST_GROUP, G_PARAM_READWRITE));
+          "The Address of multicast group to join", UDP_DEFAULT_MULTICAST_GROUP,
+          G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_URI,
+      g_param_spec_string ("uri", "URI",
+          "URI in the form of udp://hostname:port", UDP_DEFAULT_URI,
+          G_PARAM_READWRITE));
 
   gstelement_class->change_state = gst_udpsrc_change_state;
 }
@@ -146,6 +163,7 @@ gst_udpsrc_init (GstUDPSrc * udpsrc)
   udpsrc->port = UDP_DEFAULT_PORT;
   udpsrc->sock = -1;
   udpsrc->multi_group = g_strdup (UDP_DEFAULT_MULTICAST_GROUP);
+  udpsrc->uri = g_strdup (UDP_DEFAULT_URI);
 }
 
 static void
@@ -165,6 +183,9 @@ gst_udpsrc_loop (GstPad * pad)
   FD_SET (udpsrc->sock, &read_fds);
   max_sock = udpsrc->sock;
 
+  GST_STREAM_LOCK (pad);
+
+  /* FIXME, add another socket to unblock */
   if (select (max_sock + 1, &read_fds, NULL, NULL, NULL) < 0)
     goto select_error;
 
@@ -179,21 +200,64 @@ gst_udpsrc_loop (GstPad * pad)
     goto receive_error;
 
   GST_BUFFER_SIZE (outbuf) = numbytes;
-  gst_pad_push (udpsrc->srcpad, outbuf);
+  if (gst_pad_push (udpsrc->srcpad, outbuf) != GST_FLOW_OK)
+    goto need_pause;
+
+  GST_STREAM_UNLOCK (pad);
 
   return;
 
 select_error:
   {
+    GST_STREAM_UNLOCK (pad);
     GST_DEBUG ("got select error");
     return;
   }
 receive_error:
   {
+    GST_STREAM_UNLOCK (pad);
     gst_buffer_unref (outbuf);
     GST_DEBUG ("got receive error");
     return;
   }
+need_pause:
+  {
+    gst_task_pause (GST_RPAD_TASK (pad));
+    GST_STREAM_UNLOCK (pad);
+    return;
+  }
+}
+
+static gboolean
+gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri)
+{
+  gchar *protocol;
+  gchar *location;
+  gchar *colptr;
+
+  protocol = gst_uri_get_protocol (uri);
+  if (strcmp (protocol, "udp") != 0)
+    goto wrong_protocol;
+  g_free (protocol);
+
+  location = gst_uri_get_location (uri);
+  colptr = strstr (location, ":");
+  if (colptr != NULL) {
+    src->port = atoi (colptr + 1);
+  }
+  g_free (location);
+  g_free (src->uri);
+
+  src->uri = g_strdup (uri);
+
+  return TRUE;
+
+wrong_protocol:
+  {
+    g_free (protocol);
+    GST_DEBUG ("error parsing uri %s", uri);
+    return FALSE;
+  }
 }
 
 static void
@@ -205,10 +269,10 @@ gst_udpsrc_set_property (GObject * object, guint prop_id, const GValue * value,
   udpsrc = GST_UDPSRC (object);
 
   switch (prop_id) {
-    case ARG_PORT:
+    case PROP_PORT:
       udpsrc->port = g_value_get_int (value);
       break;
-    case ARG_MULTICAST_GROUP:
+    case PROP_MULTICAST_GROUP:
       g_free (udpsrc->multi_group);
 
       if (g_value_get_string (value) == NULL)
@@ -217,6 +281,9 @@ gst_udpsrc_set_property (GObject * object, guint prop_id, const GValue * value,
         udpsrc->multi_group = g_strdup (g_value_get_string (value));
 
       break;
+    case PROP_URI:
+      gst_udpsrc_set_uri (udpsrc, g_value_get_string (value));
+      break;
     default:
       break;
   }
@@ -231,12 +298,15 @@ gst_udpsrc_get_property (GObject * object, guint prop_id, GValue * value,
   udpsrc = GST_UDPSRC (object);
 
   switch (prop_id) {
-    case ARG_PORT:
+    case PROP_PORT:
       g_value_set_int (value, udpsrc->port);
       break;
-    case ARG_MULTICAST_GROUP:
+    case PROP_MULTICAST_GROUP:
       g_value_set_string (value, udpsrc->multi_group);
       break;
+    case PROP_URI:
+      g_value_set_string (value, udpsrc->uri);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -249,28 +319,24 @@ gst_udpsrc_init_receive (GstUDPSrc * src)
 {
   guint bc_val;
   gint reuse = 1;
+  struct sockaddr_in my_addr;
+  int len, port;
 
   memset (&src->myaddr, 0, sizeof (src->myaddr));
   src->myaddr.sin_family = AF_INET;     /* host byte order */
   src->myaddr.sin_port = htons (src->port);     /* short, network byte order */
   src->myaddr.sin_addr.s_addr = INADDR_ANY;
 
-  if ((src->sock = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
-    perror ("socket");
-    return FALSE;
-  }
+  if ((src->sock = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
+    goto error;
 
   if (setsockopt (src->sock, SOL_SOCKET, SO_REUSEADDR, &reuse,
-          sizeof (reuse)) == -1) {
-    perror ("setsockopt");
-    return FALSE;
-  }
+          sizeof (reuse)) < 0)
+    goto error;
 
   if (bind (src->sock, (struct sockaddr *) &src->myaddr,
-          sizeof (src->myaddr)) == -1) {
-    perror ("bind");
-    return FALSE;
-  }
+          sizeof (src->myaddr)) < 0)
+    goto error;
 
   if (inet_aton (src->multi_group, &(src->multi_addr.imr_multiaddr))) {
     if (src->multi_addr.imr_multiaddr.s_addr) {
@@ -280,11 +346,25 @@ gst_udpsrc_init_receive (GstUDPSrc * src)
     }
   }
 
+  len = sizeof (my_addr);
+  getsockname (src->sock, (struct sockaddr *) &my_addr, &len);
+  port = ntohs (my_addr.sin_port);
+  if (port != src->port) {
+    src->port = port;
+    g_object_notify (G_OBJECT (src), "port");
+  }
+
   bc_val = 1;
   setsockopt (src->sock, SOL_SOCKET, SO_BROADCAST, &bc_val, sizeof (bc_val));
   src->myaddr.sin_port = htons (src->port + 1);
 
   return TRUE;
+
+error:
+  {
+    perror ("open");
+    return FALSE;
+  }
 }
 
 static void
@@ -326,6 +406,8 @@ gst_udpsrc_activate (GstPad * pad, GstActivateMode mode)
 
       /* step 2, make sure streaming finishes */
       GST_STREAM_LOCK (pad);
+      gst_udpsrc_close (udpsrc);
+
       /* step 3, stop the task */
       if (GST_RPAD_TASK (pad)) {
         gst_task_stop (GST_RPAD_TASK (pad));
@@ -363,9 +445,6 @@ gst_udpsrc_change_state (GstElement * element)
   ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
-      gst_udpsrc_close (src);
-      break;
     default:
       break;
   }
@@ -374,6 +453,52 @@ gst_udpsrc_change_state (GstElement * element)
 
 no_init:
   {
+    GST_DEBUG ("could not init udp socket");
     return GST_STATE_FAILURE;
   }
 }
+
+/*** GSTURIHANDLER INTERFACE *************************************************/
+
+static guint
+gst_udpsrc_uri_get_type (void)
+{
+  return GST_URI_SRC;
+}
+static gchar **
+gst_udpsrc_uri_get_protocols (void)
+{
+  static gchar *protocols[] = { "udp", NULL };
+
+  return protocols;
+}
+
+static const gchar *
+gst_udpsrc_uri_get_uri (GstURIHandler * handler)
+{
+  GstUDPSrc *src = GST_UDPSRC (handler);
+
+  return g_strdup (src->uri);
+}
+
+static gboolean
+gst_udpsrc_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+{
+  gboolean ret;
+  GstUDPSrc *src = GST_UDPSRC (handler);
+
+  ret = gst_udpsrc_set_uri (src, uri);
+
+  return ret;
+}
+
+static void
+gst_udpsrc_uri_handler_init (gpointer g_iface, gpointer iface_data)
+{
+  GstURIHandlerInterface *iface = (GstURIHandlerInterface *) g_iface;
+
+  iface->get_type = gst_udpsrc_uri_get_type;
+  iface->get_protocols = gst_udpsrc_uri_get_protocols;
+  iface->get_uri = gst_udpsrc_uri_get_uri;
+  iface->set_uri = gst_udpsrc_uri_set_uri;
+}
diff --git a/gst/udp/gstudpsrc.h b/gst/udp/gstudpsrc.h
index a2cfb2e9..a347eb2a 100644
--- a/gst/udp/gstudpsrc.h
+++ b/gst/udp/gstudpsrc.h
@@ -56,11 +56,18 @@ struct _GstUDPSrc {
   GstElement element;
 
   /* pads */
-  GstPad *sinkpad,*srcpad;
+  GstPad *sinkpad,
+	 *srcpad;
+
+  gchar *uri;
 
   int port;
   int sock;
   gchar *multi_group;
+  gboolean multicast;
+  gint ttl;
+
+  int control;
 
   struct sockaddr_in myaddr;
   struct ip_mreq multi_addr;