kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Make P2P bridge Asymmetric codec aware

Browse Source 
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
This commit is contained in:
Torrey Searle
2017-07-28 14:53:44 +02:00
committed by Torrey Searle
parent df4bcdda2a
commit a2dde59154
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_rtp_asterisk.c
View File

@@ -313,6 +313,7 @@ struct ast_rtp {
void *data;
struct ast_rtcp *rtcp;
struct ast_rtp *bridged; /*!< Who we are Packet bridged to */
unsigned int asymmetric_codec; /*!< Indicate if asymmetric send/receive codecs are allowed */
struct ast_rtp_instance *bundled; /*!< The RTP instance we are bundled to */
int stream_num; /*!< Stream num for this RTP instance */
@@ -5113,6 +5114,23 @@ static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance,
return -1;
}
ao2_replace(rtp->lastrxformat, payload_type->format);
ao2_replace(bridged->lasttxformat, payload_type->format);
/*
* If bridged peer has already received rtp, perform the asymmetric codec check
* if that feature has been activated
*/
if (!bridged->asymmetric_codec && bridged->lastrxformat != ast_format_none) {
if (ast_format_cmp(bridged->lasttxformat, bridged->lastrxformat) == AST_FORMAT_CMP_NOT_EQUAL) {
ast_debug(1, "Asymmetric RTP codecs detected (TX: %s, RX: %s) sending frame to core\n",
ast_format_get_name(bridged->lasttxformat),
ast_format_get_name(bridged->lastrxformat));
return -1;
}
}
/* If the marker bit has been explicitly set turn it on */
if (ast_test_flag(rtp, FLAG_NEED_MARKER_BIT)) {
mark = 1;
@@ -5797,6 +5815,8 @@ static void ast_rtp_prop_set(struct ast_rtp_instance *instance, enum ast_rtp_pro
rtp->rtcp = NULL;
}
}
} else if (property == AST_RTP_PROPERTY_ASYMMETRIC_CODEC) {
rtp->asymmetric_codec = value;
}
}