projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26c8898
)
client: use media multicast group
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 11:43:44 +0000
(13:43 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 11:43:44 +0000
(13:43 +0200)
gst/rtsp-server/rtsp-client.c
patch
|
blob
|
history
diff --git
a/gst/rtsp-server/rtsp-client.c
b/gst/rtsp-server/rtsp-client.c
index
4698726
..
9b8e6ce
100644
(file)
--- a/
gst/rtsp-server/rtsp-client.c
+++ b/
gst/rtsp-server/rtsp-client.c
@@
-36,9
+36,6
@@
#include "rtsp-sdp.h"
#include "rtsp-params.h"
#include "rtsp-sdp.h"
#include "rtsp-params.h"
-/* temporary multicast address until it's configurable somewhere */
-#define MCAST_ADDRESS "224.2.0.1"
-
static GMutex *tunnels_lock;
static GHashTable *tunnels;
static GMutex *tunnels_lock;
static GHashTable *tunnels;
@@
-970,7
+967,7
@@
handle_setup_request (GstRTSPClient * client, GstRTSPClientState * state)
/* we have a valid transport now, set the destination of the client. */
g_free (ct->destination);
if (ct->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
/* we have a valid transport now, set the destination of the client. */
g_free (ct->destination);
if (ct->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
- ct->destination = g
_strdup (MCAST_ADDRESS
);
+ ct->destination = g
st_rtsp_media_get_multicast_group (media->media
);
} else {
GstRTSPUrl *url;
} else {
GstRTSPUrl *url;
@@
-1096,7
+1093,7
@@
create_sdp (GstRTSPClient * client, GstRTSPMedia * media)
info.server_proto = proto;
if (media->protocols & GST_RTSP_LOWER_TRANS_UDP_MCAST)
info.server_proto = proto;
if (media->protocols & GST_RTSP_LOWER_TRANS_UDP_MCAST)
- info.server_ip = g
_strdup (MCAST_ADDRESS
);
+ info.server_ip = g
st_rtsp_media_get_multicast_group (media
);
else
info.server_ip = g_strdup (client->server_ip);
else
info.server_ip = g_strdup (client->server_ip);