Skip to content

Commit

Permalink
FS-5358 --resolve use allow-transcoding=true param in global settings…
Browse files Browse the repository at this point in the history
… or fifo_allow_transcoding=true channel var on per caller basis

Conflicts:
	src/mod/applications/mod_fifo/mod_fifo.c
  • Loading branch information
anthmFS committed Apr 30, 2013
1 parent 89afd89 commit a9587ac
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/mod/applications/mod_fifo/mod_fifo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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] = "";
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit a9587ac

Please sign in to comment.