From 21edbcc56697dc25ceea65ca8a101292823052f1 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 11 Nov 2008 16:00:48 +0000 Subject: [PATCH] gst/rtsp/gstrtspsrc.c: Only send one transport at a time for improved compatibility with some broken servers. See #53... Original commit message from CVS: * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_create_transports_string), (gst_rtspsrc_change_state): Only send one transport at a time for improved compatibility with some broken servers. See #537832. --- ChangeLog | 7 +++++++ gst/rtsp/gstrtspsrc.c | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93a37add5a..f0c198acc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-11 Wim Taymans + + * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_create_transports_string), + (gst_rtspsrc_change_state): + Only send one transport at a time for improved compatibility with some + broken servers. See #537832. + 2008-11-11 Wim Taymans * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_do_seek), diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index dc55aa1f7c..d31bee746c 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -3626,8 +3626,7 @@ gst_rtspsrc_create_transports_string (GstRTSPSrc * src, if (add_udp_str) g_string_append (result, "/UDP"); g_string_append (result, ";unicast;client_port=%%u1-%%u2"); - } - if (protocols & GST_RTSP_LOWER_TRANS_UDP_MCAST) { + } else if (protocols & GST_RTSP_LOWER_TRANS_UDP_MCAST) { GST_DEBUG_OBJECT (src, "adding UDP multicast"); /* we don't have to allocate any UDP ports yet, if the selected transport @@ -3639,8 +3638,7 @@ gst_rtspsrc_create_transports_string (GstRTSPSrc * src, if (add_udp_str) g_string_append (result, "/UDP"); g_string_append (result, ";multicast"); - } - if (protocols & GST_RTSP_LOWER_TRANS_TCP) { + } else if (protocols & GST_RTSP_LOWER_TRANS_TCP) { GST_DEBUG_OBJECT (src, "adding TCP"); if (result->len > 0) @@ -4829,6 +4827,7 @@ done: open_failed: { + GST_DEBUG_OBJECT (rtspsrc, "open failed"); return GST_STATE_CHANGE_FAILURE; } }