sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_pjsip_sdp_rtp: implement hold state handling on moh_passthrough" into 16

This commit is contained in:
George Joseph 2020-02-18 10:08:26 -06:00 committed by Gerrit Code Review
parent 4c3721afa8 afcc838796
commit e213bc530f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_pjsip_sdp_rtp.c
View File

@ -1547,6 +1547,8 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
static const pj_str_t STR_IP6 = { "IP6", 3};
static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };
static const pj_str_t STR_SENDONLY = { "sendonly", 8 };
static const pj_str_t STR_INACTIVE = { "inactive", 8 };
static const pj_str_t STR_RECVONLY = { "recvonly", 8 };
pjmedia_sdp_media *media;
const char *hostip = NULL;
struct ast_sockaddr addr;
@ -1811,9 +1813,20 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
media->attr[media->attr_count++] = attr;
}
/* Add the sendrecv attribute - we purposely don't keep track because pjmedia-sdp will automatically change our offer for us */
attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
attr->name = !session_media->locally_held ? STR_SENDRECV : STR_SENDONLY;
if (session_media->locally_held) {
if (session_media->remotely_held) {
attr->name = STR_INACTIVE; /* To place on hold a recvonly stream, send inactive */
} else {
attr->name = STR_SENDONLY; /* Send sendonly to initate a local hold */
}
} else {
if (session_media->remotely_held) {
attr->name = STR_RECVONLY; /* Remote has sent sendonly, reply recvonly */
} else {
attr->name = STR_SENDRECV; /* No hold in either direction */
}
}
media->attr[media->attr_count++] = attr;
/* If we've got rtcp-mux enabled, add it unless we received an offer without it */