mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

session: remove source from sync_rtcp

Browse source 
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.
This commit is contained in:
Wim Taymans 2013-07-25 15:43:11 +02:00
parent bf7d8173b3
commit adb0d68c07
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtpmanager/gstrtpsession.c
View file

@ -260,7 +260,7 @@ static GstFlowReturn gst_rtp_session_send_rtp (RTPSession * sess,
static GstFlowReturn gst_rtp_session_send_rtcp (RTPSession * sess, static GstFlowReturn gst_rtp_session_send_rtcp (RTPSession * sess,
RTPSource * src, GstBuffer * buffer, gboolean eos, gpointer user_data); RTPSource * src, GstBuffer * buffer, gboolean eos, gpointer user_data);
static GstFlowReturn gst_rtp_session_sync_rtcp (RTPSession * sess, 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, static gint gst_rtp_session_clock_rate (RTPSession * sess, guint8 payload,
gpointer user_data); gpointer user_data);
static void gst_rtp_session_reconsider (RTPSession * sess, 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 /* called when the session manager has an SR RTCP packet ready for handling
* inter stream synchronisation */ * inter stream synchronisation */
static GstFlowReturn static GstFlowReturn
gst_rtp_session_sync_rtcp (RTPSession * sess, RTPSource * src, gst_rtp_session_sync_rtcp (RTPSession * sess,
GstBuffer * buffer, gpointer user_data) GstBuffer * buffer, gpointer user_data)
{ {
GstFlowReturn result; GstFlowReturn result;

2
gst/rtpmanager/rtpsession.c
View file

@ -2392,7 +2392,7 @@ rtp_session_process_rtcp (RTPSession * sess, GstBuffer * buffer,
/* make writable, we might want to change the buffer */ /* make writable, we might want to change the buffer */
buffer = gst_buffer_make_writable (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); sess->sync_rtcp_user_data);
} else } else
gst_buffer_unref (buffer); gst_buffer_unref (buffer);

3
gst/rtpmanager/rtpsession.h
View file

@ -85,7 +85,6 @@ typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, G
/** /**
* RTPSessionSyncRTCP: * RTPSessionSyncRTCP:
* @sess: an #RTPSession * @sess: an #RTPSession
* @src: the #RTPSource
* @buffer: the RTCP buffer ready for synchronisation * @buffer: the RTCP buffer ready for synchronisation
* @user_data: user data specified when registering * @user_data: user data specified when registering
* *
@ -94,7 +93,7 @@ typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, G
* *
* Returns: a #GstFlowReturn. * 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: * RTPSessionClockRate: