summaryrefslogtreecommitdiff
path: root/channels/chan_pjsip.c
diff options
context:
space:
mode:
authorTorrey Searle <torrey@voxbone.com>2017-07-28 14:53:44 +0200
committerTorrey Searle <tsearle@gmail.com>2017-08-09 08:57:50 -0500
commita2dde5915400bfd2355f23c60b3ae7316290f820 (patch)
tree7b5994b3ed3fe9601206ea0ba935b40beaf475d9 /channels/chan_pjsip.c
parentdf4bcdda2ac6f52ad2f75365c2b2d9fb77c19e85 (diff)
res_rtp_asterisk: Make P2P bridge Asymmetric codec aware
Introduce a new property to rtp-engine to make it aware of the desire for assymetric codecs or not. If asymmetric codecs is not allowed, the bridge will compare read/write formats and shut down the p2p bridge if needed ASTERISK-26745 #close Change-Id: I0d9c83e5356df81661e58d40a8db565833501a6f
Diffstat (limited to 'channels/chan_pjsip.c')
-rw-r--r--channels/chan_pjsip.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index ebda6c7ee..4a24fa689 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -797,14 +797,13 @@ static struct ast_frame *chan_pjsip_read_stream(struct ast_channel *ast)
return f;
}
- if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
- ast_debug(1, "Oooh, got a frame with format of %s on channel '%s' when it has not been negotiated\n",
- ast_format_get_name(f->subclass.format), ast_channel_name(ast));
-
- ast_frfree(f);
- return &ast_null_frame;
- }
+ session = channel->session;
+ /*
+ * Asymmetric RTP only has one native format set at a time.
+ * Therefore we need to update the native format to the current
+ * raw read format BEFORE the native format check
+ */
if (!session->endpoint->asymmetric_rtp_codec &&
ast_format_cmp(ast_channel_rawwriteformat(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
struct ast_format_cap *caps;
@@ -831,6 +830,14 @@ static struct ast_frame *chan_pjsip_read_stream(struct ast_channel *ast)
}
}
+ if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) {
+ ast_debug(1, "Oooh, got a frame with format of %s on channel '%s' when it has not been negotiated\n",
+ ast_format_get_name(f->subclass.format), ast_channel_name(ast));
+
+ ast_frfree(f);
+ return &ast_null_frame;
+ }
+
if (session->dsp) {
int dsp_features;