Commit 723deb7e authored by johan's avatar johan

Merge remote-tracking branch 'origin/master' into dev_dtls

parents 9eca0967 0ad89f5e
......@@ -589,7 +589,15 @@ ORTP_PUBLIC void rtp_session_set_reuseaddr(RtpSession *session, bool_t yes);
ORTP_PUBLIC int meta_rtp_transport_modifier_inject_packet(const RtpTransport *t, RtpTransportModifier *tpm, mblk_t *msg , int flags);
/**
* FIXME johan
* #RtpTransport object which can handle multiples security protocols. You can for instance use this object
* to use both sRTP and tunnel transporter. #mblk_t messages received and sent from the endpoint
* will pass through the list of modifiers given. First modifier in list will be first to modify the message
* in send mode and last in receive mode.
* @param[in] t #RtpTransport object that will be generated.
* @param[in] is_rtp Whether this object will be used for RTP packets or not.
* @param[in] endpoint #RtpTransport object in charge of sending/receiving packets. If NULL, it will use standards sendto and recvfrom functions.
* @param[in] modifiers_count number of #RtpModifier object given in the variadic list. Must be 0 if none are given.
* @return 0 if successful, -1 otherwise
**/
ORTP_PUBLIC int meta_rtp_transport_modifier_inject_packet_to(const RtpTransport *t, RtpTransportModifier *tpm, mblk_t *msg , int flags,const struct sockaddr *to, socklen_t tolen) ;
......
......@@ -297,7 +297,7 @@ void rtp_session_rtp_parse(RtpSession *session, mblk_t *mp, uint32_t local_str_t
if (session->flags & RTP_SESSION_FIRST_PACKET_DELIVERED) {
/* detect timestamp important jumps in the future, to workaround stupid rtp senders */
if (RTP_TIMESTAMP_IS_NEWER_THAN(rtp->timestamp,session->rtp.rcv_last_ts+session->rtp.ts_jump)){
ortp_debug("rtp_parse: timestamp jump?");
ortp_warning("rtp_parse: timestamp jump in the future detected.");
rtp_signal_table_emit2(&session->on_timestamp_jump,(long)&rtp->timestamp);
}
else if (RTP_TIMESTAMP_IS_STRICTLY_NEWER_THAN(session->rtp.rcv_last_ts,rtp->timestamp)
......@@ -309,7 +309,7 @@ void rtp_session_rtp_parse(RtpSession *session, mblk_t *mp, uint32_t local_str_t
*/
if ( RTP_TIMESTAMP_IS_STRICTLY_NEWER_THAN(session->rtp.rcv_last_ts, rtp->timestamp + session->rtp.ts_jump) ){
ortp_warning("rtp_parse: negative timestamp jump");
ortp_warning("rtp_parse: negative timestamp jump detected");
rtp_signal_table_emit2(&session->on_timestamp_jump,
(long)&rtp->timestamp);
}
......
......@@ -1813,7 +1813,7 @@ void rtp_session_clear_recv_error_code(RtpSession *session){
* This value might not be known: at the beginning when no RTCP packets have been exchanged yet, or simply because the
* rtcp channel is broken due to firewall problematics, or because the remote implementation does not support RTCP.
*
* @returns the round trip propagation time in seconds if known, -1 if unknown.
* @return the round trip propagation time in seconds if known, -1 if unknown.
**/
float rtp_session_get_round_trip_propagation(RtpSession *session){
return session->rtt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment