gst/rtsp/gstrtspsrc.c: Only send one transport at a time for improved compatibility...

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.

diff --git a/ChangeLog b/ChangeLog
index 93a37ad..f0c198a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-11-11  Wim Taymans  <wim.taymans@collabora.co.uk>
 
+       * 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  <wim.taymans@collabora.co.uk>
+
        * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_do_seek),
        (gst_rtspsrc_perform_seek):
        Only pause/play in the seek handler when the source was playing.

diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index dc55aa1..d31bee7 100644 (file)
--- 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;
   }
 }