summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-03-21 10:38:32 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-03-21 10:38:32 -0500
commit39ba6aacf8a56e923e581d9bf5833b5e83ca7d53 (patch)
treef5855ce2afdd70d0566775b282c46672d087a547
parente45e8466f1504014f32b8092b63bed1d11931fd4 (diff)
parent115939caebdd59443d2baaf281d05c2170f04b04 (diff)
Merge "rtp: Add REMB RTP property and set it on PJSIP video RTP."
-rw-r--r--include/asterisk/rtp_engine.h2
-rw-r--r--res/res_pjsip_sdp_rtp.c4
2 files changed, 6 insertions, 0 deletions
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 */