diff options
| -rw-r--r-- | ChangeLog | 28 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpbin.c | 33 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpbin.h | 3 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpclient.c | 4 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpclient.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpmanager.c | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpptdemux.c | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpptdemux.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpsession.c | 25 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpsession.h | 3 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpssrcdemux.c | 4 | ||||
| -rw-r--r-- | gst/rtpmanager/gstrtpssrcdemux.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpjitterbuffer.c | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpjitterbuffer.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpsession.c | 25 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpsession.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpsource.c | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpsource.h | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpstats.c | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpstats.h | 2 |
21 files changed, 113 insertions, 38 deletions
@@ -1,3 +1,31 @@ +2007-12-10 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/rtpmanager/gstrtpbin.c: (on_ssrc_sdes), (create_session), + (gst_rtp_bin_class_init): + * gst/rtpmanager/gstrtpbin.h: + * gst/rtpmanager/gstrtpclient.c: + * gst/rtpmanager/gstrtpclient.h: + * gst/rtpmanager/gstrtpjitterbuffer.h: + * gst/rtpmanager/gstrtpmanager.c: + * gst/rtpmanager/gstrtpptdemux.c: + * gst/rtpmanager/gstrtpptdemux.h: + * gst/rtpmanager/gstrtpsession.c: (on_ssrc_sdes), + (gst_rtp_session_class_init), (gst_rtp_session_init): + * gst/rtpmanager/gstrtpsession.h: + * gst/rtpmanager/gstrtpssrcdemux.c: + * gst/rtpmanager/gstrtpssrcdemux.h: + * gst/rtpmanager/rtpjitterbuffer.c: + * gst/rtpmanager/rtpjitterbuffer.h: + * gst/rtpmanager/rtpsession.c: (rtp_session_class_init), + (on_ssrc_sdes), (rtp_session_process_sdes): + * gst/rtpmanager/rtpsession.h: + * gst/rtpmanager/rtpsource.c: + * gst/rtpmanager/rtpsource.h: + * gst/rtpmanager/rtpstats.c: + * gst/rtpmanager/rtpstats.h: + Add signal to notify of an SDES change. + Fix object type in the signal callbacks. + 2007-12-10 Wim Taymans <wim.taymans@gmail.com> * gst/rtpmanager/gstrtpbin.c: (create_session), diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index 43ccf6b1..9e642dff 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -144,7 +144,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_bin_debug); static const GstElementDetails rtpbin_details = GST_ELEMENT_DETAILS ("RTP Bin", "Filter/Network/RTP", "Implement an RTP bin", - "Wim Taymans <wim@fluendo.com>"); + "Wim Taymans <wim.taymans@gmail.com>"); /* sink pads */ static GstStaticPadTemplate rtpbin_recv_rtp_sink_template = @@ -221,6 +221,7 @@ enum SIGNAL_ON_SSRC_COLLISION, SIGNAL_ON_SSRC_VALIDATED, SIGNAL_ON_SSRC_ACTIVE, + SIGNAL_ON_SSRC_SDES, SIGNAL_ON_BYE_SSRC, SIGNAL_ON_BYE_TIMEOUT, SIGNAL_ON_TIMEOUT, @@ -410,6 +411,13 @@ on_ssrc_active (GstElement * session, guint32 ssrc, GstRtpBinSession * sess) } static void +on_ssrc_sdes (GstElement * session, guint32 ssrc, GstRtpBinSession * sess) +{ + g_signal_emit (sess->bin, gst_rtp_bin_signals[SIGNAL_ON_SSRC_SDES], 0, + sess->id, ssrc); +} + +static void on_bye_ssrc (GstElement * session, guint32 ssrc, GstRtpBinSession * sess) { g_signal_emit (sess->bin, gst_rtp_bin_signals[SIGNAL_ON_BYE_SSRC], 0, @@ -474,6 +482,8 @@ create_session (GstRtpBin * rtpbin, gint id) (GCallback) on_ssrc_validated, sess); g_signal_connect (sess->session, "on-ssrc-active", (GCallback) on_ssrc_active, sess); + g_signal_connect (sess->session, "on-ssrc-sdes", + (GCallback) on_ssrc_sdes, sess); g_signal_connect (sess->session, "on-bye-ssrc", (GCallback) on_bye_ssrc, sess); g_signal_connect (sess->session, "on-bye-timeout", @@ -1100,7 +1110,7 @@ gst_rtp_bin_class_init (GstRtpBinClass * klass) NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); /** - * GstRtpBin::on-ssrc_collision: + * GstRtpBin::on-ssrc-collision: * @rtpbin: the object which received the signal * @session: the session * @ssrc: the SSRC @@ -1113,7 +1123,7 @@ gst_rtp_bin_class_init (GstRtpBinClass * klass) NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); /** - * GstRtpBin::on-ssrc_validated: + * GstRtpBin::on-ssrc-validated: * @rtpbin: the object which received the signal * @session: the session * @ssrc: the SSRC @@ -1126,7 +1136,7 @@ gst_rtp_bin_class_init (GstRtpBinClass * klass) NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); /** - * GstRtpBin::on-ssrc_active: + * GstRtpBin::on-ssrc-active: * @rtpbin: the object which received the signal * @session: the session * @ssrc: the SSRC @@ -1138,6 +1148,19 @@ gst_rtp_bin_class_init (GstRtpBinClass * klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRtpBinClass, on_ssrc_active), NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); + /** + * GstRtpBin::on-ssrc-sdes: + * @rtpbin: the object which received the signal + * @session: the session + * @ssrc: the SSRC + * + * Notify of a SSRC that is active, i.e., sending RTCP. + */ + gst_rtp_bin_signals[SIGNAL_ON_SSRC_SDES] = + g_signal_new ("on-ssrc-sdes", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRtpBinClass, on_ssrc_sdes), + NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, + G_TYPE_UINT, G_TYPE_UINT); /** * GstRtpBin::on-bye-ssrc: diff --git a/gst/rtpmanager/gstrtpbin.h b/gst/rtpmanager/gstrtpbin.h index f2349184..71834e68 100644 --- a/gst/rtpmanager/gstrtpbin.h +++ b/gst/rtpmanager/gstrtpbin.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -69,6 +69,7 @@ struct _GstRtpBinClass { void (*on_ssrc_collision) (GstRtpBin *rtpbin, guint session, guint32 ssrc); void (*on_ssrc_validated) (GstRtpBin *rtpbin, guint session, guint32 ssrc); void (*on_ssrc_active) (GstRtpBin *rtpbin, guint session, guint32 ssrc); + void (*on_ssrc_sdes) (GstRtpBin *rtpbin, guint session, guint32 ssrc); void (*on_bye_ssrc) (GstRtpBin *rtpbin, guint session, guint32 ssrc); void (*on_bye_timeout) (GstRtpBin *rtpbin, guint session, guint32 ssrc); void (*on_timeout) (GstRtpBin *rtpbin, guint session, guint32 ssrc); diff --git a/gst/rtpmanager/gstrtpclient.c b/gst/rtpmanager/gstrtpclient.c index 7dc1c4f5..1bdd72fc 100644 --- a/gst/rtpmanager/gstrtpclient.c +++ b/gst/rtpmanager/gstrtpclient.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -55,7 +55,7 @@ static const GstElementDetails rtpclient_details = GST_ELEMENT_DETAILS ("RTP Client", "Filter/Network/RTP", "Implement an RTP client", - "Wim Taymans <wim@fluendo.com>"); + "Wim Taymans <wim.taymans@gmail.com>"); /* sink pads */ static GstStaticPadTemplate rtpclient_rtp_sink_template = diff --git a/gst/rtpmanager/gstrtpclient.h b/gst/rtpmanager/gstrtpclient.h index 637767df..cb2f7753 100644 --- a/gst/rtpmanager/gstrtpclient.h +++ b/gst/rtpmanager/gstrtpclient.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/gstrtpjitterbuffer.h b/gst/rtpmanager/gstrtpjitterbuffer.h index 15abdc37..290aee09 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.h +++ b/gst/rtpmanager/gstrtpjitterbuffer.h @@ -4,7 +4,7 @@ * Copyright 2007 Collabora Ltd, * Copyright 2007 Nokia Corporation * @author: Philippe Kalaf <philippe.kalaf@collabora.co.uk>. - * Copyright 2007 Wim Taymans <wim@fluendo.com> + * Copyright 2007 Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/gstrtpmanager.c b/gst/rtpmanager/gstrtpmanager.c index eed5c25f..99779522 100644 --- a/gst/rtpmanager/gstrtpmanager.c +++ b/gst/rtpmanager/gstrtpmanager.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/gstrtpptdemux.c b/gst/rtpmanager/gstrtpptdemux.c index 8fd0ff4c..58ce53d9 100644 --- a/gst/rtpmanager/gstrtpptdemux.c +++ b/gst/rtpmanager/gstrtpptdemux.c @@ -5,7 +5,7 @@ * @author Kai Vehmanen <kai.vehmanen@nokia.com> * * Loosely based on GStreamer gstdecodebin - * Copyright (C) <2004> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2004> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/gstrtpptdemux.h b/gst/rtpmanager/gstrtpptdemux.h index 83c6d75b..028c97d4 100644 --- a/gst/rtpmanager/gstrtpptdemux.h +++ b/gst/rtpmanager/gstrtpptdemux.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 610bd55c..456f3abc 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -146,7 +146,7 @@ static const GstElementDetails rtpsession_details = GST_ELEMENT_DETAILS ("RTP Session", "Filter/Network/RTP", "Implement an RTP session", - "Wim Taymans <wim@fluendo.com>"); + "Wim Taymans <wim.taymans@gmail.com>"); /* sink pads */ static GstStaticPadTemplate rtpsession_recv_rtp_sink_template = @@ -209,6 +209,7 @@ enum SIGNAL_ON_SSRC_COLLISION, SIGNAL_ON_SSRC_VALIDATED, SIGNAL_ON_SSRC_ACTIVE, + SIGNAL_ON_SSRC_SDES, SIGNAL_ON_BYE_SSRC, SIGNAL_ON_BYE_TIMEOUT, SIGNAL_ON_TIMEOUT, @@ -338,6 +339,13 @@ on_ssrc_active (RTPSession * session, RTPSource * src, GstRtpSession * sess) } static void +on_ssrc_sdes (RTPSession * session, RTPSource * src, GstRtpSession * sess) +{ + g_signal_emit (sess, gst_rtp_session_signals[SIGNAL_ON_SSRC_SDES], 0, + src->ssrc); +} + +static void on_bye_ssrc (RTPSession * session, RTPSource * src, GstRtpSession * sess) { g_signal_emit (sess, gst_rtp_session_signals[SIGNAL_ON_BYE_SSRC], 0, @@ -471,6 +479,17 @@ gst_rtp_session_class_init (GstRtpSessionClass * klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRtpSessionClass, on_ssrc_active), NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + /** + * GstRtpSession::on-ssrc-sdes: + * @session: the object which received the signal + * @src: the SSRC + * + * Notify that a new SDES was received for SSRC. + */ + gst_rtp_session_signals[SIGNAL_ON_SSRC_SDES] = + g_signal_new ("on-ssrc-sdes", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRtpSessionClass, on_ssrc_sdes), + NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); /** * GstRtpSession::on-bye-ssrc: @@ -596,6 +615,8 @@ gst_rtp_session_init (GstRtpSession * rtpsession, GstRtpSessionClass * klass) (GCallback) on_ssrc_validated, rtpsession); g_signal_connect (rtpsession->priv->session, "on-ssrc-active", (GCallback) on_ssrc_active, rtpsession); + g_signal_connect (rtpsession->priv->session, "on-ssrc-sdes", + (GCallback) on_ssrc_sdes, rtpsession); g_signal_connect (rtpsession->priv->session, "on-bye-ssrc", (GCallback) on_bye_ssrc, rtpsession); g_signal_connect (rtpsession->priv->session, "on-bye-timeout", diff --git a/gst/rtpmanager/gstrtpsession.h b/gst/rtpmanager/gstrtpsession.h index b4c50b10..211fffb3 100644 --- a/gst/rtpmanager/gstrtpsession.h +++ b/gst/rtpmanager/gstrtpsession.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -67,6 +67,7 @@ struct _GstRtpSessionClass { void (*on_ssrc_collision) (GstRtpSession *sess, guint32 ssrc); void (*on_ssrc_validated) (GstRtpSession *sess, guint32 ssrc); void (*on_ssrc_active) (GstRtpSession *sess, guint32 ssrc); + void (*on_ssrc_sdes) (GstRtpSession *sess, guint32 ssrc); void (*on_bye_ssrc) (GstRtpSession *sess, guint32 ssrc); void (*on_bye_timeout) (GstRtpSession *sess, guint32 ssrc); void (*on_timeout) (GstRtpSession *sess, guint32 ssrc); diff --git a/gst/rtpmanager/gstrtpssrcdemux.c b/gst/rtpmanager/gstrtpssrcdemux.c index 96e82ac2..d8d03d25 100644 --- a/gst/rtpmanager/gstrtpssrcdemux.c +++ b/gst/rtpmanager/gstrtpssrcdemux.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * RTP SSRC demuxer * @@ -93,7 +93,7 @@ static GstElementDetails gst_rtp_ssrc_demux_details = { "RTP SSRC Demux", "Demux/Network/RTP", "Splits RTP streams based on the SSRC", - "Wim Taymans <wim@fluendo.com>" + "Wim Taymans <wim.taymans@gmail.com>" }; #define GST_PAD_LOCK(obj) (g_mutex_lock ((obj)->padlock)) diff --git a/gst/rtpmanager/gstrtpssrcdemux.h b/gst/rtpmanager/gstrtpssrcdemux.h index 10c569d9..d89472af 100644 --- a/gst/rtpmanager/gstrtpssrcdemux.h +++ b/gst/rtpmanager/gstrtpssrcdemux.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpjitterbuffer.c b/gst/rtpmanager/rtpjitterbuffer.c index 4a9ea8fd..7ebe18e0 100644 --- a/gst/rtpmanager/rtpjitterbuffer.c +++ b/gst/rtpmanager/rtpjitterbuffer.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpjitterbuffer.h b/gst/rtpmanager/rtpjitterbuffer.h index 3648e18b..a6c16ba9 100644 --- a/gst/rtpmanager/rtpjitterbuffer.h +++ b/gst/rtpmanager/rtpjitterbuffer.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index 1ded0dcc..ab5e7688 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -119,9 +119,9 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-new-ssrc", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_new_ssrc), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** - * RTPSession::on-ssrc_collision: + * RTPSession::on-ssrc-collision: * @session: the object which received the signal * @src: the #RTPSource that caused a collision * @@ -131,9 +131,9 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-ssrc-collision", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_ssrc_collision), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** - * RTPSession::on-ssrc_validated: + * RTPSession::on-ssrc-validated: * @session: the object which received the signal * @src: the new validated RTPSource * @@ -143,7 +143,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-ssrc-validated", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_ssrc_validated), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** * RTPSession::on-ssrc-active: * @session: the object which received the signal @@ -155,7 +155,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-ssrc-active", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_ssrc_active), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** * RTPSession::on-ssrc-sdes: * @session: the object which received the signal @@ -167,7 +167,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-ssrc-sdes", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_ssrc_sdes), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** * RTPSession::on-bye-ssrc: * @session: the object which received the signal @@ -179,7 +179,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-bye-ssrc", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_bye_ssrc), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** * RTPSession::on-bye-timeout: * @session: the object which received the signal @@ -191,7 +191,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-bye-timeout", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_bye_timeout), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); /** * RTPSession::on-timeout: * @session: the object which received the signal @@ -203,7 +203,7 @@ rtp_session_class_init (RTPSessionClass * klass) g_signal_new ("on-timeout", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (RTPSessionClass, on_timeout), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - G_TYPE_OBJECT); + RTP_TYPE_SOURCE); g_object_class_install_property (gobject_class, PROP_INTERNAL_SOURCE, g_param_spec_object ("internal-source", "Internal Source", @@ -473,6 +473,7 @@ on_ssrc_active (RTPSession * sess, RTPSource * source) static void on_ssrc_sdes (RTPSession * sess, RTPSource * source) { + GST_DEBUG ("SDES changed for SSRC %08x", source->ssrc); RTP_SESSION_UNLOCK (sess); g_signal_emit (sess, rtp_session_signals[SIGNAL_ON_SSRC_SDES], 0, source); RTP_SESSION_LOCK (sess); @@ -1258,7 +1259,7 @@ rtp_session_process_sdes (RTPSession * sess, GstRTCPPacket * packet, GST_DEBUG ("entry %d, type %d, len %d, data %.*s", j, type, len, len, data); - + changed |= rtp_source_set_sdes (source, type, data, len); more_entries = gst_rtcp_packet_sdes_next_entry (packet); j++; diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h index 0c99d53f..12dd1603 100644 --- a/gst/rtpmanager/rtpsession.h +++ b/gst/rtpmanager/rtpsession.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c index b8150fcb..00f298d4 100644 --- a/gst/rtpmanager/rtpsource.c +++ b/gst/rtpmanager/rtpsource.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpsource.h b/gst/rtpmanager/rtpsource.h index 0a744dfb..b731ae6a 100644 --- a/gst/rtpmanager/rtpsource.h +++ b/gst/rtpmanager/rtpsource.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpstats.c b/gst/rtpmanager/rtpstats.c index 55cf2e05..517018d1 100644 --- a/gst/rtpmanager/rtpstats.c +++ b/gst/rtpmanager/rtpstats.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/rtpmanager/rtpstats.h b/gst/rtpmanager/rtpstats.h index e2e4e397..c0d3a512 100644 --- a/gst/rtpmanager/rtpstats.h +++ b/gst/rtpmanager/rtpstats.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wim Taymans <wim@fluendo.com> + * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public |