From 914b481e4288e9d1220e1e83ac57bdd5957e32d7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 26 Apr 2011 19:22:50 +0200 Subject: [PATCH] rtsp-server: port to 0.11 --- gst/rtsp-server/Makefile.am | 3 +- gst/rtsp-server/rtsp-client.c | 29 ++- gst/rtsp-server/rtsp-funnel.c | 407 ---------------------------------- gst/rtsp-server/rtsp-funnel.h | 69 ------ gst/rtsp-server/rtsp-media.c | 8 +- 5 files changed, 17 insertions(+), 499 deletions(-) delete mode 100644 gst/rtsp-server/rtsp-funnel.c delete mode 100644 gst/rtsp-server/rtsp-funnel.h diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am index 06b0f3534e..eb751ecac1 100644 --- a/gst/rtsp-server/Makefile.am +++ b/gst/rtsp-server/Makefile.am @@ -12,7 +12,6 @@ public_headers = \ rtsp-server.h c_sources = \ - rtsp-funnel.c \ rtsp-auth.c \ rtsp-params.c \ rtsp-sdp.c \ @@ -25,7 +24,7 @@ c_sources = \ rtsp-client.c \ rtsp-server.c -noinst_HEADERS = rtsp-funnel.h +noinst_HEADERS = lib_LTLIBRARIES = \ libgstrtspserver-@GST_MAJORMINOR@.la diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 6ddcb57444..62b2a997a7 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -399,19 +399,22 @@ do_send_data (GstBuffer * buffer, guint8 channel, GstRTSPClient * client) { GstRTSPMessage message = { 0 }; guint8 *data; - guint size; + guint usize; + gsize size; gst_rtsp_message_init_data (&message, channel); - data = GST_BUFFER_DATA (buffer); - size = GST_BUFFER_SIZE (buffer); - gst_rtsp_message_take_body (&message, data, size); + data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ); + usize = size; + gst_rtsp_message_take_body (&message, data, usize); /* FIXME, client->watch could have been finalized here, we need to keep an * extra refcount to the watch. */ gst_rtsp_watch_send_message (client->watch, &message, NULL); - gst_rtsp_message_steal_body (&message, &data, &size); + gst_rtsp_message_steal_body (&message, &data, &usize); + gst_buffer_unmap (buffer, data, size); + gst_rtsp_message_unset (&message); return TRUE; @@ -421,18 +424,15 @@ static gboolean do_send_data_list (GstBufferList * blist, guint8 channel, GstRTSPClient * client) { - GstBufferListIterator *it; + guint len, i; - it = gst_buffer_list_iterate (blist); - while (gst_buffer_list_iterator_next_group (it)) { - GstBuffer *group = gst_buffer_list_iterator_merge_group (it); + len = gst_buffer_list_len (blist); - if (group == NULL) - continue; + for (i = 0; i < len; i++) { + GstBuffer *group = gst_buffer_list_get (blist, i); do_send_data (group, channel, client); } - gst_buffer_list_iterator_free (it); return TRUE; } @@ -1428,9 +1428,8 @@ handle_data (GstRTSPClient * client, GstRTSPMessage * message) gst_rtsp_message_steal_body (message, &data, &size); buffer = gst_buffer_new (); - GST_BUFFER_DATA (buffer) = data; - GST_BUFFER_MALLOCDATA (buffer) = data; - GST_BUFFER_SIZE (buffer) = size; + gst_buffer_take_memory (buffer, + gst_memory_new_wrapped (0, data, g_free, size, 0, size)); handled = FALSE; for (walk = client->streams; walk; walk = g_list_next (walk)) { diff --git a/gst/rtsp-server/rtsp-funnel.c b/gst/rtsp-server/rtsp-funnel.c deleted file mode 100644 index 6f073c1d3a..0000000000 --- a/gst/rtsp-server/rtsp-funnel.c +++ /dev/null @@ -1,407 +0,0 @@ -/* - * Farsight2 - Farsight Funnel element - * - * Copyright 2007 Collabora Ltd. - * @author: Olivier Crete - * Copyright 2007 Nokia Corp. - * - * rtsp-funnel.c: Simple Funnel element - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * SECTION:element-rtspfunnel - * @short_description: N-to-1 simple funnel - * - * Takes packets from various input sinks into one output source - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "rtsp-funnel.h" - -GST_DEBUG_CATEGORY_STATIC (rtsp_funnel_debug); -#define GST_CAT_DEFAULT rtsp_funnel_debug - -static const GstElementDetails rtsp_funnel_details = -GST_ELEMENT_DETAILS ("Farsight Funnel pipe fitting", - "Generic", - "N-to-1 pipe fitting", - "Olivier Crete "); - -static GstStaticPadTemplate funnel_sink_template = -GST_STATIC_PAD_TEMPLATE ("sink%d", - GST_PAD_SINK, - GST_PAD_REQUEST, - GST_STATIC_CAPS_ANY); - -static GstStaticPadTemplate funnel_src_template = -GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY); - - -static void -_do_init (GType type) -{ - GST_DEBUG_CATEGORY_INIT (rtsp_funnel_debug, "rtspfunnel", 0, - "rtsp funnel element"); -} - -GST_BOILERPLATE_FULL (RTSPFunnel, rtsp_funnel, GstElement, GST_TYPE_ELEMENT, - _do_init); - - - -static GstStateChangeReturn rtsp_funnel_change_state (GstElement * element, - GstStateChange transition); - -static GstPad *rtsp_funnel_request_new_pad (GstElement * element, - GstPadTemplate * templ, const gchar * name); -static void rtsp_funnel_release_pad (GstElement * element, GstPad * pad); - -static GstFlowReturn rtsp_funnel_chain (GstPad * pad, GstBuffer * buffer); -static gboolean rtsp_funnel_event (GstPad * pad, GstEvent * event); -static gboolean rtsp_funnel_src_event (GstPad * pad, GstEvent * event); -static GstCaps *rtsp_funnel_getcaps (GstPad * pad); - - -typedef struct -{ - GstSegment segment; -} RTSPFunnelPadPrivate; - -static void -rtsp_funnel_base_init (gpointer g_class) -{ - GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_set_details (gstelement_class, &rtsp_funnel_details); - - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&funnel_sink_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&funnel_src_template)); -} - - -static void -rtsp_funnel_dispose (GObject * object) -{ - GList *item; - -restart: - for (item = GST_ELEMENT_PADS (object); item; item = g_list_next (item)) { - GstPad *pad = GST_PAD (item->data); - - if (GST_PAD_IS_SINK (pad)) { - gst_element_release_request_pad (GST_ELEMENT (object), pad); - goto restart; - } - } - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void -rtsp_funnel_class_init (RTSPFunnelClass * klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - - gobject_class->dispose = GST_DEBUG_FUNCPTR (rtsp_funnel_dispose); - - gstelement_class->request_new_pad = - GST_DEBUG_FUNCPTR (rtsp_funnel_request_new_pad); - gstelement_class->release_pad = GST_DEBUG_FUNCPTR (rtsp_funnel_release_pad); - gstelement_class->change_state = GST_DEBUG_FUNCPTR (rtsp_funnel_change_state); -} - -static void -rtsp_funnel_init (RTSPFunnel * funnel, RTSPFunnelClass * g_class) -{ - funnel->srcpad = gst_pad_new_from_static_template (&funnel_src_template, - "src"); - gst_pad_set_event_function (funnel->srcpad, rtsp_funnel_src_event); - gst_pad_use_fixed_caps (funnel->srcpad); - gst_element_add_pad (GST_ELEMENT (funnel), funnel->srcpad); -} - - -static GstPad * -rtsp_funnel_request_new_pad (GstElement * element, GstPadTemplate * templ, - const gchar * name) -{ - GstPad *sinkpad; - RTSPFunnelPadPrivate *priv = g_slice_alloc0 (sizeof (RTSPFunnelPadPrivate)); - - GST_DEBUG_OBJECT (element, "requesting pad"); - - sinkpad = gst_pad_new_from_template (templ, name); - - gst_pad_set_chain_function (sinkpad, GST_DEBUG_FUNCPTR (rtsp_funnel_chain)); - gst_pad_set_event_function (sinkpad, GST_DEBUG_FUNCPTR (rtsp_funnel_event)); - gst_pad_set_getcaps_function (sinkpad, - GST_DEBUG_FUNCPTR (rtsp_funnel_getcaps)); - - gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED); - gst_pad_set_element_private (sinkpad, priv); - - gst_pad_set_active (sinkpad, TRUE); - - gst_element_add_pad (element, sinkpad); - - return sinkpad; -} - -static void -rtsp_funnel_release_pad (GstElement * element, GstPad * pad) -{ - RTSPFunnel *funnel = RTSP_FUNNEL (element); - RTSPFunnelPadPrivate *priv = gst_pad_get_element_private (pad); - - GST_DEBUG_OBJECT (funnel, "releasing pad"); - - gst_pad_set_active (pad, FALSE); - - if (priv) - g_slice_free1 (sizeof (RTSPFunnelPadPrivate), priv); - - gst_element_remove_pad (GST_ELEMENT_CAST (funnel), pad); -} - -static GstCaps * -rtsp_funnel_getcaps (GstPad * pad) -{ - RTSPFunnel *funnel = RTSP_FUNNEL (gst_pad_get_parent (pad)); - GstCaps *caps; - - caps = gst_pad_peer_get_caps (funnel->srcpad); - if (caps == NULL) - caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); - - gst_object_unref (funnel); - - return caps; -} - -static GstFlowReturn -rtsp_funnel_chain (GstPad * pad, GstBuffer * buffer) -{ - GstFlowReturn res; - RTSPFunnel *funnel = RTSP_FUNNEL (gst_pad_get_parent (pad)); - RTSPFunnelPadPrivate *priv = gst_pad_get_element_private (pad); - GstEvent *event = NULL; - GstClockTime newts; - GstCaps *padcaps; - - GST_DEBUG_OBJECT (funnel, "received buffer %p", buffer); - - GST_OBJECT_LOCK (funnel); - if (priv->segment.format == GST_FORMAT_UNDEFINED) { - GST_WARNING_OBJECT (funnel, "Got buffer without segment," - " setting segment [0,inf["); - gst_segment_set_newsegment_full (&priv->segment, FALSE, 1.0, 1.0, - GST_FORMAT_TIME, 0, -1, 0); - } - - if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (buffer))) - gst_segment_set_last_stop (&priv->segment, priv->segment.format, - GST_BUFFER_TIMESTAMP (buffer)); - - newts = gst_segment_to_running_time (&priv->segment, - priv->segment.format, GST_BUFFER_TIMESTAMP (buffer)); - if (newts != GST_BUFFER_TIMESTAMP (buffer)) { - buffer = gst_buffer_make_metadata_writable (buffer); - GST_BUFFER_TIMESTAMP (buffer) = newts; - } - - if (!funnel->has_segment) { - event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, GST_FORMAT_TIME, - 0, -1, 0); - funnel->has_segment = TRUE; - } - GST_OBJECT_UNLOCK (funnel); - - if (event) { - if (!gst_pad_push_event (funnel->srcpad, event)) { - GST_WARNING_OBJECT (funnel, "Could not push out newsegment event"); - res = GST_FLOW_ERROR; - goto out; - } - } - - - GST_OBJECT_LOCK (pad); - padcaps = GST_PAD_CAPS (funnel->srcpad); - GST_OBJECT_UNLOCK (pad); - - if (GST_BUFFER_CAPS (buffer) && GST_BUFFER_CAPS (buffer) != padcaps) { - if (!gst_pad_set_caps (funnel->srcpad, GST_BUFFER_CAPS (buffer))) { - res = GST_FLOW_NOT_NEGOTIATED; - goto out; - } - } - - res = gst_pad_push (funnel->srcpad, buffer); - - GST_LOG_OBJECT (funnel, "handled buffer %s", gst_flow_get_name (res)); - -out: - gst_object_unref (funnel); - - return res; -} - -static gboolean -rtsp_funnel_event (GstPad * pad, GstEvent * event) -{ - RTSPFunnel *funnel = RTSP_FUNNEL (gst_pad_get_parent (pad)); - RTSPFunnelPadPrivate *priv = gst_pad_get_element_private (pad); - gboolean forward = TRUE; - gboolean res = TRUE; - - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_NEWSEGMENT: - { - gboolean update; - gdouble rate, arate; - GstFormat format; - gint64 start; - gint64 stop; - gint64 time; - - gst_event_parse_new_segment_full (event, &update, &rate, &arate, - &format, &start, &stop, &time); - - - GST_OBJECT_LOCK (funnel); - gst_segment_set_newsegment_full (&priv->segment, update, rate, arate, - format, start, stop, time); - GST_OBJECT_UNLOCK (funnel); - - forward = FALSE; - gst_event_unref (event); - } - break; - case GST_EVENT_FLUSH_STOP: - { - GST_OBJECT_LOCK (funnel); - gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED); - GST_OBJECT_UNLOCK (funnel); - } - break; - default: - break; - } - - - if (forward) - res = gst_pad_push_event (funnel->srcpad, event); - - gst_object_unref (funnel); - - return res; -} - -static gboolean -rtsp_funnel_src_event (GstPad * pad, GstEvent * event) -{ - GstElement *funnel; - GstIterator *iter; - GstPad *sinkpad; - gboolean result = FALSE; - gboolean done = FALSE; - - funnel = gst_pad_get_parent_element (pad); - g_return_val_if_fail (funnel != NULL, FALSE); - - iter = gst_element_iterate_sink_pads (funnel); - - while (!done) { - switch (gst_iterator_next (iter, (gpointer) & sinkpad)) { - case GST_ITERATOR_OK: - gst_event_ref (event); - result |= gst_pad_push_event (sinkpad, event); - gst_object_unref (sinkpad); - break; - case GST_ITERATOR_RESYNC: - gst_iterator_resync (iter); - result = FALSE; - break; - case GST_ITERATOR_ERROR: - GST_WARNING_OBJECT (funnel, "Error iterating sinkpads"); - case GST_ITERATOR_DONE: - done = TRUE; - break; - } - } - gst_iterator_free (iter); - gst_object_unref (funnel); - gst_event_unref (event); - - return result; -} - -static void -reset_pad (gpointer data, gpointer user_data) -{ - GstPad *pad = data; - RTSPFunnelPadPrivate *priv = gst_pad_get_element_private (pad); - - GST_OBJECT_LOCK (pad); - gst_segment_init (&priv->segment, GST_FORMAT_UNDEFINED); - GST_OBJECT_UNLOCK (pad); - gst_object_unref (pad); -} - -static GstStateChangeReturn -rtsp_funnel_change_state (GstElement * element, GstStateChange transition) -{ - RTSPFunnel *funnel = RTSP_FUNNEL (element); - GstStateChangeReturn ret; - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - { - GstIterator *iter = gst_element_iterate_sink_pads (element); - GstIteratorResult res; - - do { - res = gst_iterator_foreach (iter, reset_pad, NULL); - } while (res == GST_ITERATOR_RESYNC); - - gst_iterator_free (iter); - - if (res == GST_ITERATOR_ERROR) - return GST_STATE_CHANGE_FAILURE; - - GST_OBJECT_LOCK (funnel); - funnel->has_segment = FALSE; - GST_OBJECT_UNLOCK (funnel); - } - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - return ret; -} diff --git a/gst/rtsp-server/rtsp-funnel.h b/gst/rtsp-server/rtsp-funnel.h deleted file mode 100644 index f762d8161c..0000000000 --- a/gst/rtsp-server/rtsp-funnel.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Farsight2 - Farsight Funnel element - * - * Copyright 2007 Collabora Ltd. - * @author: Olivier Crete - * Copyright 2007 Nokia Corp. - * - * rtsp-funnel.h: Simple Funnel element - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef __RTSP_FUNNEL_H__ -#define __RTSP_FUNNEL_H__ - -#include - -G_BEGIN_DECLS - -#define RTSP_TYPE_FUNNEL \ - (rtsp_funnel_get_type ()) -#define RTSP_FUNNEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),RTSP_TYPE_FUNNEL,RTSPFunnel)) -#define RTSP_FUNNEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),RTSP_TYPE_FUNNEL,RTSPFunnelClass)) -#define RTSP_IS_FUNNEL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),RTSP_TYPE_FUNNEL)) -#define RTSP_IS_FUNNEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),RTSP_TYPE_FUNNEL)) - -typedef struct _RTSPFunnel RTSPFunnel; -typedef struct _RTSPFunnelClass RTSPFunnelClass; - -/** - * RTSPFunnel: - * - * Opaque #RTSPFunnel data structure. - */ -struct _RTSPFunnel { - GstElement element; - - /*< private >*/ - GstPad *srcpad; - - gboolean has_segment; -}; - -struct _RTSPFunnelClass { - GstElementClass parent_class; -}; - -GType rtsp_funnel_get_type (void); - -G_END_DECLS - -#endif /* __RTSP_FUNNEL_H__ */ diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index e3ba5cec40..143236c3e5 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -23,7 +23,6 @@ #include #include -#include "rtsp-funnel.h" #include "rtsp-media.h" #define DEFAULT_SHARED FALSE @@ -141,9 +140,6 @@ gst_rtsp_media_class_init (GstRTSPMediaClass * klass) klass->unprepare = default_unprepare; ssrc_stream_map_key = g_quark_from_static_string ("GstRTSPServer.stream"); - - gst_element_register (NULL, "rtspfunnel", GST_RANK_NONE, RTSP_TYPE_FUNNEL); - } static void @@ -1325,7 +1321,7 @@ setup_stream (GstRTSPMediaStream * stream, guint idx, GstRTSPMedia * media) gst_object_unref (teepad); /* make selector for the RTP receivers */ - stream->selector[0] = gst_element_factory_make ("rtspfunnel", NULL); + stream->selector[0] = gst_element_factory_make ("funnel", NULL); gst_bin_add (GST_BIN_CAST (media->pipeline), stream->selector[0]); pad = gst_element_get_static_pad (stream->selector[0], "src"); @@ -1345,7 +1341,7 @@ setup_stream (GstRTSPMediaStream * stream, guint idx, GstRTSPMedia * media) gst_object_unref (selpad); /* make selector for the RTCP receivers */ - stream->selector[1] = gst_element_factory_make ("rtspfunnel", NULL); + stream->selector[1] = gst_element_factory_make ("funnel", NULL); gst_bin_add (GST_BIN_CAST (media->pipeline), stream->selector[1]); pad = gst_element_get_static_pad (stream->selector[1], "src");