stream: revert back to create udpsrc/udpsink on DESCRIBE for unicast

[platform/upstream/gstreamer.git] / gst / rtsp-server / rtsp-client.c

diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index 7af7701..956a9eb 100644 (file)
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -1421,27 +1421,26 @@ default_configure_client_transport (GstRTSPClient * client,
   /* we have a valid transport now, set the destination of the client. */
   if (ct->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
     gboolean use_client_settings;
-    GSocketFamily family;
 
     use_client_settings =
         gst_rtsp_auth_check (GST_RTSP_AUTH_CHECK_TRANSPORT_CLIENT_SETTINGS);
 
     if (ct->destination && use_client_settings) {
-      family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
+      GstRTSPAddress *addr;
 
-      if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct, TRUE))
-        goto no_udp_protocol;
+      addr = gst_rtsp_stream_reserve_address (ctx->stream, ct->destination,
+          ct->port.min, ct->port.max - ct->port.min + 1, ct->ttl);
 
+      if (addr == NULL)
+        goto no_address;
+
+      gst_rtsp_address_free (addr);
     } else {
       GstRTSPAddress *addr;
+      GSocketFamily family;
 
       family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
 
-      if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct,
-              FALSE))
-        goto no_udp_protocol;
-
-      gst_rtsp_stream_get_server_port (ctx->stream, &ct->port, family);
       addr = gst_rtsp_stream_get_multicast_address (ctx->stream, family);
       if (addr == NULL)
         goto no_address;
@@ -1494,12 +1493,6 @@ default_configure_client_transport (GstRTSPClient * client,
         gst_rtsp_session_media_alloc_channels (ctx->sessmedia,
             &ct->interleaved);
       }
-    } else if (ct->lower_transport & GST_RTSP_LOWER_TRANS_UDP) {
-      GSocketFamily family;
-      family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
-      if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct,
-              FALSE))
-        goto no_udp_protocol;
     }
   }
   return TRUE;
@@ -1510,11 +1503,6 @@ no_address:
     GST_ERROR_OBJECT (client, "failed to acquire address for stream");
     return FALSE;
   }
-no_udp_protocol:
-  {
-    GST_ERROR_OBJECT (client, "failed to allocate udp ports");
-    return FALSE;
-  }
 }
 
 static GstRTSPTransport *