From 115939caebdd59443d2baaf281d05c2170f04b04 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Sun, 18 Mar 2018 15:16:40 +0000 Subject: rtp: Add REMB RTP property and set it on PJSIP video RTP. This change adds a property to RTP instances to indicate that REMB support is enabled and that sending/receiving should be passed through. This also enables it on video RTP instances in PJSIP if WebRTC support is enabled. Finally the goog-remb extension is added to the SDP using the rtcp-fb attribute to indicate our support for it. Details about REMB can be found on the draft document for it: https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03 Change-Id: I1902dda1c0882bd1a0d71b2f120684b44b97e789 --- include/asterisk/rtp_engine.h | 2 ++ res/res_pjsip_sdp_rtp.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index 3812cb159..4e32d6b32 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -126,6 +126,8 @@ enum ast_rtp_property { AST_RTP_PROPERTY_RETRANS_RECV, /*! Enable packet retransmission for sent packets */ AST_RTP_PROPERTY_RETRANS_SEND, + /*! Enable REMB sending and receiving passthrough support */ + AST_RTP_PROPERTY_REMB, /*! * \brief Maximum number of RTP properties supported diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 9f0cdd300..03d37652f 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -222,6 +222,7 @@ static int create_rtp(struct ast_sip_session *session, struct ast_sip_session_me } else if (session_media->type == AST_MEDIA_TYPE_VIDEO) { ast_rtp_instance_set_prop(session_media->rtp, AST_RTP_PROPERTY_RETRANS_RECV, session->endpoint->media.webrtc); ast_rtp_instance_set_prop(session_media->rtp, AST_RTP_PROPERTY_RETRANS_SEND, session->endpoint->media.webrtc); + ast_rtp_instance_set_prop(session_media->rtp, AST_RTP_PROPERTY_REMB, session->endpoint->media.webrtc); if (session->endpoint->media.tos_video || session->endpoint->media.cos_video) { ast_rtp_instance_set_qos(session_media->rtp, session->endpoint->media.tos_video, session->endpoint->media.cos_video, "SIP RTP Video"); @@ -1092,6 +1093,9 @@ static void add_rtcp_fb_to_stream(struct ast_sip_session *session, */ attr = pjmedia_sdp_attr_create(pool, "rtcp-fb", pj_cstr(&stmp, "* ccm fir")); pjmedia_sdp_attr_add(&media->attr_count, media->attr, attr); + + attr = pjmedia_sdp_attr_create(pool, "rtcp-fb", pj_cstr(&stmp, "* goog-remb")); + pjmedia_sdp_attr_add(&media->attr_count, media->attr, attr); } /*! \brief Function which negotiates an incoming media stream */ -- cgit v1.2.3