From a9587acac2b89ae77477d8df243f8e4d9bfca239 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 30 Apr 2013 09:39:35 -0500 Subject: [PATCH] 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 --- src/mod/applications/mod_fifo/mod_fifo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index 99d17a44fa..ca6fd907d0 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.c +++ b/src/mod/applications/mod_fifo/mod_fifo.c @@ -599,6 +599,7 @@ static struct { char *inner_pre_trans_execute; char *inner_post_trans_execute; switch_sql_queue_manager_t *qm; + int allow_transcoding; } globals; @@ -1415,7 +1416,8 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void 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 *ptime = switch_event_get_header(pop, "variable_sip_use_codec_ptime"); char nstr[256] = ""; @@ -4064,6 +4066,8 @@ static switch_status_t load_config(int reload, int del_all) } else { 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)) { globals.pre_trans_execute = switch_core_strdup(globals.pool, val); } else if (!strcasecmp(var, "db-post-trans-execute") && !zstr(val)) {