kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_rtp_asterisk: Allow remote SSRC to change on an RTP instance."

Browse Source
This commit is contained in:
Joshua Colp
2017-08-31 16:50:50 -05:00
committed by Gerrit Code Review
parent 8cfff60cee 5ba82cedc6
commit be8639f81b
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/res_rtp_asterisk.c
View File

@@ -6186,10 +6186,35 @@ static void ast_rtp_set_remote_ssrc(struct ast_rtp_instance *instance, unsigned
{ {
struct ast_rtp *rtp = ast_rtp_instance_get_data(instance); struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
if (rtp->themssrc) { if (rtp->themssrc == ssrc) {
return; return;
} }
/* If this is bundled we need to update the SSRC mapping */
if (rtp->bundled) {
struct ast_rtp *bundled_rtp;
int index;
ao2_unlock(instance);
/* The child lock can't be held while accessing the parent */
ao2_lock(rtp->bundled);
bundled_rtp = ast_rtp_instance_get_data(rtp->bundled);
for (index = 0; index < AST_VECTOR_SIZE(&bundled_rtp->ssrc_mapping); ++index) {
struct rtp_ssrc_mapping *mapping = AST_VECTOR_GET_ADDR(&bundled_rtp->ssrc_mapping, index);
if (mapping->ssrc == rtp->themssrc) {
mapping->ssrc = ssrc;
break;
}
}
ao2_unlock(rtp->bundled);
ao2_lock(instance);
}
rtp->themssrc = ssrc; rtp->themssrc = ssrc;
} }