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

media: add property for multicast group

Browse source 
Add a property to configure the multicast group in the media.

Based on patches from Marc Leeman and Robert Krakora.
This commit is contained in:
Wim Taymans 2011-08-16 13:25:16 +02:00
parent 1f8b97d940
commit 5b53335873
2 changed files with 65 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@
//#define DEFAULT_PROTOCOLS GST_RTSP_LOWER_TRANS_UDP_MCAST //#define DEFAULT_PROTOCOLS GST_RTSP_LOWER_TRANS_UDP_MCAST
#define DEFAULT_EOS_SHUTDOWN FALSE #define DEFAULT_EOS_SHUTDOWN FALSE
#define DEFAULT_BUFFER_SIZE 0x80000 #define DEFAULT_BUFFER_SIZE 0x80000
#define DEFAULT_MULTICAST_GROUP "224.2.0.1"
/* define to dump received RTCP packets */ /* define to dump received RTCP packets */
#undef DUMP_STATS #undef DUMP_STATS
@ -43,6 +44,7 @@ enum
PROP_PROTOCOLS, PROP_PROTOCOLS,
PROP_EOS_SHUTDOWN, PROP_EOS_SHUTDOWN,
PROP_BUFFER_SIZE, PROP_BUFFER_SIZE,
PROP_MULTICAST_GROUP,
PROP_LAST PROP_LAST
}; };
@ -112,6 +114,11 @@ gst_rtsp_media_class_init (GstRTSPMediaClass * klass)
"The kernel UDP buffer size to use", 0, G_MAXUINT, "The kernel UDP buffer size to use", 0, G_MAXUINT,
DEFAULT_BUFFER_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_BUFFER_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_MULTICAST_GROUP,
g_param_spec_string ("multicast-group", "Multicast Group",
"The Multicast group to send media to",
DEFAULT_MULTICAST_GROUP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_rtsp_media_signals[SIGNAL_PREPARED] = gst_rtsp_media_signals[SIGNAL_PREPARED] =
g_signal_new ("prepared", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("prepared", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRTSPMediaClass, prepared), NULL, NULL, G_STRUCT_OFFSET (GstRTSPMediaClass, prepared), NULL, NULL,
@ -154,6 +161,7 @@ gst_rtsp_media_init (GstRTSPMedia * media)
media->protocols = DEFAULT_PROTOCOLS; media->protocols = DEFAULT_PROTOCOLS;
media->eos_shutdown = DEFAULT_EOS_SHUTDOWN; media->eos_shutdown = DEFAULT_EOS_SHUTDOWN;
media->buffer_size = DEFAULT_BUFFER_SIZE; media->buffer_size = DEFAULT_BUFFER_SIZE;
media->multicast_group = g_strdup (DEFAULT_MULTICAST_GROUP);
} }
void void
@ -226,6 +234,7 @@ gst_rtsp_media_finalize (GObject * obj)
g_source_destroy (media->source); g_source_destroy (media->source);
g_source_unref (media->source); g_source_unref (media->source);
} }
g_free (media->multicast_group);
g_mutex_free (media->lock); g_mutex_free (media->lock);
g_cond_free (media->cond); g_cond_free (media->cond);
@ -254,6 +263,9 @@ gst_rtsp_media_get_property (GObject * object, guint propid,
case PROP_BUFFER_SIZE: case PROP_BUFFER_SIZE:
g_value_set_uint (value, gst_rtsp_media_get_buffer_size (media)); g_value_set_uint (value, gst_rtsp_media_get_buffer_size (media));
break; break;
case PROP_MULTICAST_GROUP:
g_value_take_string (value, gst_rtsp_media_get_multicast_group (media));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec);
} }
@ -281,6 +293,9 @@ gst_rtsp_media_set_property (GObject * object, guint propid,
case PROP_BUFFER_SIZE: case PROP_BUFFER_SIZE:
gst_rtsp_media_set_buffer_size (media, g_value_get_uint (value)); gst_rtsp_media_set_buffer_size (media, g_value_get_uint (value));
break; break;
case PROP_MULTICAST_GROUP:
gst_rtsp_media_set_multicast_group (media, g_value_get_string (value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, propid, pspec);
} }
@ -523,6 +538,46 @@ gst_rtsp_media_get_buffer_size (GstRTSPMedia * media)
return media->buffer_size; return media->buffer_size;
} }
/**
* gst_rtsp_media_set_multicast_group:
* @media: a #GstRTSPMedia
* @mc: the new multicast group
*
* Set the multicast group that media from @media will be streamed to.
*/
void
gst_rtsp_media_set_multicast_group (GstRTSPMedia * media, const gchar * mc)
{
g_return_if_fail (GST_IS_RTSP_MEDIA (media));
g_mutex_lock (media->lock);
g_free (media->multicast_group);
media->multicast_group = g_strdup (mc);
g_mutex_unlock (media->lock);
}
/**
* gst_rtsp_media_get_multicast_group:
* @media: a #GstRTSPMedia
*
* Get the multicast group that media from @media will be streamed to.
*
* Returns: the multicast group
*/
gchar *
gst_rtsp_media_get_multicast_group (GstRTSPMedia * media)
{
gchar *result;
g_return_val_if_fail (GST_IS_RTSP_MEDIA (media), NULL);
g_mutex_lock (media->lock);
result = g_strdup (media->multicast_group);
g_mutex_unlock (media->lock);
return result;
}
/** /**
* gst_rtsp_media_set_auth: * gst_rtsp_media_set_auth:
* @media: a #GstRTSPMedia * @media: a #GstRTSPMedia

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

@ -203,6 +203,7 @@ struct _GstRTSPMedia {
gboolean eos_shutdown; gboolean eos_shutdown;
guint buffer_size; guint buffer_size;
GstRTSPAuth *auth; GstRTSPAuth *auth;
gchar *multicast_group;
GstElement *element; GstElement *element;
GArray *streams; GArray *streams;
@ -282,6 +283,10 @@ GstRTSPAuth * gst_rtsp_media_get_auth (GstRTSPMedia *media);
void gst_rtsp_media_set_buffer_size (GstRTSPMedia *media, guint size); void gst_rtsp_media_set_buffer_size (GstRTSPMedia *media, guint size);
guint gst_rtsp_media_get_buffer_size (GstRTSPMedia *media); guint gst_rtsp_media_get_buffer_size (GstRTSPMedia *media);
void gst_rtsp_media_set_multicast_group (GstRTSPMedia *media, const gchar * mc);
gchar * gst_rtsp_media_get_multicast_group (GstRTSPMedia *media);
/* prepare the media for playback */ /* prepare the media for playback */
gboolean gst_rtsp_media_prepare (GstRTSPMedia *media); gboolean gst_rtsp_media_prepare (GstRTSPMedia *media);
gboolean gst_rtsp_media_is_prepared (GstRTSPMedia *media); gboolean gst_rtsp_media_is_prepared (GstRTSPMedia *media);