Merged revisions 378322 via svnmerge from
[asterisk/asterisk.git] / funcs / func_speex.c
index 6858cf7..7467c23 100644 (file)
  *
  * \ingroup functions
  *
- * \extref The Speex library - http://www.speex.org
+ * The Speex 1.2 library - http://www.speex.org
+ * \note Requires the 1.2 version of the Speex library (which might not be what you find in Linux packages)
  */
 
 /*** MODULEINFO
        <depend>speex</depend>
        <depend>speex_preprocess</depend>
-       <use>speexdsp</use>
+       <use type="external">speexdsp</use>
+       <support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
@@ -60,12 +62,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                </syntax>
                <description>
                        <para>The AGC function will apply automatic gain control to the audio on the
-                       channel that it is executed on. Using <literal>rx</literal> for audio recieved
+                       channel that it is executed on. Using <literal>rx</literal> for audio received
                        and <literal>tx</literal> for audio transmitted to the channel. When using this
-                       function you set a target audio level. It is primarly intended for use with
+                       function you set a target audio level. It is primarily intended for use with
                        analog lines, but could be useful for other channels as well. The target volume 
                        is set with a number between <literal>1-32768</literal>. The larger the number
-                       the louder (more gain) the channel will recieve.</para>
+                       the louder (more gain) the channel will receive.</para>
                        <para>Examples:</para>
                        <para>exten => 1,1,Set(AGC(rx)=8000)</para>
                        <para>exten => 1,2,Set(AGC(tx)=off)</para>
@@ -104,6 +106,7 @@ struct speex_direction_info {
 
 struct speex_info {
        struct ast_audiohook audiohook;
+       int lastrate;
        struct speex_direction_info *tx, *rx;
 };
 
@@ -142,36 +145,36 @@ static int speex_callback(struct ast_audiohook *audiohook, struct ast_channel *c
        struct ast_datastore *datastore = NULL;
        struct speex_direction_info *sdi = NULL;
        struct speex_info *si = NULL;
+       char source[80];
 
        /* If the audiohook is stopping it means the channel is shutting down.... but we let the datastore destroy take care of it */
        if (audiohook->status == AST_AUDIOHOOK_STATUS_DONE || frame->frametype != AST_FRAME_VOICE) {
-               return 0;
+               return -1;
        }
-       
-       ast_channel_lock(chan);
+
+       /* We are called with chan already locked */
        if (!(datastore = ast_channel_datastore_find(chan, &speex_datastore, NULL))) {
-               ast_channel_unlock(chan);
-               return 0;
+               return -1;
        }
-       ast_channel_unlock(chan);
 
        si = datastore->data;
 
        sdi = (direction == AST_AUDIOHOOK_DIRECTION_READ) ? si->rx : si->tx;
 
        if (!sdi) {
-               return 0;
+               return -1;
        }
 
-       if (sdi->samples != frame->samples) {
+       if ((sdi->samples != frame->samples) || (ast_format_rate(&frame->subclass.format) != si->lastrate)) {
+               si->lastrate = ast_format_rate(&frame->subclass.format);
                if (sdi->state) {
                        speex_preprocess_state_destroy(sdi->state);
                }
 
-               if (!(sdi->state = speex_preprocess_state_init((sdi->samples = frame->samples), 8000))) {
+               if (!(sdi->state = speex_preprocess_state_init((sdi->samples = frame->samples), si->lastrate))) {
                        return -1;
                }
-               
+
                speex_preprocess_ctl(sdi->state, SPEEX_PREPROCESS_SET_AGC, &sdi->agc);
 
                if (sdi->agc) {
@@ -182,6 +185,12 @@ static int speex_callback(struct ast_audiohook *audiohook, struct ast_channel *c
        }
 
        speex_preprocess(sdi->state, frame->data.ptr, NULL);
+       snprintf(source, sizeof(source), "%s/speex", frame->src);
+       if (frame->mallocd & AST_MALLOCD_SRC) {
+               ast_free((char *) frame->src);
+       }
+       frame->src = ast_strdup(source);
+       frame->mallocd |= AST_MALLOCD_SRC;
 
        return 0;
 }
@@ -193,6 +202,11 @@ static int speex_write(struct ast_channel *chan, const char *cmd, char *data, co
        struct speex_direction_info **sdi = NULL;
        int is_new = 0;
 
+       if (strcasecmp(data, "rx") && strcasecmp(data, "tx")) {
+               ast_log(LOG_ERROR, "Invalid argument provided to the %s function\n", cmd);
+               return -1;
+       }
+
        ast_channel_lock(chan);
        if (!(datastore = ast_channel_datastore_find(chan, &speex_datastore, NULL))) {
                ast_channel_unlock(chan);
@@ -206,9 +220,9 @@ static int speex_write(struct ast_channel *chan, const char *cmd, char *data, co
                        return 0;
                }
 
-               ast_audiohook_init(&si->audiohook, AST_AUDIOHOOK_TYPE_MANIPULATE, "speex");
+               ast_audiohook_init(&si->audiohook, AST_AUDIOHOOK_TYPE_MANIPULATE, "speex", AST_AUDIOHOOK_MANIPULATE_ALL_RATES);
                si->audiohook.manipulate_callback = speex_callback;
-
+               si->lastrate = 8000;
                is_new = 1;
        } else {
                ast_channel_unlock(chan);
@@ -217,15 +231,8 @@ static int speex_write(struct ast_channel *chan, const char *cmd, char *data, co
 
        if (!strcasecmp(data, "rx")) {
                sdi = &si->rx;
-       } else if (!strcasecmp(data, "tx")) {
-               sdi = &si->tx;
        } else {
-               ast_log(LOG_ERROR, "Invalid argument provided to the %s function\n", cmd);
-
-               if (is_new) {
-                       ast_datastore_free(datastore);
-                       return -1;
-               }
+               sdi = &si->tx;
        }
 
        if (!*sdi) {
@@ -239,7 +246,7 @@ static int speex_write(struct ast_channel *chan, const char *cmd, char *data, co
        }
 
        if (!strcasecmp(cmd, "agc")) {
-               if (!sscanf(value, "%f", &(*sdi)->agclevel))
+               if (!sscanf(value, "%30f", &(*sdi)->agclevel))
                        (*sdi)->agclevel = ast_true(value) ? DEFAULT_AGC_LEVEL : 0.0;
        
                if ((*sdi)->agclevel > 32768.0) {
@@ -337,13 +344,15 @@ static int speex_read(struct ast_channel *chan, const char *cmd, char *data, cha
 static struct ast_custom_function agc_function = {
        .name = "AGC",
        .write = speex_write,
-       .read = speex_read
+       .read = speex_read,
+       .read_max = 22,
 };
 
 static struct ast_custom_function denoise_function = {
        .name = "DENOISE",
        .write = speex_write,
-       .read = speex_read
+       .read = speex_read,
+       .read_max = 22,
 };
 
 static int unload_module(void)