diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2008-07-03 13:47:19 +0000 |
|---|---|---|
| committer | Peter Kjellerstedt <pkj@axis.com> | 2008-07-03 13:47:19 +0000 |
| commit | 56988f51e1bd54d8b6152b7b9e413ad1d6d5552f (patch) | |
| tree | 572af54c1ea2304efce84ae65918e05896a8058f /gst/rtpmanager/rtpsession.h | |
| parent | 6da2ab35a95708daa42c588ec3320401e87329b5 (diff) | |
| download | gst-plugins-bad-56988f51e1bd54d8b6152b7b9e413ad1d6d5552f.tar.gz gst-plugins-bad-56988f51e1bd54d8b6152b7b9e413ad1d6d5552f.tar.bz2 gst-plugins-bad-56988f51e1bd54d8b6152b7b9e413ad1d6d5552f.zip | |
gst/rtpmanager/: Do not mix the use of g_get_current_time() with gst_clock_get_time().
Original commit message from CVS:
* gst/rtpmanager/gstrtpsession.c: (gst_rtp_session_init),
(gst_rtp_session_finalize), (rtcp_thread),
(gst_rtp_session_chain_recv_rtp), (gst_rtp_session_chain_recv_rtcp),
(gst_rtp_session_event_send_rtp_sink),
(gst_rtp_session_chain_send_rtp):
* gst/rtpmanager/rtpsession.c: (check_collision),
(update_arrival_stats), (rtp_session_process_rtp),
(rtp_session_process_rtcp), (rtp_session_send_rtp),
(rtp_session_send_bye_locked), (rtp_session_send_bye),
(rtp_session_next_timeout), (session_report_blocks), (session_cleanup),
(is_rtcp_time), (rtp_session_on_timeout):
* gst/rtpmanager/rtpsession.h:
Do not mix the use of g_get_current_time() with gst_clock_get_time().
Diffstat (limited to 'gst/rtpmanager/rtpsession.h')
| -rw-r--r-- | gst/rtpmanager/rtpsession.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h index e14e2da3..7c8db6dd 100644 --- a/gst/rtpmanager/rtpsession.h +++ b/gst/rtpmanager/rtpsession.h @@ -205,9 +205,6 @@ struct _RTPSession { GList *conflicting_addresses; gboolean change_ssrc; - - /* for mapping clock time to NTP time */ - GstClockTime base_time; }; /** @@ -275,17 +272,17 @@ RTPSource* rtp_session_get_source_by_cname (RTPSession *sess, const gcha RTPSource* rtp_session_create_source (RTPSession *sess); /* processing packets from receivers */ -GstFlowReturn rtp_session_process_rtp (RTPSession *sess, GstBuffer *buffer, guint64 ntpnstime); -GstFlowReturn rtp_session_process_rtcp (RTPSession *sess, GstBuffer *buffer); +GstFlowReturn rtp_session_process_rtp (RTPSession *sess, GstBuffer *buffer, GstClockTime current_time, guint64 ntpnstime); +GstFlowReturn rtp_session_process_rtcp (RTPSession *sess, GstBuffer *buffer, GstClockTime current_time); /* processing packets for sending */ -GstFlowReturn rtp_session_send_rtp (RTPSession *sess, GstBuffer *buffer, guint64 ntpnstime); +GstFlowReturn rtp_session_send_rtp (RTPSession *sess, GstBuffer *buffer, GstClockTime current_time, guint64 ntpnstime); /* stopping the session */ -GstFlowReturn rtp_session_send_bye (RTPSession *sess, const gchar *reason); +GstFlowReturn rtp_session_send_bye (RTPSession *sess, const gchar *reason, GstClockTime current_time); /* get interval for next RTCP interval */ -GstClockTime rtp_session_next_timeout (RTPSession *sess, GstClockTime time); -GstFlowReturn rtp_session_on_timeout (RTPSession *sess, GstClockTime time, guint64 ntpnstime); +GstClockTime rtp_session_next_timeout (RTPSession *sess, GstClockTime current_time); +GstFlowReturn rtp_session_on_timeout (RTPSession *sess, GstClockTime current_time, guint64 ntpnstime); #endif /* __RTP_SESSION_H__ */ |