mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: fix logic for collect_streams

Browse source 
Fix the logic of gst_rtsp_media_collect_streams() so after looping collecting
all streams it knows if it got any, and can check if the transport mode is OK.

CID #1268400
This commit is contained in:
Luis de Bethencourt 2015-02-10 16:39:58 +00:00
parent 8405cfad3a
commit ec7bf5379e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1426,6 +1426,7 @@ gst_rtsp_media_collect_streams (GstRTSPMedia * media)
GstPad *pad; GstPad *pad;
gint i; gint i;
gboolean have_elem; gboolean have_elem;
gboolean more_elem_remaining = TRUE;
GstRTSPTransportMode mode = 0; GstRTSPTransportMode mode = 0;
g_return_if_fail (GST_IS_RTSP_MEDIA (media)); g_return_if_fail (GST_IS_RTSP_MEDIA (media));
@ -1433,11 +1434,11 @@ gst_rtsp_media_collect_streams (GstRTSPMedia * media)
priv = media->priv; priv = media->priv;
element = priv->element; element = priv->element;
have_elem = TRUE; have_elem = FALSE;
for (i = 0; have_elem; i++) { for (i = 0; more_elem_remaining; i++) {
gchar *name; gchar *name;
have_elem = FALSE; more_elem_remaining = FALSE;
name = g_strdup_printf ("pay%d", i); name = g_strdup_printf ("pay%d", i);
if ((elem = gst_bin_get_by_name (GST_BIN (element), name))) { if ((elem = gst_bin_get_by_name (GST_BIN (element), name))) {
@ -1451,6 +1452,7 @@ gst_rtsp_media_collect_streams (GstRTSPMedia * media)
gst_object_unref (elem); gst_object_unref (elem);
have_elem = TRUE; have_elem = TRUE;
more_elem_remaining = TRUE;
mode |= GST_RTSP_TRANSPORT_MODE_PLAY; mode |= GST_RTSP_TRANSPORT_MODE_PLAY;
} }
g_free (name); g_free (name);
@ -1465,6 +1467,7 @@ gst_rtsp_media_collect_streams (GstRTSPMedia * media)
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
have_elem = TRUE; have_elem = TRUE;
more_elem_remaining = TRUE;
mode |= GST_RTSP_TRANSPORT_MODE_PLAY; mode |= GST_RTSP_TRANSPORT_MODE_PLAY;
} }
g_free (name); g_free (name);
@ -1481,6 +1484,7 @@ gst_rtsp_media_collect_streams (GstRTSPMedia * media)
gst_object_unref (elem); gst_object_unref (elem);
have_elem = TRUE; have_elem = TRUE;
more_elem_remaining = TRUE;
mode |= GST_RTSP_TRANSPORT_MODE_RECORD; mode |= GST_RTSP_TRANSPORT_MODE_RECORD;
} }
g_free (name); g_free (name);