From adb0d68c07082fe17ded81e2528f9987cba5aac6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 25 Jul 2013 15:43:11 +0200 Subject: [PATCH] session: remove source from sync_rtcp We don't need to know the sender source of the session in the callback, the SR packet is for all participants in the session. --- gst/rtpmanager/gstrtpsession.c | 4 ++-- gst/rtpmanager/rtpsession.c | 2 +- gst/rtpmanager/rtpsession.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index cf70426..361542f 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -260,7 +260,7 @@ static GstFlowReturn gst_rtp_session_send_rtp (RTPSession * sess, static GstFlowReturn gst_rtp_session_send_rtcp (RTPSession * sess, RTPSource * src, GstBuffer * buffer, gboolean eos, gpointer user_data); static GstFlowReturn gst_rtp_session_sync_rtcp (RTPSession * sess, - RTPSource * src, GstBuffer * buffer, gpointer user_data); + GstBuffer * buffer, gpointer user_data); static gint gst_rtp_session_clock_rate (RTPSession * sess, guint8 payload, gpointer user_data); static void gst_rtp_session_reconsider (RTPSession * sess, gpointer user_data); @@ -1207,7 +1207,7 @@ stopping: /* called when the session manager has an SR RTCP packet ready for handling * inter stream synchronisation */ static GstFlowReturn -gst_rtp_session_sync_rtcp (RTPSession * sess, RTPSource * src, +gst_rtp_session_sync_rtcp (RTPSession * sess, GstBuffer * buffer, gpointer user_data) { GstFlowReturn result; diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index a2e90a3..78e05f2 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -2392,7 +2392,7 @@ rtp_session_process_rtcp (RTPSession * sess, GstBuffer * buffer, /* make writable, we might want to change the buffer */ buffer = gst_buffer_make_writable (buffer); - result = sess->callbacks.sync_rtcp (sess, sess->source, buffer, + result = sess->callbacks.sync_rtcp (sess, buffer, sess->sync_rtcp_user_data); } else gst_buffer_unref (buffer); diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h index 16e73b6..6e64e77 100644 --- a/gst/rtpmanager/rtpsession.h +++ b/gst/rtpmanager/rtpsession.h @@ -85,7 +85,6 @@ typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, G /** * RTPSessionSyncRTCP: * @sess: an #RTPSession - * @src: the #RTPSource * @buffer: the RTCP buffer ready for synchronisation * @user_data: user data specified when registering * @@ -94,7 +93,7 @@ typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, G * * Returns: a #GstFlowReturn. */ -typedef GstFlowReturn (*RTPSessionSyncRTCP) (RTPSession *sess, RTPSource *src, GstBuffer *buffer, gpointer user_data); +typedef GstFlowReturn (*RTPSessionSyncRTCP) (RTPSession *sess, GstBuffer *buffer, gpointer user_data); /** * RTPSessionClockRate: -- 2.7.4