summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-01-09 14:23:42 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-01-09 14:23:42 -0600
commit9397c2535cebcbec3731e7f61c38f1eefaae0f1f (patch)
tree65d913e951becc097d6378928e8ad43c494fb34a /res
parent07cc190b6b549221409b36b9940b72d3182a9694 (diff)
parenta21841bf408107e01cc06dacdda4d84939001274 (diff)
Merge "res_pjsip_session: Always bundle streams if WebRTC is enabled."
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip_session.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index c3393823e..53f60cc3b 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -456,6 +456,12 @@ struct ast_sip_session_media *ast_sip_session_media_state_add(struct ast_sip_ses
return NULL;
}
session_media->bundle_group = 0;
+
+ /* Some WebRTC clients can't handle an offer to bundle media streams. Instead they expect them to
+ * already be bundled. Every client handles this scenario though so if WebRTC is enabled just go
+ * ahead and treat the streams as having already been bundled.
+ */
+ session_media->bundled = session->endpoint->media.webrtc;
} else {
session_media->bundle_group = -1;
}