mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

stream: add method to check control url of stream

Browse source
This commit is contained in:
Wim Taymans 2013-07-03 15:13:45 +02:00
parent 5a833f503e
commit d4e8d800c9
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/rtsp-server/rtsp-stream.c
View file

@ -17,8 +17,9 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gio/gio.h> #include <gio/gio.h>
@ -297,7 +298,7 @@ gst_rtsp_stream_get_control (GstRTSPStream * stream)
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
if ((result = g_strdup (priv->control)) == NULL) if ((result = g_strdup (priv->control)) == NULL)
result = g_strdup_printf ("stream=%d", priv->idx); result = g_strdup_printf ("stream=%u", priv->idx);
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
return result; return result;
@ -325,6 +326,38 @@ gst_rtsp_stream_set_control (GstRTSPStream * stream, const gchar * control)
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
} }
/**
* gst_rtsp_stream_has_control:
* @stream: a #GstRTSPStream
* @control: a control string
*
* Check if @stream has the control string @control.
*
* Returns: %TRUE is @stream has @control as the control string
*/
gboolean
gst_rtsp_stream_has_control (GstRTSPStream * stream, const gchar * control)
{
GstRTSPStreamPrivate *priv;
gboolean res;
g_return_val_if_fail (GST_IS_RTSP_STREAM (stream), FALSE);
priv = stream->priv;
g_mutex_lock (&priv->lock);
if (priv->control)
res = g_strcmp0 (priv->control, control);
else {
guint streamid;
sscanf (control, "stream=%u", &streamid);
res = (streamid == priv->idx);
}
g_mutex_unlock (&priv->lock);
return res;
}
/** /**
* gst_rtsp_stream_set_mtu: * gst_rtsp_stream_set_mtu:
* @stream: a #GstRTSPStream * @stream: a #GstRTSPStream
@ -1233,7 +1266,8 @@ gst_rtsp_stream_join_bin (GstRTSPStream * stream, GstBin * bin,
GstElement * rtpbin, GstState state) GstElement * rtpbin, GstState state)
{ {
GstRTSPStreamPrivate *priv; GstRTSPStreamPrivate *priv;
gint i, idx; gint i;
guint idx;
gchar *name; gchar *name;
GstPad *pad, *teepad, *queuepad, *selpad; GstPad *pad, *teepad, *queuepad, *selpad;
GstPadLinkReturn ret; GstPadLinkReturn ret;
@ -1251,7 +1285,7 @@ gst_rtsp_stream_join_bin (GstRTSPStream * stream, GstBin * bin,
/* create a session with the same index as the stream */ /* create a session with the same index as the stream */
idx = priv->idx; idx = priv->idx;
GST_INFO ("stream %p joining bin as session %d", stream, idx); GST_INFO ("stream %p joining bin as session %u", stream, idx);
if (!alloc_ports (stream)) if (!alloc_ports (stream))
goto no_ports; goto no_ports;
@ -1448,12 +1482,12 @@ was_joined:
no_ports: no_ports:
{ {
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
GST_WARNING ("failed to allocate ports %d", idx); GST_WARNING ("failed to allocate ports %u", idx);
return FALSE; return FALSE;
} }
link_failed: link_failed:
{ {
GST_WARNING ("failed to link stream %d", idx); GST_WARNING ("failed to link stream %u", idx);
gst_object_unref (priv->send_rtp_sink); gst_object_unref (priv->send_rtp_sink);
priv->send_rtp_sink = NULL; priv->send_rtp_sink = NULL;
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);

1
gst/rtsp-server/rtsp-stream.h
View file

@ -69,6 +69,7 @@ GstPad * gst_rtsp_stream_get_srcpad (GstRTSPStream *stream);
void gst_rtsp_stream_set_control (GstRTSPStream *stream, const gchar *control); void gst_rtsp_stream_set_control (GstRTSPStream *stream, const gchar *control);
gchar * gst_rtsp_stream_get_control (GstRTSPStream *stream); gchar * gst_rtsp_stream_get_control (GstRTSPStream *stream);
gboolean gst_rtsp_stream_has_control (GstRTSPStream *stream, const gchar *control);
void gst_rtsp_stream_set_mtu (GstRTSPStream *stream, guint mtu); void gst_rtsp_stream_set_mtu (GstRTSPStream *stream, guint mtu);
guint gst_rtsp_stream_get_mtu (GstRTSPStream *stream); guint gst_rtsp_stream_get_mtu (GstRTSPStream *stream);