FS-11654: [core] add media_timeout, media_hold_timeout and video vs audio variants

This commit is contained in:
Brian West authored and Andrey Volk committed 2019-07-18 00:54:37 +04:00
1 parent 382ecb6612
commit b23d887586
5 files changed
+184 -9

No files matched your search

@@ -368,15 +368,24 @@ void conference_utils_member_set_flag_locked(conference_member_t *member, member
switch_mutex_unlock(member->flag_mutex);
}
static void check_cleared_flag(conference_member_t *member, member_flag_t flag)
{
if (flag == MFLAG_RUNNING && member->session) {
switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
}
}
void conference_utils_member_clear_flag(conference_member_t *member, member_flag_t flag)
{
member->flags[flag] = 0;
check_cleared_flag(member, flag);
}
void conference_utils_member_clear_flag_locked(conference_member_t *member, member_flag_t flag)
{
switch_mutex_lock(member->flag_mutex);
member->flags[flag] = 0;
switch_mutex_unlock(member->flag_mutex);
check_cleared_flag(member, flag);
}
switch_bool_t conference_utils_member_test_flag(conference_member_t *member, member_flag_t flag)
{
+4
View File
@@ -5195,11 +5195,15 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
int v = atoi(val);
if (v >= 0) {
profile->rtp_timeout_sec = v;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"rtp-timeout-sec deprecated use media_timeout variable.\n");
}
} else if (!strcasecmp(var, "rtp-hold-timeout-sec") && !zstr(val)) {
int v = atoi(val);
if (v >= 0) {
profile->rtp_hold_timeout_sec = v;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"rtp-hold-timeout-sec deprecated use media_hold_timeout variable.\n");
}
} else if (!strcasecmp(var, "disable-transfer")) {
if (switch_true(val)) {