2006-04-10 23:29:50 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006, Digium, Inc.
|
|
|
|
*
|
|
|
|
* Joshua Colp <jcolp@digium.com>
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \file
|
|
|
|
*
|
|
|
|
* \brief Speech Recognition Utility Applications
|
|
|
|
*
|
|
|
|
* \author Joshua Colp <jcolp@digium.com>
|
|
|
|
*
|
|
|
|
* \ingroup applications
|
|
|
|
*/
|
|
|
|
|
2011-07-14 20:28:54 +00:00
|
|
|
/*** MODULEINFO
|
|
|
|
<support_level>core</support_level>
|
2013-09-16 18:00:32 +00:00
|
|
|
<depend>res_speech</depend>
|
2011-07-14 20:28:54 +00:00
|
|
|
***/
|
|
|
|
|
2006-06-07 18:54:56 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
|
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
#include "asterisk/file.h"
|
|
|
|
#include "asterisk/channel.h"
|
|
|
|
#include "asterisk/pbx.h"
|
|
|
|
#include "asterisk/module.h"
|
|
|
|
#include "asterisk/lock.h"
|
|
|
|
#include "asterisk/app.h"
|
|
|
|
#include "asterisk/speech.h"
|
|
|
|
|
2008-12-06 21:18:51 +00:00
|
|
|
/*** DOCUMENTATION
|
|
|
|
<application name="SpeechCreate" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Create a Speech Structure.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="engine_name" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>This application creates information to be used by all the other applications.
|
|
|
|
It must be called before doing any speech recognition activities such as activating a grammar.
|
|
|
|
It takes the engine name to use as the argument, if not specified the default engine will be used.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Sets the ERROR channel variable to 1 if the engine cannot be used.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechActivateGrammar" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Activate a grammar.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="grammar_name" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>This activates the specified grammar to be recognized by the engine.
|
|
|
|
A grammar tells the speech recognition engine what to recognize, and how to portray it back to you
|
|
|
|
in the dialplan. The grammar name is the only argument to this application.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechStart" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Start recognizing voice in the audio stream.
|
|
|
|
</synopsis>
|
|
|
|
<syntax />
|
|
|
|
<description>
|
|
|
|
<para>Tell the speech recognition engine that it should start trying to get results from audio being
|
|
|
|
fed to it.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechBackground" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Play a sound file and wait for speech to be recognized.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="sound_file" required="true" />
|
|
|
|
<parameter name="timeout">
|
|
|
|
<para>Timeout integer in seconds. Note the timeout will only start
|
|
|
|
once the sound file has stopped playing.</para>
|
|
|
|
</parameter>
|
|
|
|
<parameter name="options">
|
|
|
|
<optionlist>
|
|
|
|
<option name="n">
|
|
|
|
<para>Don't answer the channel if it has not already been answered.</para>
|
|
|
|
</option>
|
|
|
|
</optionlist>
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>This application plays a sound file and waits for the person to speak. Once they start speaking playback
|
|
|
|
of the file stops, and silence is heard. Once they stop talking the processing sound is played to indicate
|
|
|
|
the speech recognition engine is working. Once results are available the application returns and results
|
|
|
|
(score and text) are available using dialplan functions.</para>
|
|
|
|
<para>The first text and score are ${SPEECH_TEXT(0)} AND ${SPEECH_SCORE(0)} while the second are ${SPEECH_TEXT(1)}
|
|
|
|
and ${SPEECH_SCORE(1)}.</para>
|
|
|
|
<para>The first argument is the sound file and the second is the timeout integer in seconds.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
|
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechDeactivateGrammar" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Deactivate a grammar.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="grammar_name" required="true">
|
|
|
|
<para>The grammar name to deactivate</para>
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>This deactivates the specified grammar so that it is no longer recognized.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechProcessingSound" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Change background processing sound.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="sound_file" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>This changes the processing sound that SpeechBackground plays back when the speech recognition engine is
|
|
|
|
processing and working to get results.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechDestroy" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
End speech recognition.
|
|
|
|
</synopsis>
|
|
|
|
<syntax />
|
|
|
|
<description>
|
|
|
|
<para>This destroys the information used by all the other speech recognition applications.
|
|
|
|
If you call this application but end up wanting to recognize more speech, you must call SpeechCreate()
|
|
|
|
again before calling any other application.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechLoadGrammar" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Load a grammar.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="grammar_name" required="true" />
|
|
|
|
<parameter name="path" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Load a grammar only on the channel, not globally.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<application name="SpeechUnloadGrammar" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Unload a grammar.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="grammar_name" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Unload a grammar.</para>
|
2012-04-20 14:50:42 +00:00
|
|
|
<para>Hangs up the channel on failure. If this is not desired, use TryExec.</para>
|
2008-12-06 21:18:51 +00:00
|
|
|
</description>
|
|
|
|
</application>
|
|
|
|
<function name="SPEECH_SCORE" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Gets the confidence score of a result.
|
|
|
|
</synopsis>
|
|
|
|
<syntax argsep="/">
|
|
|
|
<parameter name="nbest_number" />
|
|
|
|
<parameter name="result_number" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Gets the confidence score of a result.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
<function name="SPEECH_TEXT" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Gets the recognized text of a result.
|
|
|
|
</synopsis>
|
|
|
|
<syntax argsep="/">
|
|
|
|
<parameter name="nbest_number" />
|
|
|
|
<parameter name="result_number" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Gets the recognized text of a result.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
<function name="SPEECH_GRAMMAR" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Gets the matched grammar of a result if available.
|
|
|
|
</synopsis>
|
|
|
|
<syntax argsep="/">
|
|
|
|
<parameter name="nbest_number" />
|
|
|
|
<parameter name="result_number" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Gets the matched grammar of a result if available.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
<function name="SPEECH_ENGINE" language="en_US">
|
|
|
|
<synopsis>
|
2012-10-01 12:29:04 +00:00
|
|
|
Get or change a speech engine specific attribute.
|
2008-12-06 21:18:51 +00:00
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="name" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Changes a speech engine specific attribute.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
<function name="SPEECH_RESULTS_TYPE" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Sets the type of results that will be returned.
|
|
|
|
</synopsis>
|
|
|
|
<syntax />
|
|
|
|
<description>
|
|
|
|
<para>Sets the type of results that will be returned. Valid options are normal or nbest.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
<function name="SPEECH" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Gets information about speech recognition results.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="argument" required="true">
|
|
|
|
<enumlist>
|
|
|
|
<enum name="status">
|
|
|
|
<para>Returns <literal>1</literal> upon speech object existing,
|
|
|
|
or <literal>0</literal> if not</para>
|
|
|
|
</enum>
|
|
|
|
<enum name="spoke">
|
|
|
|
<para>Returns <literal>1</literal> if spoker spoke,
|
|
|
|
or <literal>0</literal> if not</para>
|
|
|
|
</enum>
|
|
|
|
<enum name="results">
|
|
|
|
<para>Returns number of results that were recognized.</para>
|
|
|
|
</enum>
|
|
|
|
</enumlist>
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Gets information about speech recognition results.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
|
|
|
***/
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
/*! \brief Helper function used by datastores to destroy the speech structure upon hangup */
|
|
|
|
static void destroy_callback(void *data)
|
|
|
|
{
|
|
|
|
struct ast_speech *speech = (struct ast_speech*)data;
|
|
|
|
|
|
|
|
if (speech == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Deallocate now */
|
|
|
|
ast_speech_destroy(speech);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Static structure for datastore information */
|
|
|
|
static const struct ast_datastore_info speech_datastore = {
|
|
|
|
.type = "speech",
|
|
|
|
.destroy = destroy_callback
|
|
|
|
};
|
|
|
|
|
|
|
|
/*! \brief Helper function used to find the speech structure attached to a channel */
|
|
|
|
static struct ast_speech *find_speech(struct ast_channel *chan)
|
|
|
|
{
|
|
|
|
struct ast_speech *speech = NULL;
|
|
|
|
struct ast_datastore *datastore = NULL;
|
2014-03-27 19:21:44 +00:00
|
|
|
|
|
|
|
if (!chan) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-07-28 18:58:43 +00:00
|
|
|
ast_channel_lock(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
datastore = ast_channel_datastore_find(chan, &speech_datastore, NULL);
|
2014-07-28 18:58:43 +00:00
|
|
|
ast_channel_unlock(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
if (datastore == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
speech = datastore->data;
|
|
|
|
|
|
|
|
return speech;
|
|
|
|
}
|
|
|
|
|
2014-07-28 18:58:43 +00:00
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* \brief Destroy the speech datastore on the given channel.
|
|
|
|
*
|
|
|
|
* \param chan Channel to destroy speech datastore.
|
|
|
|
*
|
|
|
|
* \retval 0 on success.
|
|
|
|
* \retval -1 not found.
|
|
|
|
*/
|
|
|
|
static int speech_datastore_destroy(struct ast_channel *chan)
|
|
|
|
{
|
|
|
|
struct ast_datastore *datastore;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
ast_channel_lock(chan);
|
|
|
|
datastore = ast_channel_datastore_find(chan, &speech_datastore, NULL);
|
|
|
|
if (datastore) {
|
|
|
|
ast_channel_datastore_remove(chan, datastore);
|
|
|
|
}
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
if (datastore) {
|
|
|
|
ast_datastore_free(datastore);
|
|
|
|
res = 0;
|
|
|
|
} else {
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-04-06 01:15:50 +00:00
|
|
|
/* Helper function to find a specific speech recognition result by number and nbest alternative */
|
|
|
|
static struct ast_speech_result *find_result(struct ast_speech_result *results, char *result_num)
|
2006-04-13 00:18:52 +00:00
|
|
|
{
|
2007-04-06 01:15:50 +00:00
|
|
|
struct ast_speech_result *result = results;
|
|
|
|
char *tmp = NULL;
|
|
|
|
int nbest_num = 0, wanted_num = 0, i = 0;
|
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (!result) {
|
2007-04-13 18:09:29 +00:00
|
|
|
return NULL;
|
2008-04-25 20:20:10 +00:00
|
|
|
}
|
2007-04-13 18:09:29 +00:00
|
|
|
|
2007-04-06 01:15:50 +00:00
|
|
|
if ((tmp = strchr(result_num, '/'))) {
|
|
|
|
*tmp++ = '\0';
|
|
|
|
nbest_num = atoi(result_num);
|
|
|
|
wanted_num = atoi(tmp);
|
|
|
|
} else {
|
|
|
|
wanted_num = atoi(result_num);
|
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-04-06 01:15:50 +00:00
|
|
|
do {
|
|
|
|
if (result->nbest_num != nbest_num)
|
|
|
|
continue;
|
|
|
|
if (i == wanted_num)
|
2006-04-13 00:18:52 +00:00
|
|
|
break;
|
|
|
|
i++;
|
2007-07-11 17:34:30 +00:00
|
|
|
} while ((result = AST_LIST_NEXT(result, list)));
|
2006-04-13 00:18:52 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief SPEECH_SCORE() Dialplan Function */
|
2007-01-05 23:32:42 +00:00
|
|
|
static int speech_score(struct ast_channel *chan, const char *cmd, char *data,
|
2006-04-13 00:18:52 +00:00
|
|
|
char *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct ast_speech_result *result = NULL;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
char tmp[128] = "";
|
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (data == NULL || speech == NULL || !(result = find_result(speech->results, data))) {
|
2006-04-13 00:18:52 +00:00
|
|
|
return -1;
|
2008-04-25 20:20:10 +00:00
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
|
|
|
snprintf(tmp, sizeof(tmp), "%d", result->score);
|
|
|
|
|
|
|
|
ast_copy_string(buf, tmp, len);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function speech_score_function = {
|
2008-04-25 20:20:10 +00:00
|
|
|
.name = "SPEECH_SCORE",
|
|
|
|
.read = speech_score,
|
|
|
|
.write = NULL,
|
2006-04-13 00:18:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*! \brief SPEECH_TEXT() Dialplan Function */
|
2007-01-05 23:32:42 +00:00
|
|
|
static int speech_text(struct ast_channel *chan, const char *cmd, char *data,
|
2006-04-13 00:18:52 +00:00
|
|
|
char *buf, size_t len)
|
|
|
|
{
|
2008-04-25 20:20:10 +00:00
|
|
|
struct ast_speech_result *result = NULL;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (data == NULL || speech == NULL || !(result = find_result(speech->results, data))) {
|
|
|
|
return -1;
|
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (result->text != NULL) {
|
2006-04-13 00:18:52 +00:00
|
|
|
ast_copy_string(buf, result->text, len);
|
2008-10-06 21:09:05 +00:00
|
|
|
} else {
|
|
|
|
buf[0] = '\0';
|
2008-04-25 20:20:10 +00:00
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
return 0;
|
2006-04-13 00:18:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function speech_text_function = {
|
2008-04-25 20:20:10 +00:00
|
|
|
.name = "SPEECH_TEXT",
|
|
|
|
.read = speech_text,
|
|
|
|
.write = NULL,
|
2006-04-13 00:18:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*! \brief SPEECH_GRAMMAR() Dialplan Function */
|
2007-01-05 23:32:42 +00:00
|
|
|
static int speech_grammar(struct ast_channel *chan, const char *cmd, char *data,
|
2006-04-13 00:18:52 +00:00
|
|
|
char *buf, size_t len)
|
|
|
|
{
|
2008-04-25 20:20:10 +00:00
|
|
|
struct ast_speech_result *result = NULL;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (data == NULL || speech == NULL || !(result = find_result(speech->results, data))) {
|
|
|
|
return -1;
|
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (result->grammar != NULL) {
|
2006-04-13 00:18:52 +00:00
|
|
|
ast_copy_string(buf, result->grammar, len);
|
2008-10-06 21:09:05 +00:00
|
|
|
} else {
|
|
|
|
buf[0] = '\0';
|
2008-04-25 20:20:10 +00:00
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
return 0;
|
2006-04-13 00:18:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function speech_grammar_function = {
|
2008-04-25 20:20:10 +00:00
|
|
|
.name = "SPEECH_GRAMMAR",
|
|
|
|
.read = speech_grammar,
|
|
|
|
.write = NULL,
|
2006-04-13 00:18:52 +00:00
|
|
|
};
|
|
|
|
|
2012-10-01 12:29:04 +00:00
|
|
|
/*! \brief SPEECH_ENGINE() Dialplan Set Function */
|
2007-01-05 23:32:42 +00:00
|
|
|
static int speech_engine_write(struct ast_channel *chan, const char *cmd, char *data, const char *value)
|
2006-07-18 16:22:26 +00:00
|
|
|
{
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
|
2008-04-25 20:20:10 +00:00
|
|
|
if (data == NULL || speech == NULL) {
|
2006-07-18 16:22:26 +00:00
|
|
|
return -1;
|
2008-04-25 20:20:10 +00:00
|
|
|
}
|
2006-07-18 16:22:26 +00:00
|
|
|
|
|
|
|
ast_speech_change(speech, data, value);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-01 12:29:04 +00:00
|
|
|
/*! \brief SPEECH_ENGINE() Dialplan Get Function */
|
|
|
|
static int speech_engine_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
|
|
|
|
if (!data || !speech) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ast_speech_get_setting(speech, data, buf, len);
|
|
|
|
}
|
|
|
|
|
2006-07-18 16:22:26 +00:00
|
|
|
static struct ast_custom_function speech_engine_function = {
|
|
|
|
.name = "SPEECH_ENGINE",
|
2012-10-01 12:29:04 +00:00
|
|
|
.read = speech_engine_read,
|
2006-07-18 16:22:26 +00:00
|
|
|
.write = speech_engine_write,
|
|
|
|
};
|
|
|
|
|
2007-04-06 01:15:50 +00:00
|
|
|
/*! \brief SPEECH_RESULTS_TYPE() Dialplan Function */
|
|
|
|
static int speech_results_type_write(struct ast_channel *chan, const char *cmd, char *data, const char *value)
|
|
|
|
{
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
|
|
|
|
if (data == NULL || speech == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!strcasecmp(value, "normal"))
|
|
|
|
ast_speech_change_results_type(speech, AST_SPEECH_RESULTS_TYPE_NORMAL);
|
|
|
|
else if (!strcasecmp(value, "nbest"))
|
|
|
|
ast_speech_change_results_type(speech, AST_SPEECH_RESULTS_TYPE_NBEST);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function speech_results_type_function = {
|
|
|
|
.name = "SPEECH_RESULTS_TYPE",
|
|
|
|
.read = NULL,
|
|
|
|
.write = speech_results_type_write,
|
|
|
|
};
|
|
|
|
|
2006-04-13 00:18:52 +00:00
|
|
|
/*! \brief SPEECH() Dialplan Function */
|
2007-01-05 23:32:42 +00:00
|
|
|
static int speech_read(struct ast_channel *chan, const char *cmd, char *data,
|
2006-04-13 00:18:52 +00:00
|
|
|
char *buf, size_t len)
|
|
|
|
{
|
|
|
|
int results = 0;
|
|
|
|
struct ast_speech_result *result = NULL;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
char tmp[128] = "";
|
|
|
|
|
|
|
|
/* Now go for the various options */
|
|
|
|
if (!strcasecmp(data, "status")) {
|
|
|
|
if (speech != NULL)
|
|
|
|
ast_copy_string(buf, "1", len);
|
|
|
|
else
|
|
|
|
ast_copy_string(buf, "0", len);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure we have a speech structure for everything else */
|
|
|
|
if (speech == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check to see if they are checking for silence */
|
|
|
|
if (!strcasecmp(data, "spoke")) {
|
|
|
|
if (ast_test_flag(speech, AST_SPEECH_SPOKE))
|
|
|
|
ast_copy_string(buf, "1", len);
|
|
|
|
else
|
|
|
|
ast_copy_string(buf, "0", len);
|
|
|
|
} else if (!strcasecmp(data, "results")) {
|
|
|
|
/* Count number of results */
|
2007-07-11 17:34:30 +00:00
|
|
|
for (result = speech->results; result; result = AST_LIST_NEXT(result, list))
|
2006-04-13 00:18:52 +00:00
|
|
|
results++;
|
|
|
|
snprintf(tmp, sizeof(tmp), "%d", results);
|
|
|
|
ast_copy_string(buf, tmp, len);
|
2008-10-06 21:09:05 +00:00
|
|
|
} else {
|
|
|
|
buf[0] = '\0';
|
2006-04-13 00:18:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function speech_function = {
|
2008-04-25 20:20:10 +00:00
|
|
|
.name = "SPEECH",
|
|
|
|
.read = speech_read,
|
|
|
|
.write = NULL,
|
2006-04-13 00:18:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
/*! \brief SpeechCreate() Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_create(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
|
|
|
struct ast_speech *speech = NULL;
|
|
|
|
struct ast_datastore *datastore = NULL;
|
|
|
|
|
|
|
|
/* Request a speech object */
|
2012-02-20 23:43:27 +00:00
|
|
|
speech = ast_speech_new(data, ast_channel_nativeformats(chan));
|
2006-04-10 23:29:50 +00:00
|
|
|
if (speech == NULL) {
|
|
|
|
/* Not available */
|
|
|
|
pbx_builtin_setvar_helper(chan, "ERROR", "1");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-05 16:56:11 +00:00
|
|
|
datastore = ast_datastore_alloc(&speech_datastore, NULL);
|
2006-04-10 23:29:50 +00:00
|
|
|
if (datastore == NULL) {
|
|
|
|
ast_speech_destroy(speech);
|
|
|
|
pbx_builtin_setvar_helper(chan, "ERROR", "1");
|
|
|
|
return 0;
|
|
|
|
}
|
2009-02-19 16:38:41 +00:00
|
|
|
pbx_builtin_setvar_helper(chan, "ERROR", NULL);
|
2006-04-10 23:29:50 +00:00
|
|
|
datastore->data = speech;
|
2014-07-28 18:58:43 +00:00
|
|
|
ast_channel_lock(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
ast_channel_datastore_add(chan, datastore);
|
2014-07-28 18:58:43 +00:00
|
|
|
ast_channel_unlock(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/*! \brief SpeechLoadGrammar(Grammar Name,Path) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_load(struct ast_channel *chan, const char *vdata)
|
2006-04-13 00:18:52 +00:00
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
int res = 0;
|
2006-04-13 00:18:52 +00:00
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2007-07-31 01:10:47 +00:00
|
|
|
char *data;
|
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(grammar);
|
|
|
|
AST_APP_ARG(path);
|
|
|
|
);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
data = ast_strdupa(vdata);
|
|
|
|
AST_STANDARD_APP_ARGS(args, data);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-16 14:39:29 +00:00
|
|
|
if (speech == NULL)
|
2007-07-31 01:10:47 +00:00
|
|
|
return -1;
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (args.argc != 2)
|
2006-04-13 00:18:52 +00:00
|
|
|
return -1;
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Load the grammar locally on the object */
|
|
|
|
res = ast_speech_grammar_load(speech, args.grammar, args.path);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return res;
|
2006-04-13 00:18:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief SpeechUnloadGrammar(Grammar Name) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_unload(struct ast_channel *chan, const char *data)
|
2006-04-13 00:18:52 +00:00
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
int res = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (speech == NULL)
|
2007-07-16 14:39:29 +00:00
|
|
|
return -1;
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Unload the grammar */
|
|
|
|
res = ast_speech_grammar_unload(speech, data);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return res;
|
2006-04-13 00:18:52 +00:00
|
|
|
}
|
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
/*! \brief SpeechDeactivateGrammar(Grammar Name) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_deactivate(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
int res = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (speech == NULL)
|
|
|
|
return -1;
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Deactivate the grammar on the speech object */
|
|
|
|
res = ast_speech_grammar_deactivate(speech, data);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return res;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief SpeechActivateGrammar(Grammar Name) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_activate(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
|
|
|
int res = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
|
2007-07-16 14:39:29 +00:00
|
|
|
if (speech == NULL)
|
2006-04-10 23:29:50 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Activate the grammar on the speech object */
|
|
|
|
res = ast_speech_grammar_activate(speech, data);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief SpeechStart() Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_start(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
|
|
|
int res = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
|
2007-07-16 14:39:29 +00:00
|
|
|
if (speech == NULL)
|
2006-04-10 23:29:50 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
ast_speech_start(speech);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief SpeechProcessingSound(Sound File) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_processing_sound(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
int res = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (speech == NULL)
|
|
|
|
return -1;
|
2006-04-10 23:29:50 +00:00
|
|
|
|
|
|
|
if (speech->processing_sound != NULL) {
|
2007-06-06 21:20:11 +00:00
|
|
|
ast_free(speech->processing_sound);
|
2006-04-10 23:29:50 +00:00
|
|
|
speech->processing_sound = NULL;
|
|
|
|
}
|
|
|
|
|
2007-06-14 23:01:01 +00:00
|
|
|
speech->processing_sound = ast_strdup(data);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return res;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Helper function used by speech_background to playback a soundfile */
|
|
|
|
static int speech_streamfile(struct ast_channel *chan, const char *filename, const char *preflang)
|
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
struct ast_filestream *fs = NULL;
|
2007-01-10 20:26:55 +00:00
|
|
|
|
|
|
|
if (!(fs = ast_openstream(chan, filename, preflang)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (ast_applystream(chan, fs))
|
|
|
|
return -1;
|
|
|
|
|
2007-06-22 15:03:32 +00:00
|
|
|
ast_playstream(fs);
|
2007-01-10 20:26:55 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return 0;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
2008-01-30 00:04:17 +00:00
|
|
|
enum {
|
|
|
|
SB_OPT_NOANSWER = (1 << 0),
|
|
|
|
};
|
|
|
|
|
|
|
|
AST_APP_OPTIONS(speech_background_options, BEGIN_OPTIONS
|
|
|
|
AST_APP_OPTION('n', SB_OPT_NOANSWER),
|
|
|
|
END_OPTIONS );
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/*! \brief SpeechBackground(Sound File,Timeout) Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_background(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
2007-07-31 01:10:47 +00:00
|
|
|
unsigned int timeout = 0;
|
|
|
|
int res = 0, done = 0, started = 0, quieted = 0, max_dtmf_len = 0;
|
|
|
|
struct ast_speech *speech = find_speech(chan);
|
|
|
|
struct ast_frame *f = NULL;
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
RAII_VAR(struct ast_format *, oldreadformat, NULL, ao2_cleanup);
|
2007-07-31 01:10:47 +00:00
|
|
|
char dtmf[AST_MAX_EXTENSION] = "";
|
2008-05-01 23:06:23 +00:00
|
|
|
struct timeval start = { 0, 0 }, current;
|
2007-07-31 01:10:47 +00:00
|
|
|
char *parse, *filename_tmp = NULL, *filename = NULL, tmp[2] = "", dtmf_terminator = '#';
|
2007-06-15 19:25:11 +00:00
|
|
|
const char *tmp2 = NULL;
|
2008-01-30 00:04:17 +00:00
|
|
|
struct ast_flags options = { 0 };
|
2007-07-31 01:10:47 +00:00
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(soundfile);
|
|
|
|
AST_APP_ARG(timeout);
|
2008-01-30 00:04:17 +00:00
|
|
|
AST_APP_ARG(options);
|
2007-07-31 01:10:47 +00:00
|
|
|
);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
parse = ast_strdupa(data);
|
|
|
|
AST_STANDARD_APP_ARGS(args, parse);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (speech == NULL)
|
|
|
|
return -1;
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2008-01-30 00:04:17 +00:00
|
|
|
if (!ast_strlen_zero(args.options)) {
|
|
|
|
char *options_buf = ast_strdupa(args.options);
|
|
|
|
ast_app_parse_options(speech_background_options, &options, NULL, options_buf);
|
|
|
|
}
|
|
|
|
|
2006-05-15 15:30:21 +00:00
|
|
|
/* If channel is not already answered, then answer it */
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_state(chan) != AST_STATE_UP && !ast_test_flag(&options, SB_OPT_NOANSWER)
|
2008-01-30 00:04:17 +00:00
|
|
|
&& ast_answer(chan)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2006-05-15 15:30:21 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Record old read format */
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
oldreadformat = ao2_bump(ast_channel_readformat(chan));
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Change read format to be signed linear */
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
if (ast_set_read_format(chan, speech->format))
|
2007-07-31 01:10:47 +00:00
|
|
|
return -1;
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
if (!ast_strlen_zero(args.soundfile)) {
|
|
|
|
/* Yay sound file */
|
|
|
|
filename_tmp = ast_strdupa(args.soundfile);
|
|
|
|
if (!ast_strlen_zero(args.timeout)) {
|
2008-05-01 23:06:23 +00:00
|
|
|
if ((timeout = atof(args.timeout) * 1000.0) == 0)
|
2007-03-26 19:35:24 +00:00
|
|
|
timeout = -1;
|
|
|
|
} else
|
|
|
|
timeout = 0;
|
2007-07-31 01:10:47 +00:00
|
|
|
}
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-06-15 19:25:11 +00:00
|
|
|
/* See if the maximum DTMF length variable is set... we use a variable in case they want to carry it through their entire dialplan */
|
2008-04-30 19:21:04 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_MAXLEN")) && !ast_strlen_zero(tmp2)) {
|
2007-06-15 19:25:11 +00:00
|
|
|
max_dtmf_len = atoi(tmp2);
|
2008-04-30 19:21:04 +00:00
|
|
|
}
|
|
|
|
|
2007-07-25 22:18:56 +00:00
|
|
|
/* See if a terminator is specified */
|
|
|
|
if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_TERMINATOR"))) {
|
|
|
|
if (ast_strlen_zero(tmp2))
|
|
|
|
dtmf_terminator = '\0';
|
|
|
|
else
|
|
|
|
dtmf_terminator = tmp2[0];
|
|
|
|
}
|
2008-04-30 19:21:04 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-07-25 22:18:56 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Before we go into waiting for stuff... make sure the structure is ready, if not - start it again */
|
|
|
|
if (speech->state == AST_SPEECH_STATE_NOT_READY || speech->state == AST_SPEECH_STATE_DONE) {
|
2006-04-13 00:18:52 +00:00
|
|
|
ast_speech_change_state(speech, AST_SPEECH_STATE_NOT_READY);
|
2007-07-31 01:10:47 +00:00
|
|
|
ast_speech_start(speech);
|
|
|
|
}
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-01-10 20:26:55 +00:00
|
|
|
/* Ensure no streams are currently running */
|
|
|
|
ast_stopstream(chan);
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Okay it's streaming so go into a loop grabbing frames! */
|
|
|
|
while (done == 0) {
|
2007-01-10 20:26:55 +00:00
|
|
|
/* If the filename is null and stream is not running, start up a new sound file */
|
2012-03-13 18:20:34 +00:00
|
|
|
if (!quieted && (ast_channel_streamid(chan) == -1 && ast_channel_timingfunc(chan) == NULL) && (filename = strsep(&filename_tmp, "&"))) {
|
2007-01-10 20:26:55 +00:00
|
|
|
/* Discard old stream information */
|
|
|
|
ast_stopstream(chan);
|
|
|
|
/* Start new stream */
|
2012-01-24 20:12:09 +00:00
|
|
|
speech_streamfile(chan, filename, ast_channel_language(chan));
|
2007-01-10 20:26:55 +00:00
|
|
|
}
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Run scheduled stuff */
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_sched_runq(ast_channel_sched(chan));
|
2007-07-31 01:10:47 +00:00
|
|
|
|
|
|
|
/* Yay scheduling */
|
2012-02-20 23:43:27 +00:00
|
|
|
res = ast_sched_wait(ast_channel_sched(chan));
|
2007-07-31 01:10:47 +00:00
|
|
|
if (res < 0)
|
|
|
|
res = 1000;
|
|
|
|
|
|
|
|
/* If there is a frame waiting, get it - if not - oh well */
|
|
|
|
if (ast_waitfor(chan, res) > 0) {
|
|
|
|
f = ast_read(chan);
|
|
|
|
if (f == NULL) {
|
|
|
|
/* The channel has hung up most likely */
|
|
|
|
done = 3;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-04-13 00:18:52 +00:00
|
|
|
|
|
|
|
/* Do timeout check (shared between audio/dtmf) */
|
2007-04-03 19:43:26 +00:00
|
|
|
if ((!quieted || strlen(dtmf)) && started == 1) {
|
2008-05-01 23:06:23 +00:00
|
|
|
current = ast_tvnow();
|
2009-03-01 23:25:23 +00:00
|
|
|
if ((ast_tvdiff_ms(current, start)) >= timeout) {
|
2006-04-13 00:18:52 +00:00
|
|
|
done = 1;
|
2006-06-11 14:52:04 +00:00
|
|
|
if (f)
|
|
|
|
ast_frfree(f);
|
2006-04-10 23:29:50 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* Do checks on speech structure to see if it's changed */
|
|
|
|
ast_mutex_lock(&speech->lock);
|
|
|
|
if (ast_test_flag(speech, AST_SPEECH_QUIET)) {
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_stream(chan))
|
2007-02-28 17:47:41 +00:00
|
|
|
ast_stopstream(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
ast_clear_flag(speech, AST_SPEECH_QUIET);
|
2007-02-08 17:56:53 +00:00
|
|
|
quieted = 1;
|
2007-07-31 01:10:47 +00:00
|
|
|
}
|
|
|
|
/* Check state so we can see what to do */
|
|
|
|
switch (speech->state) {
|
|
|
|
case AST_SPEECH_STATE_READY:
|
|
|
|
/* If audio playback has stopped do a check for timeout purposes */
|
2012-03-13 18:20:34 +00:00
|
|
|
if (ast_channel_streamid(chan) == -1 && ast_channel_timingfunc(chan) == NULL)
|
2007-07-31 01:10:47 +00:00
|
|
|
ast_stopstream(chan);
|
2012-02-20 23:43:27 +00:00
|
|
|
if (!quieted && ast_channel_stream(chan) == NULL && timeout && started == 0 && !filename_tmp) {
|
2007-03-26 19:35:24 +00:00
|
|
|
if (timeout == -1) {
|
|
|
|
done = 1;
|
|
|
|
if (f)
|
|
|
|
ast_frfree(f);
|
|
|
|
break;
|
|
|
|
}
|
2008-05-01 23:06:23 +00:00
|
|
|
start = ast_tvnow();
|
2006-04-13 00:18:52 +00:00
|
|
|
started = 1;
|
2007-07-31 01:10:47 +00:00
|
|
|
}
|
|
|
|
/* Write audio frame out to speech engine if no DTMF has been received */
|
|
|
|
if (!strlen(dtmf) && f != NULL && f->frametype == AST_FRAME_VOICE) {
|
2008-05-22 16:29:54 +00:00
|
|
|
ast_speech_write(speech, f->data.ptr, f->datalen);
|
2007-07-31 01:10:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case AST_SPEECH_STATE_WAIT:
|
|
|
|
/* Cue up waiting sound if not already playing */
|
2007-02-16 00:54:10 +00:00
|
|
|
if (!strlen(dtmf)) {
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_stream(chan) == NULL) {
|
2007-02-16 00:54:10 +00:00
|
|
|
if (speech->processing_sound != NULL) {
|
2008-04-25 20:20:10 +00:00
|
|
|
if (strlen(speech->processing_sound) > 0 && strcasecmp(speech->processing_sound, "none")) {
|
2012-01-24 20:12:09 +00:00
|
|
|
speech_streamfile(chan, speech->processing_sound, ast_channel_language(chan));
|
2007-02-16 00:54:10 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-13 18:20:34 +00:00
|
|
|
} else if (ast_channel_streamid(chan) == -1 && ast_channel_timingfunc(chan) == NULL) {
|
2007-02-16 00:54:10 +00:00
|
|
|
ast_stopstream(chan);
|
|
|
|
if (speech->processing_sound != NULL) {
|
2008-04-25 20:20:10 +00:00
|
|
|
if (strlen(speech->processing_sound) > 0 && strcasecmp(speech->processing_sound, "none")) {
|
2012-01-24 20:12:09 +00:00
|
|
|
speech_streamfile(chan, speech->processing_sound, ast_channel_language(chan));
|
2007-02-16 00:54:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-07-31 01:10:47 +00:00
|
|
|
break;
|
|
|
|
case AST_SPEECH_STATE_DONE:
|
2007-02-16 00:54:10 +00:00
|
|
|
/* Now that we are done... let's switch back to not ready state */
|
2006-04-13 00:18:52 +00:00
|
|
|
ast_speech_change_state(speech, AST_SPEECH_STATE_NOT_READY);
|
2007-02-16 00:54:10 +00:00
|
|
|
if (!strlen(dtmf)) {
|
|
|
|
/* Copy to speech structure the results, if available */
|
|
|
|
speech->results = ast_speech_results_get(speech);
|
|
|
|
/* Break out of our background too */
|
|
|
|
done = 1;
|
|
|
|
/* Stop audio playback */
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_stream(chan) != NULL) {
|
2007-02-16 00:54:10 +00:00
|
|
|
ast_stopstream(chan);
|
|
|
|
}
|
|
|
|
}
|
2007-07-31 01:10:47 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ast_mutex_unlock(&speech->lock);
|
|
|
|
|
|
|
|
/* Deal with other frame types */
|
|
|
|
if (f != NULL) {
|
|
|
|
/* Free the frame we received */
|
|
|
|
switch (f->frametype) {
|
|
|
|
case AST_FRAME_DTMF:
|
2009-11-04 14:05:12 +00:00
|
|
|
if (dtmf_terminator != '\0' && f->subclass.integer == dtmf_terminator) {
|
2006-04-10 23:29:50 +00:00
|
|
|
done = 1;
|
|
|
|
} else {
|
2010-05-19 20:02:57 +00:00
|
|
|
quieted = 1;
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_stream(chan) != NULL) {
|
2006-04-10 23:29:50 +00:00
|
|
|
ast_stopstream(chan);
|
2007-04-03 19:43:26 +00:00
|
|
|
}
|
|
|
|
if (!started) {
|
2006-04-13 00:18:52 +00:00
|
|
|
/* Change timeout to be 5 seconds for DTMF input */
|
2012-02-20 23:43:27 +00:00
|
|
|
timeout = (ast_channel_pbx(chan) && ast_channel_pbx(chan)->dtimeoutms) ? ast_channel_pbx(chan)->dtimeoutms : 5000;
|
2006-04-13 00:18:52 +00:00
|
|
|
started = 1;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
2008-05-01 23:06:23 +00:00
|
|
|
start = ast_tvnow();
|
2009-11-04 14:05:12 +00:00
|
|
|
snprintf(tmp, sizeof(tmp), "%c", f->subclass.integer);
|
2008-03-07 06:54:47 +00:00
|
|
|
strncat(dtmf, tmp, sizeof(dtmf) - strlen(dtmf) - 1);
|
2007-06-15 19:25:11 +00:00
|
|
|
/* If the maximum length of the DTMF has been reached, stop now */
|
|
|
|
if (max_dtmf_len && strlen(dtmf) == max_dtmf_len)
|
|
|
|
done = 1;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
2007-07-31 01:10:47 +00:00
|
|
|
break;
|
|
|
|
case AST_FRAME_CONTROL:
|
2009-11-04 14:05:12 +00:00
|
|
|
switch (f->subclass.integer) {
|
2007-07-31 01:10:47 +00:00
|
|
|
case AST_CONTROL_HANGUP:
|
|
|
|
/* Since they hung up we should destroy the speech structure */
|
|
|
|
done = 3;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ast_frfree(f);
|
|
|
|
f = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ast_strlen_zero(dtmf)) {
|
2006-04-13 00:18:52 +00:00
|
|
|
/* We sort of make a results entry */
|
|
|
|
speech->results = ast_calloc(1, sizeof(*speech->results));
|
|
|
|
if (speech->results != NULL) {
|
2007-08-13 21:59:15 +00:00
|
|
|
ast_speech_dtmf(speech, dtmf);
|
2006-04-13 00:18:52 +00:00
|
|
|
speech->results->score = 1000;
|
2007-06-14 23:01:01 +00:00
|
|
|
speech->results->text = ast_strdup(dtmf);
|
|
|
|
speech->results->grammar = ast_strdup("dtmf");
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
2008-10-08 14:53:51 +00:00
|
|
|
ast_speech_change_state(speech, AST_SPEECH_STATE_NOT_READY);
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
/* See if it was because they hung up */
|
|
|
|
if (done == 3) {
|
2014-07-28 18:58:43 +00:00
|
|
|
speech_datastore_destroy(chan);
|
2007-07-31 01:10:47 +00:00
|
|
|
} else {
|
|
|
|
/* Channel is okay so restore read format */
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_set_read_format(chan, oldreadformat);
|
2007-07-31 01:10:47 +00:00
|
|
|
}
|
2006-04-10 23:29:50 +00:00
|
|
|
|
2007-07-31 01:10:47 +00:00
|
|
|
return 0;
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
/*! \brief SpeechDestroy() Dialplan Application */
|
2009-05-21 21:13:09 +00:00
|
|
|
static int speech_destroy(struct ast_channel *chan, const char *data)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
2014-07-28 18:58:43 +00:00
|
|
|
if (!chan) {
|
2006-04-10 23:29:50 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2014-07-28 18:58:43 +00:00
|
|
|
return speech_datastore_destroy(chan);
|
2006-04-10 23:29:50 +00:00
|
|
|
}
|
|
|
|
|
2006-08-21 02:11:39 +00:00
|
|
|
static int unload_module(void)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
res = ast_unregister_application("SpeechCreate");
|
2006-04-13 00:18:52 +00:00
|
|
|
res |= ast_unregister_application("SpeechLoadGrammar");
|
|
|
|
res |= ast_unregister_application("SpeechUnloadGrammar");
|
2006-04-10 23:29:50 +00:00
|
|
|
res |= ast_unregister_application("SpeechActivateGrammar");
|
2007-07-31 01:10:47 +00:00
|
|
|
res |= ast_unregister_application("SpeechDeactivateGrammar");
|
2006-04-10 23:29:50 +00:00
|
|
|
res |= ast_unregister_application("SpeechStart");
|
|
|
|
res |= ast_unregister_application("SpeechBackground");
|
|
|
|
res |= ast_unregister_application("SpeechDestroy");
|
2006-04-13 00:18:52 +00:00
|
|
|
res |= ast_unregister_application("SpeechProcessingSound");
|
|
|
|
res |= ast_custom_function_unregister(&speech_function);
|
|
|
|
res |= ast_custom_function_unregister(&speech_score_function);
|
|
|
|
res |= ast_custom_function_unregister(&speech_text_function);
|
|
|
|
res |= ast_custom_function_unregister(&speech_grammar_function);
|
2006-07-18 16:22:26 +00:00
|
|
|
res |= ast_custom_function_unregister(&speech_engine_function);
|
2007-04-06 01:15:50 +00:00
|
|
|
res |= ast_custom_function_unregister(&speech_results_type_function);
|
2006-04-10 23:29:50 +00:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-08-21 02:11:39 +00:00
|
|
|
static int load_module(void)
|
2006-04-10 23:29:50 +00:00
|
|
|
{
|
|
|
|
int res = 0;
|
|
|
|
|
2008-12-06 21:18:51 +00:00
|
|
|
res = ast_register_application_xml("SpeechCreate", speech_create);
|
|
|
|
res |= ast_register_application_xml("SpeechLoadGrammar", speech_load);
|
|
|
|
res |= ast_register_application_xml("SpeechUnloadGrammar", speech_unload);
|
|
|
|
res |= ast_register_application_xml("SpeechActivateGrammar", speech_activate);
|
|
|
|
res |= ast_register_application_xml("SpeechDeactivateGrammar", speech_deactivate);
|
|
|
|
res |= ast_register_application_xml("SpeechStart", speech_start);
|
|
|
|
res |= ast_register_application_xml("SpeechBackground", speech_background);
|
|
|
|
res |= ast_register_application_xml("SpeechDestroy", speech_destroy);
|
|
|
|
res |= ast_register_application_xml("SpeechProcessingSound", speech_processing_sound);
|
2006-04-13 00:18:52 +00:00
|
|
|
res |= ast_custom_function_register(&speech_function);
|
|
|
|
res |= ast_custom_function_register(&speech_score_function);
|
|
|
|
res |= ast_custom_function_register(&speech_text_function);
|
|
|
|
res |= ast_custom_function_register(&speech_grammar_function);
|
2006-07-18 16:22:26 +00:00
|
|
|
res |= ast_custom_function_register(&speech_engine_function);
|
2007-04-06 01:15:50 +00:00
|
|
|
res |= ast_custom_function_register(&speech_results_type_function);
|
2006-04-13 00:18:52 +00:00
|
|
|
|
2006-04-10 23:29:50 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2010-09-02 05:27:53 +00:00
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applications",
|
2014-07-25 16:47:17 +00:00
|
|
|
.support_level = AST_MODULE_SUPPORT_CORE,
|
2010-09-02 05:27:53 +00:00
|
|
|
.load = load_module,
|
|
|
|
.unload = unload_module,
|
|
|
|
.nonoptreq = "res_speech",
|
|
|
|
);
|