mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

media: link the RTP udpsrc to the session manager

Browse source 
Link the RTP udpsrc and the appsrc to the session manager so that they don't
shut down when the client sends a packet to open firewalls.
This commit is contained in:
Wim Taymans 2009-05-15 17:58:44 +02:00
parent 1f20cb68b4
commit b83f54f159
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst/rtsp-server/rtsp-media.c
View file

@ -761,7 +761,7 @@ setup_stream (GstRTSPMediaStream *stream, guint idx, GstRTSPMedia *media)
GstPad *pad, *teepad, *selpad; GstPad *pad, *teepad, *selpad;
GstPadLinkReturn ret; GstPadLinkReturn ret;
gint i; gint i;
GstElement *tee, *selector; GstElement *tee;
/* allocate udp ports, we will have 4 of them, 2 for receiving RTP/RTCP and 2 /* allocate udp ports, we will have 4 of them, 2 for receiving RTP/RTCP and 2
* for sending RTP/RTCP. The sender and receiver ports are shared between the * for sending RTP/RTCP. The sender and receiver ports are shared between the
@ -801,6 +801,9 @@ setup_stream (GstRTSPMediaStream *stream, guint idx, GstRTSPMedia *media)
name = g_strdup_printf ("recv_rtcp_sink_%d", idx); name = g_strdup_printf ("recv_rtcp_sink_%d", idx);
stream->recv_rtcp_sink = gst_element_get_request_pad (media->rtpbin, name); stream->recv_rtcp_sink = gst_element_get_request_pad (media->rtpbin, name);
g_free (name); g_free (name);
name = g_strdup_printf ("recv_rtp_sink_%d", idx);
stream->recv_rtp_sink = gst_element_get_request_pad (media->rtpbin, name);
g_free (name);
/* get the session */ /* get the session */
g_signal_emit_by_name (media->rtpbin, "get-internal-session", idx, g_signal_emit_by_name (media->rtpbin, "get-internal-session", idx,
@ -864,22 +867,43 @@ setup_stream (GstRTSPMediaStream *stream, guint idx, GstRTSPMedia *media)
gst_object_unref (pad); gst_object_unref (pad);
gst_object_unref (teepad); gst_object_unref (teepad);
/* make selector for the RTCP receivers */ /* make selector for the RTP receivers */
selector = gst_element_factory_make ("input-selector", NULL); stream->selector[0] = gst_element_factory_make ("input-selector", NULL);
g_object_set (selector, "select-all", TRUE, NULL); g_object_set (stream->selector[0], "select-all", TRUE, NULL);
gst_bin_add (GST_BIN_CAST (media->pipeline), selector); gst_bin_add (GST_BIN_CAST (media->pipeline), stream->selector[0]);
pad = gst_element_get_static_pad (selector, "src"); pad = gst_element_get_static_pad (stream->selector[0], "src");
gst_pad_link (pad, stream->recv_rtp_sink);
gst_object_unref (pad);
selpad = gst_element_get_request_pad (stream->selector[0], "sink%d");
pad = gst_element_get_static_pad (stream->udpsrc[0], "src");
gst_pad_link (pad, selpad);
gst_object_unref (pad);
gst_object_unref (selpad);
selpad = gst_element_get_request_pad (stream->selector[0], "sink%d");
pad = gst_element_get_static_pad (stream->appsrc[0], "src");
gst_pad_link (pad, selpad);
gst_object_unref (pad);
gst_object_unref (selpad);
/* make selector for the RTCP receivers */
stream->selector[1] = gst_element_factory_make ("input-selector", NULL);
g_object_set (stream->selector[1], "select-all", TRUE, NULL);
gst_bin_add (GST_BIN_CAST (media->pipeline), stream->selector[1]);
pad = gst_element_get_static_pad (stream->selector[1], "src");
gst_pad_link (pad, stream->recv_rtcp_sink); gst_pad_link (pad, stream->recv_rtcp_sink);
gst_object_unref (pad); gst_object_unref (pad);
selpad = gst_element_get_request_pad (selector, "sink%d"); selpad = gst_element_get_request_pad (stream->selector[1], "sink%d");
pad = gst_element_get_static_pad (stream->udpsrc[1], "src"); pad = gst_element_get_static_pad (stream->udpsrc[1], "src");
gst_pad_link (pad, selpad); gst_pad_link (pad, selpad);
gst_object_unref (pad); gst_object_unref (pad);
gst_object_unref (selpad); gst_object_unref (selpad);
selpad = gst_element_get_request_pad (selector, "sink%d"); selpad = gst_element_get_request_pad (stream->selector[1], "sink%d");
pad = gst_element_get_static_pad (stream->appsrc[1], "src"); pad = gst_element_get_static_pad (stream->appsrc[1], "src");
gst_pad_link (pad, selpad); gst_pad_link (pad, selpad);
gst_object_unref (pad); gst_object_unref (pad);

3
gst/rtsp-server/rtsp-media.h
View file

@ -94,6 +94,7 @@ struct _GstRTSPMediaStream {
/* pads on the rtpbin */ /* pads on the rtpbin */
GstPad *recv_rtcp_sink; GstPad *recv_rtcp_sink;
GstPad *recv_rtp_sink;
GstPad *send_rtp_sink; GstPad *send_rtp_sink;
GstPad *send_rtp_src; GstPad *send_rtp_src;
GstPad *send_rtcp_src; GstPad *send_rtcp_src;
@ -109,6 +110,8 @@ struct _GstRTSPMediaStream {
GstElement *appsrc[2]; GstElement *appsrc[2];
GstElement *appsink[2]; GstElement *appsink[2];
GstElement *selector[2];
/* server ports for sending/receiving */ /* server ports for sending/receiving */
GstRTSPRange server_port; GstRTSPRange server_port;