diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-07-17 15:16:30 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-17 15:16:30 -0500 |
| commit | 647f539e1569ad27c46352e58be9447e21c23923 (patch) | |
| tree | a4d42c9bce7c5087b2bbc709af9815322cf599a9 /channels | |
| parent | 29af7d5558d325e262fc033fd1399e79bcefb0e0 (diff) | |
| parent | 7da6ddda30ab9291ec810fa88d4219145616bae8 (diff) | |
Merge "res_pjsip: Add "webrtc" configuration option"
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_pjsip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 931b60839..f009943ed 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -1595,7 +1595,9 @@ static int chan_pjsip_indicate(struct ast_channel *ast, int condition, const voi /* FIXME: Only use this for VP8. Additional work would have to be done to * fully support other video codecs */ - if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), ast_format_vp8) != AST_FORMAT_CMP_NOT_EQUAL) { + if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), ast_format_vp8) != AST_FORMAT_CMP_NOT_EQUAL || + (channel->session->endpoint->media.webrtc && + ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), ast_format_h264) != AST_FORMAT_CMP_NOT_EQUAL)) { /* FIXME Fake RTP write, this will be sent as an RTCP packet. Ideally the * RTP engine would provide a way to externally write/schedule RTCP * packets */ |