mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

media: use multiudpsink send-duplicates when we can

Browse source 
If we have a new enough multiudpsink with the send-duplicates property, use this
instead of doing our own filtering. Our custom filtering code should eventually
be removed when we can depend on a released -good.
This commit is contained in:
Wim Taymans 2010-08-20 15:58:39 +02:00
parent c89d17ca26
commit a900866570
2 changed files with 60 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gst/rtsp-server/rtsp-media.c
View file

@ -737,6 +737,16 @@ again:
if (!udpsink1) if (!udpsink1)
goto no_udp_protocol; goto no_udp_protocol;
if (g_object_class_find_property (G_OBJECT_GET_CLASS (udpsink0), "send-duplicates")) {
g_object_set (G_OBJECT (udpsink0), "send-duplicates", FALSE, NULL);
g_object_set (G_OBJECT (udpsink1), "send-duplicates", FALSE, NULL);
stream->filter_duplicates = FALSE;
}
else {
GST_WARNING ("multiudpsink version found without send-duplicates property");
stream->filter_duplicates = TRUE;
}
g_object_get (G_OBJECT (udpsrc1), "sock", &sockfd, NULL); g_object_get (G_OBJECT (udpsrc1), "sock", &sockfd, NULL);
g_object_set (G_OBJECT (udpsink1), "sockfd", sockfd, NULL); g_object_set (G_OBJECT (udpsink1), "sockfd", sockfd, NULL);
g_object_set (G_OBJECT (udpsink1), "closefd", FALSE, NULL); g_object_set (G_OBJECT (udpsink1), "closefd", FALSE, NULL);
@ -1571,29 +1581,37 @@ static void
add_udp_destination (GstRTSPMedia *media, GstRTSPMediaStream *stream, add_udp_destination (GstRTSPMedia *media, GstRTSPMediaStream *stream,
gchar *dest, gint min, gint max) gchar *dest, gint min, gint max)
{ {
RTSPDestination fdest; gboolean do_add = TRUE;
RTSPDestination *ndest; RTSPDestination *ndest;
GList *find;
fdest.dest = dest; if (stream->filter_duplicates) {
fdest.min = min; RTSPDestination fdest;
fdest.max = max; GList *find;
/* first see if we already added this destination */ fdest.dest = dest;
find = g_list_find_custom (stream->destinations, &fdest, (GCompareFunc) dest_compare); fdest.min = min;
if (find) { fdest.max = max;
ndest = (RTSPDestination *) find->data;
GST_INFO ("already streaming to %s:%d-%d with %d clients", dest, min, max, ndest->count); /* first see if we already added this destination */
ndest->count++; find = g_list_find_custom (stream->destinations, &fdest, (GCompareFunc) dest_compare);
} else { if (find) {
ndest = (RTSPDestination *) find->data;
GST_INFO ("already streaming to %s:%d-%d with %d clients", dest, min, max, ndest->count);
ndest->count++;
do_add = FALSE;
}
}
if (do_add) {
GST_INFO ("adding %s:%d-%d", dest, min, max); GST_INFO ("adding %s:%d-%d", dest, min, max);
g_signal_emit_by_name (stream->udpsink[0], "add", dest, min, NULL); g_signal_emit_by_name (stream->udpsink[0], "add", dest, min, NULL);
g_signal_emit_by_name (stream->udpsink[1], "add", dest, max, NULL); g_signal_emit_by_name (stream->udpsink[1], "add", dest, max, NULL);
ndest = create_destination (dest, min, max); if (stream->filter_duplicates) {
stream->destinations = g_list_prepend (stream->destinations, ndest); ndest = create_destination (dest, min, max);
stream->destinations = g_list_prepend (stream->destinations, ndest);
}
} }
} }
@ -1601,29 +1619,38 @@ static void
remove_udp_destination (GstRTSPMedia *media, GstRTSPMediaStream *stream, remove_udp_destination (GstRTSPMedia *media, GstRTSPMediaStream *stream,
gchar *dest, gint min, gint max) gchar *dest, gint min, gint max)
{ {
RTSPDestination fdest; gboolean do_remove = TRUE;
RTSPDestination *ndest; RTSPDestination *ndest;
GList *find; GList *find;
fdest.dest = dest; if (stream->filter_duplicates) {
fdest.min = min; RTSPDestination fdest;
fdest.max = max;
/* first see if we already added this destination */ fdest.dest = dest;
find = g_list_find_custom (stream->destinations, &fdest, (GCompareFunc) dest_compare); fdest.min = min;
if (!find) fdest.max = max;
return;
ndest = (RTSPDestination *) find->data; /* first see if we already added this destination */
if (--ndest->count == 0) { find = g_list_find_custom (stream->destinations, &fdest, (GCompareFunc) dest_compare);
if (!find)
return;
ndest = (RTSPDestination *) find->data;
if (--ndest->count > 0) {
do_remove = FALSE;
GST_INFO ("still streaming to %s:%d-%d with %d clients", dest, min, max, ndest->count);
}
}
if (do_remove) {
GST_INFO ("removing %s:%d-%d", dest, min, max); GST_INFO ("removing %s:%d-%d", dest, min, max);
g_signal_emit_by_name (stream->udpsink[0], "remove", dest, min, NULL); g_signal_emit_by_name (stream->udpsink[0], "remove", dest, min, NULL);
g_signal_emit_by_name (stream->udpsink[1], "remove", dest, max, NULL); g_signal_emit_by_name (stream->udpsink[1], "remove", dest, max, NULL);
stream->destinations = g_list_delete_link (stream->destinations, find); if (stream->filter_duplicates) {
free_destination (ndest); stream->destinations = g_list_delete_link (stream->destinations, find);
} else { free_destination (ndest);
GST_INFO ("still streaming to %s:%d-%d with %d clients", dest, min, max, ndest->count); }
} }
} }

4
gst/rtsp-server/rtsp-media.h
View file

@ -137,6 +137,10 @@ struct _GstRTSPMediaStream {
/* transports we stream to */ /* transports we stream to */
GList *transports; GList *transports;
/* to filter out duplicate destinations in case multiudpsink is too old to do
* this for us */
gboolean filter_duplicates;
GList *destinations; GList *destinations;
}; };