* @sess: an #RTPSession
* @src: the #RTPSource
* @buffer: the RTCP buffer ready for sending
+ * @eos: if an EOS event should be pushed
* @user_data: user data specified when registering
*
* This callback will be called when @sess has @buffer ready for sending to
*
* Returns: a #GstFlowReturn.
*/
-typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, GstBuffer *buffer, gpointer user_data);
+typedef GstFlowReturn (*RTPSessionSendRTCP) (RTPSession *sess, RTPSource *src, GstBuffer *buffer,
+ gboolean eos, gpointer user_data);
/**
* RTPSessionSyncRTCP:
* @sess: an #RTPSession
* @src: the #RTPSource
- * @buffer: the RTCP buffer ready for sending
+ * @buffer: the RTCP buffer ready for synchronisation
* @user_data: user data specified when registering
*
- * This callback will be called when @sess has and SR @buffer ready for doing
+ * This callback will be called when @sess has an SR @buffer ready for doing
* synchronisation between streams.
*
* Returns: a #GstFlowReturn.
typedef struct {
RTPSessionProcessRTP process_rtp;
RTPSessionSendRTP send_rtp;
- RTPSessionSendRTCP send_rtcp;
RTPSessionSyncRTCP sync_rtcp;
+ RTPSessionSendRTCP send_rtcp;
RTPSessionClockRate clock_rate;
RTPSessionReconsider reconsider;
} RTPSessionCallbacks;
/**
+ * RTPConflictingAddress:
+ * @address: #GstNetAddress which conflicted
+ * @last_conflict_time: time when the last conflict was seen
+ *
+ * This structure is used to account for addresses that have conflicted to find
+ * loops.
+ */
+
+typedef struct {
+ GstNetAddress address;
+ GstClockTime time;
+} RTPConflictingAddress;
+
+/**
* RTPSession:
* @lock: lock to protect the session
* @source: the source of this session
* @activecount: the number of active sources
* @callbacks: callbacks
* @user_data: user data passed in callbacks
+ * @stats: session statistics
+ * @conflicting_addresses: GList of conflicting addresses
*
* The RTP session manager object
*/
gchar *bye_reason;
gboolean sent_bye;
- RTPSessionCallbacks callbacks;
- gpointer user_data;
+ RTPSessionCallbacks callbacks;
+ gpointer process_rtp_user_data;
+ gpointer send_rtp_user_data;
+ gpointer send_rtcp_user_data;
+ gpointer sync_rtcp_user_data;
+ gpointer clock_rate_user_data;
+ gpointer reconsider_user_data;
RTPSessionStats stats;
- /* for mapping clock time to NTP time */
- GstClockTime base_time;
+ GList *conflicting_addresses;
+ gboolean change_ssrc;
};
/**
void (*on_bye_ssrc) (RTPSession *sess, RTPSource *source);
void (*on_bye_timeout) (RTPSession *sess, RTPSource *source);
void (*on_timeout) (RTPSession *sess, RTPSource *source);
+ void (*on_sender_timeout) (RTPSession *sess, RTPSource *source);
};
GType rtp_session_get_type (void);
/* create and configure */
RTPSession* rtp_session_new (void);
-void rtp_session_set_callbacks (RTPSession *sess,
+void rtp_session_set_callbacks (RTPSession *sess,
RTPSessionCallbacks *callbacks,
gpointer user_data);
+void rtp_session_set_process_rtp_callback (RTPSession * sess,
+ RTPSessionProcessRTP callback,
+ gpointer user_data);
+void rtp_session_set_send_rtp_callback (RTPSession * sess,
+ RTPSessionSendRTP callback,
+ gpointer user_data);
+void rtp_session_set_send_rtcp_callback (RTPSession * sess,
+ RTPSessionSendRTCP callback,
+ gpointer user_data);
+void rtp_session_set_sync_rtcp_callback (RTPSession * sess,
+ RTPSessionSyncRTCP callback,
+ gpointer user_data);
+void rtp_session_set_clock_rate_callback (RTPSession * sess,
+ RTPSessionClockRate callback,
+ gpointer user_data);
+void rtp_session_set_reconsider_callback (RTPSession * sess,
+ RTPSessionReconsider callback,
+ gpointer user_data);
void rtp_session_set_bandwidth (RTPSession *sess, gdouble bandwidth);
gdouble rtp_session_get_bandwidth (RTPSession *sess);
void rtp_session_set_rtcp_fraction (RTPSession *sess, gdouble fraction);
/* handling sources */
RTPSource* rtp_session_get_internal_source (RTPSession *sess);
+
+void rtp_session_set_internal_ssrc (RTPSession *sess, guint32 ssrc);
+guint32 rtp_session_get_internal_ssrc (RTPSession *sess);
+
gboolean rtp_session_add_source (RTPSession *sess, RTPSource *src);
guint rtp_session_get_num_sources (RTPSession *sess);
guint rtp_session_get_num_active_sources (RTPSession *sess);
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__ */