summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-12-24 22:23:01 +0100
committerWim Taymans <wim@metal.(none)>2009-12-24 22:23:01 +0100
commita65240d1c148599e431bf2f0892dfaa507e73ae6 (patch)
tree6d654ffad98547d9843065c83f816dc36b1ab23d
parent3c0f18d765d86df2a545c4152b944a80d35f1631 (diff)
rtspsrc: fix some comments, remove property check
Fix some comments, clarify some FIXMEs Remove the on-ntp-stop signal check now that the jitterbuffer is in -good and we know that it supports this signal.
-rw-r--r--gst/rtsp/gstrtspsrc.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 5455002df..b0ef7f2a1 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -814,7 +814,11 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, GstSDPMessage * sdp, gint idx)
814 gst_rtspsrc_collect_bandwidth (src, sdp, media, stream); 814 gst_rtspsrc_collect_bandwidth (src, sdp, media, stream);
815 815
816 /* we must have a payload. No payload means we cannot create caps */ 816 /* we must have a payload. No payload means we cannot create caps */
817 /* FIXME, handle multiple formats. */ 817 /* FIXME, handle multiple formats. The problem here is that we just want to
818 * take the first available format that we can handle but in order to do that
819 * we need to scan for depayloader plugins. Scanning for payloader plugins is
820 * also suboptimal because the user maybe just wants to save the raw stream
821 * and then we don't care. */
818 if ((payload = gst_sdp_media_get_format (media, 0))) { 822 if ((payload = gst_sdp_media_get_format (media, 0))) {
819 stream->pt = atoi (payload); 823 stream->pt = atoi (payload);
820 /* convert caps */ 824 /* convert caps */
@@ -1203,7 +1207,11 @@ gst_rtspsrc_media_to_caps (gint pt, const GstSDPMedia * media)
1203 if (valpos) { 1207 if (valpos) {
1204 /* we have a '=' and thus a value, remove the '=' with \0 */ 1208 /* we have a '=' and thus a value, remove the '=' with \0 */
1205 *valpos = '\0'; 1209 *valpos = '\0';
1206 /* value is everything between '=' and ';'. FIXME, strip? */ 1210 /* value is everything between '=' and ';'. We split the pairs at ;
1211 * boundaries so we can take the remainder of the value. Some servers
1212 * put spaces around the value which we strip off here. Alternatively
1213 * we could strip those spaces in the depayloaders should these spaces
1214 * actually carry any meaning in the future. */
1207 val = g_strstrip (valpos + 1); 1215 val = g_strstrip (valpos + 1);
1208 } else { 1216 } else {
1209 /* simple <param>;.. is translated into <param>=1;... */ 1217 /* simple <param>;.. is translated into <param>=1;... */
@@ -2091,13 +2099,8 @@ gst_rtspsrc_stream_configure_manager (GstRTSPSrc * src, GstRTSPStream * stream,
2091 src); 2099 src);
2092 g_signal_connect (src->session, "on-timeout", (GCallback) on_timeout, 2100 g_signal_connect (src->session, "on-timeout", (GCallback) on_timeout,
2093 src); 2101 src);
2094 /* FIXME: remove this once the rtpjitterbuffer is in -good */ 2102 g_signal_connect (src->session, "on-npt-stop", (GCallback) on_npt_stop,
2095 if (g_signal_lookup ("on-npt-stop", G_OBJECT_TYPE (src->session)) != 0) { 2103 src);
2096 g_signal_connect (src->session, "on-npt-stop", (GCallback) on_npt_stop,
2097 src);
2098 } else {
2099 GST_INFO_OBJECT (src, "skipping on-npt-stop handling, not implemented");
2100 }
2101 } 2104 }
2102 2105
2103 /* we stream directly to the manager, get some pads. Each RTSP stream goes 2106 /* we stream directly to the manager, get some pads. Each RTSP stream goes