summaryrefslogtreecommitdiffstats
path: root/gst/rtpmanager
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2009-09-01 13:03:57 +0200
committerPeter Kjellerstedt <pkj@axis.com>2009-09-01 13:04:14 +0200
commit57adc2a803b0294372614be2f906ade4b9739706 (patch)
tree95d18a8b855cad8472d9ca66f7a33121c18eb31b /gst/rtpmanager
parent923b5b495ad5a32e83eace8dc551cd9f276283ab (diff)
rtpmanager: A little clean up
Make the code flow of gst_rtp_session_send_rtcp() and gst_rtp_session_sync_rtcp() identical.
Diffstat (limited to 'gst/rtpmanager')
-rw-r--r--gst/rtpmanager/gstrtpsession.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index d59124cc..b3169136 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -1036,11 +1036,11 @@ gst_rtp_session_send_rtcp (RTPSession * sess, RTPSource * src,
gst_caps_unref (caps);
gst_buffer_set_caps (buffer, caps);
gst_caps_unref (caps);
- GST_LOG_OBJECT (rtpsession, "sending RTCP");
gst_object_ref (rtcp_src);
GST_RTP_SESSION_UNLOCK (rtpsession);
+ GST_LOG_OBJECT (rtpsession, "sending RTCP");
result = gst_pad_push (rtcp_src, buffer);
/* we have to send EOS after this packet */
@@ -1071,8 +1071,8 @@ 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, GstBuffer * buffer, gpointer user_data)
+gst_rtp_session_sync_rtcp (RTPSession * sess, RTPSource * src,
+ GstBuffer * buffer, gpointer user_data)
{
GstFlowReturn result;
GstRtpSession *rtpsession;
@@ -1097,6 +1097,7 @@ gst_rtp_session_sync_rtcp (RTPSession * sess,
gst_caps_unref (caps);
gst_buffer_set_caps (buffer, caps);
gst_caps_unref (caps);
+
gst_object_ref (sync_src);
GST_RTP_SESSION_UNLOCK (rtpsession);