diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2007-04-25 08:30:48 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-08-11 02:30:25 +0100 |
| commit | 23883be047f94d8bde7094b6210277e92e9df11c (patch) | |
| tree | e5f8ae946f045eb6362ecc5782061bf78978e3a0 /gst/rtpmanager/gstrtpsession.c | |
| parent | 677b361dc33b4a08fa18df88a64f4d49a511647d (diff) | |
gst/rtpmanager/gstrtpbin.c: fix for pad name change
Original commit message from CVS:
* gst/rtpmanager/gstrtpbin.c: (create_rtcp):
fix for pad name change
* gst/rtpmanager/gstrtpsession.c: (rtcp_thread),
(gst_rtp_session_send_rtcp), (gst_rtp_session_clock_rate):
Fix for renamed methods.
* gst/rtpmanager/rtpsession.c: (rtp_session_init),
(rtp_session_finalize), (rtp_session_set_cname),
(rtp_session_get_cname), (rtp_session_set_name),
(rtp_session_get_name), (rtp_session_set_email),
(rtp_session_get_email), (rtp_session_set_phone),
(rtp_session_get_phone), (rtp_session_set_location),
(rtp_session_get_location), (rtp_session_set_tool),
(rtp_session_get_tool), (rtp_session_set_note),
(rtp_session_get_note), (source_push_rtp), (obtain_source),
(rtp_session_add_source), (rtp_session_get_source_by_ssrc),
(rtp_session_create_source), (rtp_session_process_rtp),
(rtp_session_process_sr), (rtp_session_process_sdes),
(rtp_session_process_rtcp), (rtp_session_send_rtp),
(rtp_session_get_reporting_interval), (session_report_blocks),
(session_sdes), (rtp_session_perform_reporting):
* gst/rtpmanager/rtpsession.h:
Prepare for implementing SSRC sampling.
Create SSRC for the session.
Add methods to set the SDES entries.
fix accounting of senders/receivers.
Implement SR/RR/SDES RTCP reporting.
* gst/rtpmanager/rtpsource.c: (rtp_source_init), (init_seq),
(rtp_source_process_rtp), (rtp_source_process_sr):
* gst/rtpmanager/rtpsource.h:
Implement extended sequence number.
* gst/rtpmanager/rtpstats.c: (rtp_stats_calculate_rtcp_interval):
* gst/rtpmanager/rtpstats.h:
Rename some fields.
Diffstat (limited to 'gst/rtpmanager/gstrtpsession.c')
| -rw-r--r-- | gst/rtpmanager/gstrtpsession.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 03b0802b..b11dbbba 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -305,7 +305,7 @@ rtcp_thread (GstRTPSession * rtpsession) gdouble timeout; GstClockTime target; - timeout = rtp_session_get_rtcp_interval (rtpsession->priv->session); + timeout = rtp_session_get_reporting_interval (rtpsession->priv->session); GST_DEBUG_OBJECT (rtpsession, "next RTCP timeout: %lf", timeout); target = gst_clock_get_time (clock); @@ -318,7 +318,7 @@ rtcp_thread (GstRTPSession * rtpsession) GST_DEBUG_OBJECT (rtpsession, "got RTCP timeout"); /* make the session manager produce RTCP, we ignore the result. */ - rtp_session_produce_rtcp (rtpsession->priv->session); + rtp_session_perform_reporting (rtpsession->priv->session); GST_RTP_SESSION_LOCK (rtpsession); gst_clock_id_unref (id); @@ -472,6 +472,8 @@ gst_rtp_session_send_rtcp (RTPSession * sess, RTPSource * src, rtpsession = GST_RTP_SESSION (user_data); priv = rtpsession->priv; + GST_DEBUG_OBJECT (rtpsession, "sending RTCP"); + if (rtpsession->send_rtcp_src) { result = gst_pad_push (rtpsession->send_rtcp_src, buffer); } else { @@ -515,6 +517,8 @@ gst_rtp_session_clock_rate (RTPSession * sess, guint8 payload, if (!gst_structure_get_int (caps_struct, "clock-rate", &result)) goto no_clock_rate; + GST_DEBUG_OBJECT (rtpsession, "parsed clock-rate %d", result); + return result; /* ERRORS */ |