Commit f6283b08 authored by Mathieu Duponchelle's avatar Mathieu Duponchelle
parent d3cbea09
...@@ -1503,6 +1503,17 @@ gst_rtspsrc_collect_connections (GstRTSPSrc * src, const GstSDPMessage * sdp, ...@@ -1503,6 +1503,17 @@ gst_rtspsrc_collect_connections (GstRTSPSrc * src, const GstSDPMessage * sdp,
} }
} }
static gchar *
make_stream_id (GstRTSPStream * stream, const GstSDPMedia * media)
{
gchar *stream_id = g_strdup_printf ("%s%d%d%s%d", media->media, media->port,
media->num_ports, media->proto, stream->default_pt);
gchar *res = g_compute_checksum_for_string (G_CHECKSUM_MD5, stream_id, -1);
g_free (stream_id);
return res;
}
/* m=<media> <UDP port> RTP/AVP <payload> /* m=<media> <UDP port> RTP/AVP <payload>
*/ */
static void static void
...@@ -1583,6 +1594,8 @@ gst_rtspsrc_collect_payloads (GstRTSPSrc * src, const GstSDPMessage * sdp, ...@@ -1583,6 +1594,8 @@ gst_rtspsrc_collect_payloads (GstRTSPSrc * src, const GstSDPMessage * sdp,
g_array_append_val (stream->ptmap, item); g_array_append_val (stream->ptmap, item);
} }
stream->stream_id = make_stream_id (stream, media);
gst_caps_unref (global_caps); gst_caps_unref (global_caps);
return; return;
...@@ -1652,6 +1665,7 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, GstSDPMessage * sdp, gint idx, ...@@ -1652,6 +1665,7 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, GstSDPMessage * sdp, gint idx,
stream->profile = GST_RTSP_PROFILE_AVP; stream->profile = GST_RTSP_PROFILE_AVP;
stream->ptmap = g_array_new (FALSE, FALSE, sizeof (PtMapItem)); stream->ptmap = g_array_new (FALSE, FALSE, sizeof (PtMapItem));
stream->mikey = NULL; stream->mikey = NULL;
stream->stream_id = NULL;
g_array_set_clear_func (stream->ptmap, (GDestroyNotify) clear_ptmap_item); g_array_set_clear_func (stream->ptmap, (GDestroyNotify) clear_ptmap_item);
/* collect bandwidth information for this steam. FIXME, configure in the RTP /* collect bandwidth information for this steam. FIXME, configure in the RTP
...@@ -1734,6 +1748,7 @@ gst_rtspsrc_stream_free (GstRTSPSrc * src, GstRTSPStream * stream) ...@@ -1734,6 +1748,7 @@ gst_rtspsrc_stream_free (GstRTSPSrc * src, GstRTSPStream * stream)
g_free (stream->destination); g_free (stream->destination);
g_free (stream->control_url); g_free (stream->control_url);
g_free (stream->conninfo.location); g_free (stream->conninfo.location);
g_free (stream->stream_id);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (stream->udpsrc[i]) { if (stream->udpsrc[i]) {
...@@ -2298,6 +2313,33 @@ gst_rtspsrc_handle_src_event (GstPad * pad, GstObject * parent, ...@@ -2298,6 +2313,33 @@ gst_rtspsrc_handle_src_event (GstPad * pad, GstObject * parent,
return res; return res;
} }
static gboolean
gst_rtspsrc_handle_src_sink_event (GstPad * pad, GstObject * parent,
GstEvent * event)
{
GstRTSPStream *stream;
stream = gst_pad_get_element_private (pad);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_STREAM_START:{
const gchar *upstream_id;
gchar *stream_id;
gst_event_parse_stream_start (event, &upstream_id);
stream_id = g_strdup_printf ("%s/%s", upstream_id, stream->stream_id);
gst_event_unref (event);
event = gst_event_new_stream_start (stream_id);
break;
}
default:
break;
}
return gst_pad_push_event (stream->srcpad, event);
}
/* this is the final event function we receive on the internal source pad when /* this is the final event function we receive on the internal source pad when
* we deal with TCP connections */ * we deal with TCP connections */
static gboolean static gboolean
...@@ -2544,6 +2586,7 @@ new_manager_pad (GstElement * manager, GstPad * pad, GstRTSPSrc * src) ...@@ -2544,6 +2586,7 @@ new_manager_pad (GstElement * manager, GstPad * pad, GstRTSPSrc * src)
GList *ostreams; GList *ostreams;
GstRTSPStream *stream; GstRTSPStream *stream;
gboolean all_added; gboolean all_added;
GstPad *internal_src;
GST_DEBUG_OBJECT (src, "got new manager pad %" GST_PTR_FORMAT, pad); GST_DEBUG_OBJECT (src, "got new manager pad %" GST_PTR_FORMAT, pad);
...@@ -2588,6 +2631,13 @@ new_manager_pad (GstElement * manager, GstPad * pad, GstRTSPSrc * src) ...@@ -2588,6 +2631,13 @@ new_manager_pad (GstElement * manager, GstPad * pad, GstRTSPSrc * src)
gst_object_unref (template); gst_object_unref (template);
g_free (name); g_free (name);
/* We intercept and modify the stream start event */
internal_src =
GST_PAD (gst_proxy_pad_get_internal (GST_PROXY_PAD (stream->srcpad)));
gst_pad_set_element_private (internal_src, stream);
gst_pad_set_event_function (internal_src, gst_rtspsrc_handle_src_sink_event);
gst_object_unref (internal_src);
gst_pad_set_event_function (stream->srcpad, gst_rtspsrc_handle_src_event); gst_pad_set_event_function (stream->srcpad, gst_rtspsrc_handle_src_event);
gst_pad_set_query_function (stream->srcpad, gst_rtspsrc_handle_src_query); gst_pad_set_query_function (stream->srcpad, gst_rtspsrc_handle_src_query);
gst_pad_set_active (stream->srcpad, TRUE); gst_pad_set_active (stream->srcpad, TRUE);
......
...@@ -158,6 +158,9 @@ struct _GstRTSPStream { ...@@ -158,6 +158,9 @@ struct _GstRTSPStream {
gboolean is_multicast; gboolean is_multicast;
guint ttl; guint ttl;
/* A unique and stable id we will use for the stream start event */
gchar *stream_id;
GstStructure *rtx_pt_map; GstStructure *rtx_pt_map;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment