kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 00:22:35 +00:00
Code Issues Projects Releases Wiki Activity

[mod_loopback] add pre_answer and null_auto_answer support to null channel

Browse Source
This commit is contained in:
Seven Du 2019-11-07 10:34:30 +08:00 committed by Andrey Volk
parent 41000cfbba
commit a28436deb7
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mod/endpoints/mod_loopback/mod_loopback.c
View File

@ -1304,6 +1304,8 @@ struct null_private_object {
switch_frame_t read_frame;
int16_t *null_buf;
int rate;
int pre_answer; // pre answer the channel
int auto_answer; // answer after in ms
};
typedef struct null_private_object null_private_t;
@ -1453,9 +1455,17 @@ static switch_status_t null_channel_on_consume_media(switch_core_session_t *sess
tech_pvt = switch_core_session_get_private(session);
assert(tech_pvt != NULL);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA - answering\n");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA\n");
switch_channel_mark_answered(channel);
if (tech_pvt->pre_answer) {
switch_channel_mark_pre_answered(channel);
}
if (tech_pvt->auto_answer > 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA - answering in %d ms\n", tech_pvt->auto_answer);
switch_yield(tech_pvt->auto_answer * 1000);
switch_channel_mark_answered(channel);
}
return SWITCH_STATUS_SUCCESS;
}
@ -1590,12 +1600,14 @@ static switch_call_cause_t null_channel_outgoing_channel(switch_core_session_t *
{
char name[128];
switch_channel_t *ochannel = NULL;
const char *auto_answer = switch_event_get_header(var_event, "null_auto_answer");
const char *pre_answer = switch_event_get_header(var_event, "null_pre_answer");
if (session) {
ochannel = switch_core_session_get_channel(session);
switch_channel_clear_flag(ochannel, CF_PROXY_MEDIA);
switch_channel_clear_flag(ochannel, CF_PROXY_MODE);
if (!switch_channel_var_true(ochannel, "loopback_no_pre_answer")) {
if (!switch_channel_var_true(ochannel, "null_no_pre_answer")) {
switch_channel_pre_answer(ochannel);
}
}
@ -1621,6 +1633,17 @@ static switch_call_cause_t null_channel_outgoing_channel(switch_core_session_t *
tech_pvt->rate = rate;
tech_pvt->pre_answer = switch_true(pre_answer);
if (auto_answer) {
tech_pvt->auto_answer = atoi(auto_answer);
if (tech_pvt->auto_answer < 0) tech_pvt->auto_answer = 0;
if (tech_pvt->auto_answer > 60000) tech_pvt->auto_answer = 60000;
} else {
tech_pvt->auto_answer = 1;
}
channel = switch_core_session_get_channel(*new_session);
switch_snprintf(name, sizeof(name), "null/%s", outbound_profile->destination_number);
switch_channel_set_name(channel, name);