res_agi: Allow configuration of audio format of EAGI pipe
authorSean Bright <sean.bright@gmail.com>
Tue, 23 May 2017 20:42:04 +0000 (16:42 -0400)
committerSean Bright <sean.bright@gmail.com>
Tue, 23 May 2017 20:51:19 +0000 (16:51 -0400)
This change allows the format of the EAGI audio pipe to be changed by
setting the dialplan variable 'EAGI_AUDIO_FORMAT' to the name of one of
the loaded formats.

ASTERISK-26124 #close

Change-Id: I7a10fad401ad2a21c68c2e7246fa357d5cee5bbd

CHANGES
res/res_agi.c

diff --git a/CHANGES b/CHANGES
index fcbe04c..305719a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,17 @@ app_queue
    been defined.
 
 ------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 14.5.0 to Asterisk 14.6.0 ------------
+------------------------------------------------------------------------------
+
+res_agi
+------------------
+ * The EAGI() application will now look for a dialplan variable named
+   EAGI_AUDIO_FORMAT and use that format with the 'enhanced' audio pipe that
+   EAGI provides. If not specified, it will continue to use the default signed
+   linear (slin).
+
+------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 14.4.0 to Asterisk 14.5.0 ------------
 ------------------------------------------------------------------------------
 
index 557f349..0463573 100644 (file)
@@ -4552,15 +4552,30 @@ static int eagi_exec(struct ast_channel *chan, const char *data)
 {
        int res;
        struct ast_format *readformat;
+       struct ast_format *requested_format = NULL;
+       const char *requested_format_name;
 
        if (ast_check_hangup(chan)) {
                ast_log(LOG_ERROR, "EAGI cannot be run on a dead/hungup channel, please use AGI.\n");
                return 0;
        }
+
+       requested_format_name = pbx_builtin_getvar_helper(chan, "EAGI_AUDIO_FORMAT");
+       if (requested_format_name) {
+               requested_format = ast_format_cache_get(requested_format_name);
+               if (requested_format) {
+                       ast_verb(3, "<%s> Setting EAGI audio pipe format to %s\n",
+                                        ast_channel_name(chan), ast_format_get_name(requested_format));
+               } else {
+                       ast_log(LOG_ERROR, "Could not find requested format: %s\n", requested_format_name);
+               }
+       }
+
        readformat = ao2_bump(ast_channel_readformat(chan));
-       if (ast_set_read_format(chan, ast_format_slin)) {
+       if (ast_set_read_format(chan, requested_format ?: ast_format_slin)) {
                ast_log(LOG_WARNING, "Unable to set channel '%s' to linear mode\n", ast_channel_name(chan));
-               ao2_ref(readformat, -1);
+               ao2_cleanup(requested_format);
+               ao2_cleanup(readformat);
                return -1;
        }
        res = agi_exec_full(chan, data, 1, 0);
@@ -4570,7 +4585,8 @@ static int eagi_exec(struct ast_channel *chan, const char *data)
                                ast_format_get_name(readformat));
                }
        }
-       ao2_ref(readformat, -1);
+       ao2_cleanup(requested_format);
+       ao2_cleanup(readformat);
        return res;
 }