kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5358 --resolve use allow-transcoding=true param in global settings or fifo_allow_transcoding=true channel var on per caller basis 

Conflicts:
	src/mod/applications/mod_fifo/mod_fifo.c
This commit is contained in:
Anthony Minessale 2013-04-30 09:39:35 -05:00
parent 89afd89741
commit a9587acac2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -599,6 +599,7 @@ static struct {
char *inner_pre_trans_execute; char *inner_pre_trans_execute;
char *inner_post_trans_execute; char *inner_post_trans_execute;
switch_sql_queue_manager_t *qm; switch_sql_queue_manager_t *qm;
int allow_transcoding;
} globals; } globals;
@ -1415,7 +1416,8 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
if (!total) goto end; if (!total) goto end;
if ((codec = switch_event_get_header(pop, "variable_sip_use_codec_name"))) { if (!globals.allow_transcoding && !switch_true(switch_event_get_header(pop, "variable_fifo_allow_transcoding")) &&
(codec = switch_event_get_header(pop, "variable_sip_use_codec_name"))) {
const char *rate = switch_event_get_header(pop, "variable_sip_use_codec_rate"); const char *rate = switch_event_get_header(pop, "variable_sip_use_codec_rate");
const char *ptime = switch_event_get_header(pop, "variable_sip_use_codec_ptime"); const char *ptime = switch_event_get_header(pop, "variable_sip_use_codec_ptime");
char nstr[256] = ""; char nstr[256] = "";
@ -4064,6 +4066,8 @@ static switch_status_t load_config(int reload, int del_all)
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
} }
} else if (!strcasecmp(var, "allow-transcoding") && !zstr(val)) {
globals.allow_transcoding = switch_true(val);
} else if (!strcasecmp(var, "db-pre-trans-execute") && !zstr(val)) { } else if (!strcasecmp(var, "db-pre-trans-execute") && !zstr(val)) {
globals.pre_trans_execute = switch_core_strdup(globals.pool, val); globals.pre_trans_execute = switch_core_strdup(globals.pool, val);
} else if (!strcasecmp(var, "db-post-trans-execute") && !zstr(val)) { } else if (!strcasecmp(var, "db-post-trans-execute") && !zstr(val)) {