mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

session: improve RTP-Info

Browse source 
Ignore streams that can't generate RTP-Info instead of failing.
Don't return the empty string when all streams are unconfigured but
return NULL so that we don't generate and empty RTP-Info header.
Improve docs a little.
This commit is contained in:
Wim Taymans 2014-02-07 16:39:49 +01:00
parent 271f533098
commit 8bd53dcf9c
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtsp-server/rtsp-session-media.c
View file

@ -239,8 +239,8 @@ gst_rtsp_session_media_get_base_time (GstRTSPSessionMedia * media)
* Retrieve the RTP-Info header string for all streams in @media
* with configured transports.
*
* Returns: (transfer full): The RTP-Info as a string, g_free()
* after usage.
* Returns: (transfer full): The RTP-Info as a string or %NULL when
* no RTP-Info could be generated, g_free() after usage.
*/
gchar *
gst_rtsp_session_media_get_rtpinfo (GstRTSPSessionMedia * media)
@ -306,8 +306,10 @@ gst_rtsp_session_media_get_rtpinfo (GstRTSPSessionMedia * media)
stream_rtpinfo =
gst_rtsp_stream_transport_get_rtpinfo (transport, earliest);
if (stream_rtpinfo == NULL)
goto stream_rtpinfo_missing;
if (stream_rtpinfo == NULL) {
GST_DEBUG_OBJECT (media, "ignoring unknown RTPInfo %d", i);
continue;
}
if (rtpinfo == NULL)
rtpinfo = g_string_new ("");
@ -317,14 +319,12 @@ gst_rtsp_session_media_get_rtpinfo (GstRTSPSessionMedia * media)
g_string_append (rtpinfo, stream_rtpinfo);
g_free (stream_rtpinfo);
}
if (rtpinfo == NULL) {
GST_INFO_OBJECT (media, "no transports configured, RTP info is empty");
rtpinfo = g_string_new ("");
}
g_mutex_unlock (&priv->lock);
if (rtpinfo == NULL) {
GST_WARNING_OBJECT (media, "RTP info is empty");
return NULL;
}
return g_string_free (rtpinfo, FALSE);
/* ERRORS */
@ -334,14 +334,6 @@ not_prepared:
GST_ERROR_OBJECT (media, "media was not prepared");
return NULL;
}
stream_rtpinfo_missing:
{
g_mutex_unlock (&priv->lock);
if (rtpinfo)
g_string_free (rtpinfo, TRUE);
GST_ERROR_OBJECT (media, "could not get stream %d rtpinfo", i);
return NULL;
}
}
/**

6
gst/rtsp-server/rtsp-stream-transport.c
View file

@ -315,10 +315,10 @@ gst_rtsp_stream_transport_get_url (GstRTSPStreamTransport * trans)
* @trans: a #GstRTSPStreamTransport
* @start_time: a star time
*
* Get the RTPInfo string for @trans and @start_time.
* Get the RTP-Info string for @trans and @start_time.
*
* Returns: the RTPInfo string for @trans and @start_time. g_free() after
* usage.
* Returns: the RTPInfo string for @trans and @start_time or %NULL when
* the RTP-Info could not be determined. g_free() after usage.
*/
gchar *
gst_rtsp_stream_transport_get_rtpinfo (GstRTSPStreamTransport * trans,