- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5585 - in freeswitch/branches/greenlizard/src/mod: asr_tts/mod_mrcprec asr_tts/mod_openmrcp xml_int/mod_xml_curl
by Freeswitch SVN 10 Aug '07

10 Aug '07

Author: greenlizard Date: Fri Aug 10 15:30:18 2007 New Revision: 5585 Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Removed: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/ Modified: freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: rename mod_mrcprec to mod_openmrcp Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/Makefile Fri Aug 10 15:30:18 2007 @@ -0,0 +1,33 @@ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to impact your build + +# TO GET THIS TO COMPILE +# hack ../../../../build/modmake.rules and remove the +# -Werror from the ALL_CFLAGS variable. + +# TODO +# - fix all the code that is causing warnings (We are currently working with Joe Stenbrenner from Division Management to have this task outsourced to Bangalore) +# - re-enable the -Werror flag (see above) +# - needs to compile/link against the _freeswitch_ sofia libs (see FIXME) +# - is there an openmrcp dir in the fs tree yet? (see FIXME) + +# FIXME!!! +OPENMRCP_DIR=/usr/src/openmrcp_stable + +OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ + +OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcplivemedia/.libs/libmrcplivemedia.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a + +MRCP_APR_INCLUDES = -I../../../../libs/apr/include +MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include +MRCP_SOFIA_INCLUDES = -I/usr/local/include/sofia-sip-1.12 # FIXME!! + +LOCAL_CFLAGS= -Wno-unused +LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) $(MRCP_SOFIA_INCLUDES) + +LOCAL_LDFLAGS=$(OPENMRCP_LIBS) +VERBOSE=TRUE +include ../../../../build/modmake.rules + Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- (empty file) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Fri Aug 10 15:30:18 2007 @@ -0,0 +1,910 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Traun Leyden <tleyden(a)branchcut.com> + * + * Module which acts as an MRCP client to an MRCP speech recognition + * server. In other words it bridges freeswitch to an external speech + * recognition system. + * + * Uses OpenMrcp (http://wiki.freeswitch.org/wiki/OpenMRCP) as the + * the client library. + * + */ +#ifdef __ICC +#pragma warning (disable:188) +#endif + + +#include "openmrcp_client.h" +#include "mrcp_client_context.h" +#include "mrcp_recognizer.h" +#include "mrcp_generic_header.h" +#include "rtp_session.h" +#include "mrcp_client.h" +#include "mrcp_client_context.h" +#include "mrcp_client_defs.h" +#include "mrcp_client_session.h" +#include "mrcp_client_resource.h" +#include "mrcp_client_signaling_agent.h" +#include "mrcp_media_agent.h" +#include "mrcp_resource.h" +#include "mrcp_consumer_task.h" +#include <apr_general.h> +#include <apr_file_io.h> +#include <apr_thread_proc.h> +#include <apr_thread_cond.h> +#include <apr_strings.h> + +#include <switch.h> + +#define OPENMRCP_WAIT_TIMEOUT 5000 + +SWITCH_MODULE_LOAD_FUNCTION(mod_openmrcp_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown); +SWITCH_MODULE_DEFINITION(mod_openmrcp, mod_openmrcp_load, + mod_openmrcp_shutdown, NULL); + +static struct { + char *client_ip; + char *server_ip; + uint32_t client_port; + uint32_t server_port; + uint32_t rtp_port_min; + uint32_t rtp_port_max; +} globals; + + +typedef enum { + OPENMRCP_EVENT_NONE, + OPENMRCP_EVENT_SESSION_INITIATE, + OPENMRCP_EVENT_SESSION_TERMINATE, + OPENMRCP_EVENT_CHANNEL_CREATE, + OPENMRCP_EVENT_CHANNEL_DESTROY, + OPENMRCP_EVENT_CHANNEL_MODIFY +} openmrcp_event_t; + +static const char *openmrcp_event_names[] = { + "NONE", + "SESSION_INITIATE", + "SESSION_TERMINATE", + "CHANNEL_CREATE", + "CHANNEL_DESTROY", + "CHANNEL_MODIFY", +}; + +// TODO: rename this to openmrcp_session_t +typedef struct openmrcp_session_t openmrcp_session_t; +struct openmrcp_session_t { + mrcp_session_t *client_session; + mrcp_client_channel_t *channel; + switch_queue_t *audio_input_queue; + switch_queue_t *event_queue; + mrcp_message_t *mrcp_message_last_rcvd; + audio_source_t *source; + apr_pool_t *pool; + apr_thread_cond_t *wait_object; + apr_thread_mutex_t *wait_object_mutex; + openmrcp_event_t wait_event; + uint32_t flags; + switch_mutex_t *flag_mutex; +}; + +static apr_status_t openmrcp_recognizer_read_frame(audio_source_t *source, media_frame_t *frame); + +static const audio_source_method_set_t audio_source_method_set = { + NULL, + NULL, + NULL, + openmrcp_recognizer_read_frame +}; + +typedef enum { + FLAG_HAS_TEXT = (1 << 0), + FLAG_BARGE = (1 << 1), + FLAG_READY = (1 << 2) +} mrcp_flag_t; + +typedef struct { + mrcp_client_t *mrcp_client; + mrcp_client_context_t *mrcp_client_context; +} openmrcp_module_t; + +static openmrcp_module_t openmrcp_module; + +static void log_callback(const char* message, void* userdata) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", message); +} + +static const char *state_names[] = { + "NOT_READY", + "READY", + "BARGE_IN", + "END_SPEECH", + "STOPPED", + "BARGE_IN_TIMEOUT", + "END_SPEECH_TIMEOUT", + "BEEP" +}; + +static openmrcp_session_t* openmrcp_session_create() +{ + openmrcp_session_t *openmrcp_session; + apr_pool_t *session_pool; + + if(apr_pool_create(&session_pool,NULL) != APR_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create session_pool\n"); + return NULL; + } + + openmrcp_session = apr_palloc(session_pool,sizeof(openmrcp_session_t)); + openmrcp_session->pool = session_pool; + openmrcp_session->client_session = NULL; + openmrcp_session->channel = NULL; + openmrcp_session->audio_input_queue = NULL; + openmrcp_session->event_queue = NULL; + openmrcp_session->wait_event = OPENMRCP_EVENT_NONE; + + apr_thread_mutex_create(&openmrcp_session->wait_object_mutex, APR_THREAD_MUTEX_UNNESTED, openmrcp_session->pool); + + apr_thread_cond_create(&openmrcp_session->wait_object, openmrcp_session->pool); + + + /* create an event queue */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "creating event queue\n"); + if (switch_queue_create(&openmrcp_session->event_queue, 1000, openmrcp_session->pool)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "event queue creation failed\n"); + } + + return openmrcp_session; +} + +static mrcp_status_t openmrcp_session_destroy(openmrcp_session_t *openmrcp_session) +{ + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + + if(openmrcp_session->pool) { + apr_thread_cond_destroy(openmrcp_session->wait_object); + apr_thread_mutex_destroy(openmrcp_session->wait_object_mutex); + apr_pool_destroy(openmrcp_session->pool); + openmrcp_session->pool = NULL; + } + return MRCP_STATUS_SUCCESS; +} + + +static mrcp_status_t openmrcp_session_wait_for_event(openmrcp_session_t *openmrcp_session, openmrcp_event_t openmrcp_event, size_t timeout) +{ + mrcp_status_t status = MRCP_STATUS_SUCCESS; + openmrcp_event_t *popped_event = NULL; + size_t sleep_ms = 100; + + + if(openmrcp_session->event_queue) { + if (switch_queue_trypop(openmrcp_session->event_queue, &popped_event)) { + // most likely this failed because queue is empty. sleep for timeout seconds and try again? + if (timeout > 0) { + if (timeout < sleep_ms) { + switch_sleep(timeout * 1000); // ms->us + timeout = 0; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sleeping %d millieconds\n", sleep_ms); + switch_sleep(sleep_ms * 1000); // ms->us + timeout -= sleep_ms; + } + + // call recursively + // TODO: This is going to end up in a lot of recursion and + // maybe blow the stack .. rethink this approach + return openmrcp_session_wait_for_event(openmrcp_session, openmrcp_event, timeout); + + } + else { + // nothing in queue, no timeout left, return failure + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "nothing in queue, no timeout left, return failure\n"); + return MRCP_STATUS_FAILURE; + } + + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped event\n"); + // check if popped event matches the event we are looking for + if (*popped_event == openmrcp_event) { + // just what we were waiting for! + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "just what we were waiting for! rturn success\n"); + return MRCP_STATUS_SUCCESS; + } + else { + // nothing popped, but maybe there's other things in queue, or something will arrive + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped unexpected\n"); + if (!popped_event) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped NULL!!\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped: %d\n", *popped_event); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped name: %s\n", openmrcp_event_names[*popped_event]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped [%s] but was expecting [%s], but maybe there's other things in queue, or something will arrive\n", openmrcp_event_names[*popped_event], openmrcp_event_names[openmrcp_event]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "calling recursively\n"); + return openmrcp_session_wait_for_event(openmrcp_session, openmrcp_event, timeout); + } + + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "event queue is null\n"); + return MRCP_STATUS_FAILURE; + } + +} + + +static mrcp_status_t openmrcp_session_signal_event(openmrcp_session_t *openmrcp_session, openmrcp_event_t openmrcp_event) +{ + mrcp_status_t status = MRCP_STATUS_SUCCESS; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got event: %s\n", openmrcp_event_names[openmrcp_event]); + + + // allocate memory for event + openmrcp_event_t *event2queue = (openmrcp_event_t *) switch_core_alloc(openmrcp_session->pool, sizeof(openmrcp_event_t)); + *event2queue = openmrcp_event; + + // add it to queue + if (switch_queue_trypush(openmrcp_session->event_queue, (void *) event2queue)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "could not push event to queue\n"); + status = SWITCH_STATUS_GENERR; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "pushed event to queue: %s\n", openmrcp_event_names[*event2queue]); + } + + return status; +} + + +static mrcp_status_t openmrcp_on_session_initiate(mrcp_client_context_t *context, mrcp_session_t *session) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_session_initiate called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_SESSION_INITIATE); +} + +static mrcp_status_t openmrcp_on_session_terminate(mrcp_client_context_t *context, mrcp_session_t *session) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_session_terminate called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_SESSION_TERMINATE); +} + +static mrcp_status_t openmrcp_on_channel_add(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_client_channel_t *channel) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_channel_add called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_CREATE); +} + +static mrcp_status_t openmrcp_on_channel_remove(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_client_channel_t *channel) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_channel_remove called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_DESTROY); +} + +/** this is called by the mrcp core whenever an mrcp message is received from + the other side. */ +static mrcp_status_t openmrcp_on_channel_modify(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_message_t *mrcp_message) +{ + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "openmrcp_on_channel_modify called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "!openmrcp_session\n"); + return MRCP_STATUS_FAILURE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "openmrcp_session: %p\n", openmrcp_session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mrcp msg method name: %s\n", mrcp_message->start_line.method_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mrcp msg body: %s\n", mrcp_message->body); + + if (!strcmp(mrcp_message->start_line.method_name,"RECOGNITION-COMPLETE")) { + openmrcp_session->mrcp_message_last_rcvd = mrcp_message; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_HAS_TEXT\n"); + switch_set_flag_locked(openmrcp_session, FLAG_HAS_TEXT); + } + else if (!strcmp(mrcp_message->start_line.method_name,"START-OF-SPEECH")) { + openmrcp_session->mrcp_message_last_rcvd = mrcp_message; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_BARGE\n"); + switch_set_flag_locked(openmrcp_session, FLAG_BARGE); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ignoring method: %s\n", mrcp_message->start_line.method_name); + } + + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_MODIFY); +} + + + +static apr_status_t set_default_options(openmrcp_client_options_t *options) +{ + mrcp_logger.priority = MRCP_PRIO_INFO; + options->client_ip = globals.client_ip; + options->server_ip = globals.server_ip; + options->client_port = globals.client_port; + options->server_port = globals.server_port; + options->rtp_port_min = globals.rtp_port_min; + options->rtp_port_max = globals.rtp_port_max; + return APR_SUCCESS; +} + + +/** + * Called back by openmcp client thread every time its ready for more audio + * Reads data that was put into a shared fifo queue upon receiving audio frames + * from asr_feed() + */ +static apr_status_t openmrcp_recognizer_read_frame(audio_source_t *source, media_frame_t *frame) +{ + openmrcp_session_t *openmrcp_session = source->object; + frame->type = MEDIA_FRAME_TYPE_NONE; + apr_status_t result; + media_frame_t *queue_frame = NULL; + + + /* pop next media frame data from incoming queue into frame */ + if(openmrcp_session->audio_input_queue) { + if (switch_queue_trypop(openmrcp_session->audio_input_queue, &queue_frame)) { + // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "could not pop from queue\n"); + result = MRCP_STATUS_FAILURE; + } + else { + frame->codec_frame.size = queue_frame->codec_frame.size; + frame->codec_frame.buffer = queue_frame->codec_frame.buffer; + frame->type = MEDIA_FRAME_TYPE_AUDIO; + result = APR_SUCCESS; + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no audio_in queue\n"); + result = MRCP_STATUS_FAILURE; + } + + return result; +} + +/** Read in the grammar and construct an MRCP Recognize message that has + The grammar attached as the payload */ +static mrcp_status_t openmrcp_recog_start(mrcp_client_context_t *context, openmrcp_session_t *openmrcp_session, char *path) +{ + + mrcp_generic_header_t *generic_header; + apr_status_t rv; + apr_file_t *fp; + apr_pool_t *mp; + apr_finfo_t finfo; + char *buf1; + int bytes2read = 0; + + mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, openmrcp_session->client_session, openmrcp_session->channel, RECOGNIZER_RECOGNIZE); + + if(!mrcp_message) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create mrcp msg\n"); + return MRCP_STATUS_FAILURE; + } + + /* open the file with the grammar and read into char* buffer */ + mp = mrcp_message->pool; + if ((rv = apr_file_open(&fp, path, APR_READ, APR_OS_DEFAULT, mp)) != APR_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not read grammar\n"); + return -1; + } + rv = apr_file_info_get(&finfo, APR_FINFO_NORM, fp); + + buf1 = apr_palloc(mp, finfo.size); + bytes2read = finfo.size; + rv = apr_file_read(fp, buf1, &bytes2read); + generic_header = mrcp_generic_header_prepare(mrcp_message); + if(!generic_header) { + return MRCP_STATUS_FAILURE; + } + + generic_header->content_type = mrcp_str_pdup(mrcp_message->pool,"application/srgs+xml"); + mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE); + mrcp_message->body = mrcp_str_pdup(mrcp_message->pool,buf1); + + /* send the MRCP RECOGNIZE message to MRCP server */ + return mrcp_client_context_channel_modify(context, openmrcp_session->client_session, mrcp_message); + +} + + +/** + * Freeswitch calls this from switch_ivr_detect_speech() and then adds a media + * bug to tap into the channel's audio, which will result in all data getting + * passed to asr_feed() and calls to asr_check_results() on each recevied frame. + * + * This code expects certain one-time initialization of the openmrcp client + * engine/systeme to have already taken place.function to open the asr interface + */ +static switch_status_t openmrcp_asr_open(switch_asr_handle_t *ah, char *codec, int rate, char *dest, switch_asr_flag_t *flags) +{ + mrcp_client_t *mrcp_client = openmrcp_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = openmrcp_module.mrcp_client_context ; + openmrcp_client_options_t *options; + openmrcp_session_t *openmrcp_session; + audio_source_t *source; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_open called, codec: %s, rate: %d\n", codec, rate); + + /*! + NOTE: According to the current FS media bugs design, the media bug can only feed audio + data in SLIN (L16) format. So we dont need to worry about other codecs. + + NOTE: forcing MRCP to use 20 as the CODEC_FRAME_TIME_BASE effectively ensures + that it matches with 16-bit audio at 8kz with 320 byte frames. in testing, leaving + CODEC_FRAME_TIME_BASE at 10 and using pop (instead of trypop) in + openmrcp_recognizer_read_frame() actually produces clean audio, however it causes + other problems as the full channel/session cleanup never completes in openmrcp, most + likely due to a thread being blocked on a pop call from audio queue. but with trypop + (to avoid the cleanup problem), it only produces clean audio when CODEC_FRAME_TIME_BASE + is set to 20. + */ + if (strcmp(codec,"L16")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only L16 codec supported\n"); + return SWITCH_STATUS_GENERR; + } + if (rate != 8000) { + // TODO: look into supporting other sample rates + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only 8kz supported\n"); + return SWITCH_STATUS_GENERR; + } + if (CODEC_FRAME_TIME_BASE != 20) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must recompile openmrcp with #define CODEC_FRAME_TIME_BASE 20\n"); + return SWITCH_STATUS_GENERR; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CODEC_FRAME_TIME_BASE: %d\n", CODEC_FRAME_TIME_BASE); + } + + /* create session */ + openmrcp_session = openmrcp_session_create(); + if (!openmrcp_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_session creation FAILED\n"); + return SWITCH_STATUS_GENERR; + } + openmrcp_session->client_session = mrcp_client_context_session_create(mrcp_client_context,openmrcp_session); + if (!openmrcp_session->client_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_session creation FAILED\n"); + return SWITCH_STATUS_GENERR; + } + + /* create audio source */ + source = mrcp_palloc(openmrcp_session->pool,sizeof(audio_source_t)); + source->method_set = &audio_source_method_set; + source->object = openmrcp_session; + openmrcp_session->source = source; + + /** + * create a new fifo queue. incoming audio received from freeswitch + * will be put into this queue, and it will be later pulled out by + * the openmrcp client thread. + */ + if (switch_queue_create(&openmrcp_session->audio_input_queue, 10000, openmrcp_session->pool)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "audio queue creation failed\n"); + return SWITCH_STATUS_MEMERR; + } + + openmrcp_session->flags = *flags; + switch_mutex_init(&openmrcp_session->flag_mutex, SWITCH_MUTEX_NESTED, openmrcp_session->pool); + + ah->private_info = openmrcp_session; + + return SWITCH_STATUS_SUCCESS; + +} + +/* function to load a grammar to the asr interface */ +static switch_status_t openmrcp_asr_load_grammar(switch_asr_handle_t *ah, char *grammar, char *path) +{ + /** Read grammar from path and create and send and MRCP RECOGNIZE msg + that has the grammar attached to body. + + TODO: - how does DEFINE-GRAMMAR fit into the picture here? (if at all) + */ + + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + mrcp_client_t *mrcp_client = openmrcp_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = openmrcp_module.mrcp_client_context; + audio_source_t *source = openmrcp_session->source; + + /* create recognizer channel, also starts outgoing rtp media */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading grammar\n"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Create Recognizer Channel\n"); + openmrcp_session->channel = mrcp_client_recognizer_channel_create(mrcp_client_context, openmrcp_session->client_session, source); + + if (!openmrcp_session->channel) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create recognizer channel\n"); + return SWITCH_STATUS_FALSE; + } + + /* wait for recognizer channel creation */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "WAITING FOR CHAN CREATE\n"); + if(openmrcp_session_wait_for_event(openmrcp_session, OPENMRCP_EVENT_CHANNEL_CREATE, OPENMRCP_WAIT_TIMEOUT) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got channel creation event\n"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "WAITING FOR NONE\n"); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_NONE,200) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "GOT NONE EVENT\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "NEVER GOT NONE EVENT\n"); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Start Recognizer\n"); + openmrcp_recog_start(mrcp_client_context, openmrcp_session, path); + + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "never got channel creation event\n"); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Finished loading grammar\n"); + return SWITCH_STATUS_SUCCESS; +} + + +/*! function to feed audio to the ASR*/ +static switch_status_t openmrcp_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) +{ + + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + mrcp_client_t *mrcp_client = openmrcp_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = openmrcp_module.mrcp_client_context; + media_frame_t *media_frame; + switch_byte_t *buffer; + + /* create new media frame */ + media_frame = (media_frame_t *) switch_core_alloc(openmrcp_session->pool, sizeof(media_frame_t)); + if (!media_frame) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "media_frame creation failed\n"); + return SWITCH_STATUS_MEMERR; + } + + /** + * since *data buffer might get freed by caller (true or false?), allocate a + * new buffer and copy *data into it. + * + * MAJOR DESIGN ISSUE!! It is way too expensive to be calling malloc on every audio frame, + * this needs to send the packet directly. OpenMrcp will need a way to disable their own + * timer so that the fs timer is the only one driving the media. + **/ + buffer = (switch_byte_t *) switch_core_alloc(openmrcp_session->pool, sizeof(switch_byte_t)*len); + if (!buffer) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate buffer\n"); + return SWITCH_STATUS_MEMERR; + } + buffer = memcpy(buffer, data, len); + + media_frame->codec_frame.buffer = buffer; + media_frame->codec_frame.size = len; + media_frame->type = MEDIA_FRAME_TYPE_AUDIO; + + /* push audio to queue */ + if (switch_queue_trypush(openmrcp_session->audio_input_queue, (void *) media_frame)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "could not push audio to queue\n"); + return SWITCH_STATUS_GENERR; + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t openmrcp_asr_pause(switch_asr_handle_t *ah) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_asr_pause called\n"); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t openmrcp_asr_resume(switch_asr_handle_t *ah) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "openmrcp_asr_resume called\n"); + + return SWITCH_STATUS_SUCCESS; +} + + +/*! function to unload a grammar to the asr interface */ +static switch_status_t openmrcp_asr_unload_grammar(switch_asr_handle_t *ah, char *grammar) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + return SWITCH_STATUS_SUCCESS; +} + +/** + * Freeswitch calls this whenever the channel is hungup or the + * speech detection is stopped via a call to switch_ivr_stop_detect_speech() + */ +static switch_status_t openmrcp_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_asr_close()\n"); + + mrcp_client_t *mrcp_client = openmrcp_module.mrcp_client; + mrcp_client_context_t *context = openmrcp_module.mrcp_client_context; + + // TODO!! should we do a switch_pool_clear(switch_memory_pool_t *p) on the pool held + // by openmrcp_session? + + // destroy channel + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to DESTROY CHANNEL\n"); + mrcp_client_context_channel_destroy(context, openmrcp_session->client_session, 1); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_DESTROY,10000) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPENMRCP_EVENT_CHANNEL_DESTROY received\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "timed out waiting for OPENMRCP_EVENT_CHANNEL_DESTROY\n"); + } + + // terminate client session + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); + mrcp_client_context_session_terminate(context, openmrcp_session->client_session); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_SESSION_TERMINATE,10000) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPENMRCP_EVENT_SESSION_TERMINATE recevied\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "timed out waiting for OPENMRCP_EVENT_SESSION_TERMINATE\n"); + } + + // destroy client session (NOTE: this sends a BYE to the other side) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to DESTROY SESSION\n"); + mrcp_client_context_session_destroy(context, openmrcp_session->client_session); + + // destroys the openmrcp_session struct + openmrcp_session_destroy(openmrcp_session); + + switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); + + return SWITCH_STATUS_SUCCESS; +} + + +/** + * Freeswitch calls this method from the speech_thread() thread body method + * in switch_ivr_async.c every time a new frame is received by the media bug + * attached to the audio channel. If this method returns SWITCH_STATUS_SUCCESS, + * then Freeswitch will call openmrcp_asr_get_results() to get the result value. + */ +static switch_status_t openmrcp_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + switch_status_t rv = (switch_test_flag(openmrcp_session, FLAG_HAS_TEXT) || switch_test_flag(openmrcp_session, FLAG_BARGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + + return rv; +} + +/*! This will be called after asr_check_results returns SUCCESS */ +static switch_status_t openmrcp_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_asr_get_results called\n"); + switch_status_t ret = SWITCH_STATUS_SUCCESS; + + if (switch_test_flag(openmrcp_session, FLAG_BARGE)) { + switch_clear_flag_locked(openmrcp_session, FLAG_BARGE); + ret = SWITCH_STATUS_BREAK; + } + + if (switch_test_flag(openmrcp_session, FLAG_HAS_TEXT)) { + /*! + we have to extract the XML but stripping off the <?xml version="1.0"?> + header. the body looks like: + + Completion-Cause:001 no-match + Content-Type: application/nlsml+xml + Content-Length: 260 + + <?xml version="1.0"?> + <result xmlns="http://www.ietf.org/xml/ns/mrcpv2" xmlns:ex="http://www.example.com/example" score="100" grammar="session:request1@form-level.store"> + <interpretation> + <input mode="speech">open a</input> + </interpretation> + </result> + */ + + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(openmrcp_session->mrcp_message_last_rcvd->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", openmrcp_session->mrcp_message_last_rcvd->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } + + // since we are returning our result here, future calls to check_results + // should return False + switch_clear_flag_locked(openmrcp_session, FLAG_HAS_TEXT); + ret = SWITCH_STATUS_SUCCESS; + } + return ret; +} + +static switch_asr_interface_t openmrcp_asr_interface = { + /*.interface_name*/ "openmrcp", + /*.asr_open*/ openmrcp_asr_open, + /*.asr_load_grammar*/ openmrcp_asr_load_grammar, + /*.asr_unload_grammar*/ openmrcp_asr_unload_grammar, + /*.asr_close*/ openmrcp_asr_close, + /*.asr_feed*/ openmrcp_asr_feed, + /*.asr_resume*/ openmrcp_asr_resume, + /*.asr_pause*/ openmrcp_asr_pause, + /*.asr_check_results*/ openmrcp_asr_check_results, + /*.asr_get_results*/ openmrcp_asr_get_results +}; + +static switch_loadable_module_interface_t openmrcp_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ NULL, + /*.say_interface */ NULL, + /*.asr_interface */ &openmrcp_asr_interface +}; + + +static switch_status_t do_config(void) +{ + char *cf = "mod_openmrcp.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + memset(&globals,0,sizeof(globals)); + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "client_ip")) { + globals.client_ip = val; + } else if (!strcasecmp(var, "server_ip")) { + globals.server_ip = val; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "globals.server_ip: %s\n", globals.server_ip); + } else if (!strcasecmp(var, "client_port")) { + globals.client_port = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "server_port")) { + globals.server_port = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "rtp_port_min")) { + globals.rtp_port_min = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "rtp_port_max")) { + globals.rtp_port_max = (uint32_t) atoi(val); + } + + } + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t mrcp_init() +{ + /*! + Perform one-time initialization of client library + */ + + mrcp_mem_pool_t *pool; + mrcp_client_event_handler_t *client_event_handler; + mrcp_client_t *mrcp_client; + mrcp_client_context_t *mrcp_client_context; + openmrcp_client_options_t *options; + + pool = mrcp_global_pool_get(); + options = mrcp_palloc(pool,sizeof(openmrcp_client_options_t)); + client_event_handler = mrcp_palloc(pool,sizeof(mrcp_client_event_handler_t)); + set_default_options(options); + + client_event_handler->on_session_initiate = openmrcp_on_session_initiate; + client_event_handler->on_session_terminate = openmrcp_on_session_terminate; + client_event_handler->on_channel_add = openmrcp_on_channel_add; + client_event_handler->on_channel_remove = openmrcp_on_channel_remove; + client_event_handler->on_channel_modify = openmrcp_on_channel_modify; + + // create client context, which to must be passed to client engine + mrcp_client_context = mrcp_client_context_create(&openmrcp_module,client_event_handler); + if(!mrcp_client_context) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mrcp_client_context creation failed\n"); + return SWITCH_STATUS_GENERR; + } + openmrcp_module.mrcp_client_context = mrcp_client_context; + + // this basically starts a thread that pulls events from the event queue + // and handles them + mrcp_client = openmrcp_client_start(options,mrcp_client_context); + if(!mrcp_client) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_client_start FAILED\n"); + mrcp_client_context_destroy(mrcp_client_context); + return SWITCH_STATUS_GENERR; + } + + openmrcp_module.mrcp_client = mrcp_client; + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_openmrcp_load) +{ + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &openmrcp_module_interface; + + /* read config */ + do_config(); + + /* initialize openmrcp */ + mrcp_global_init(); + mrcp_init(); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown) +{ + return SWITCH_STATUS_UNLOAD; +} Modified: freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri Aug 10 15:30:18 2007 @@ -72,6 +72,7 @@ xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; struct curl_slist *slist = NULL; + long httpRes; if (!binding) { return NULL; @@ -126,6 +127,7 @@ } curl_easy_perform(curl_handle); + curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); curl_easy_cleanup(curl_handle); close(config_data.fd); } else { @@ -134,8 +136,14 @@ switch_safe_free(data); - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + if(httpRes==200) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got 200 response, calling switch_xml_parse_file: %s!\n", filename); + if (!(xml = switch_xml_parse_file(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\n",httpRes,key_value); + xml=NULL; } unlink(filename);

1 0

[commit] r5584 - freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec
by Freeswitch SVN 10 Aug '07

10 Aug '07

Author: greenlizard Date: Fri Aug 10 14:24:42 2007 New Revision: 5584 Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c Log: Use configuration file instead of hardcoding parameters Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile ============================================================================== --- freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile (original) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile Fri Aug 10 14:24:42 2007 @@ -3,12 +3,18 @@ # and define these variables to impact your build +# TO GET THIS TO COMPILE +# hack ../../../../build/modmake.rules and remove the +# -Werror from the ALL_CFLAGS variable. + # TODO -# - needs to compile/link against the freeswitch sofia libs -# - tie up these includes somehow so there isn't so many -# - ditto for the .a library files +# - fix all the code that is causing warnings (We are currently working with Joe Stenbrenner from Division Management to have this task outsourced to Bangalore) +# - re-enable the -Werror flag (see above) +# - needs to compile/link against the _freeswitch_ sofia libs (see FIXME) +# - is there an openmrcp dir in the fs tree yet? (see FIXME) -OPENMRCP_DIR=/usr/src/openmrcp_stable # FIXME!!! +# FIXME!!! +OPENMRCP_DIR=/usr/src/openmrcp_stable OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ Modified: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c (original) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c Fri Aug 10 14:24:42 2007 @@ -67,6 +67,16 @@ SWITCH_MODULE_DEFINITION(mod_mrcprec, mod_mrcprec_load, mod_mrcprec_shutdown, NULL); +static struct { + char *client_ip; + char *server_ip; + uint32_t client_port; + uint32_t server_port; + uint32_t rtp_port_min; + uint32_t rtp_port_max; +} globals; + + typedef enum { OPENMRCP_EVENT_NONE, OPENMRCP_EVENT_SESSION_INITIATE, @@ -194,24 +204,18 @@ openmrcp_event_t *popped_event = NULL; size_t sleep_ms = 100; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_session_wait_for_event()\n"); if(openmrcp_session->event_queue) { if (switch_queue_trypop(openmrcp_session->event_queue, &popped_event)) { - // most likely this failed because queue is empty. how about we sleep for - // timeout seconds and try again? - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "did not pop anything from event queue\n"); - + // most likely this failed because queue is empty. sleep for timeout seconds and try again? if (timeout > 0) { - if (timeout < sleep_ms) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sleeping %d millieconds\n", timeout); - switch_sleep(timeout * 1000); // convert milliseconds -> microseconds + switch_sleep(timeout * 1000); // ms->us timeout = 0; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sleeping %d millieconds\n", sleep_ms); - switch_sleep(sleep_ms * 1000); // convert milliseconds -> microseconds + switch_sleep(sleep_ms * 1000); // ms->us timeout -= sleep_ms; } @@ -355,39 +359,20 @@ } -/* this needs to be moved to a config file */ + static apr_status_t set_default_options(openmrcp_client_options_t *options) { - options->client_ip = NULL; - options->client_port = 0; - options->server_ip = NULL; - options->server_port = 0; - options->rtp_port_min = 0; - options->rtp_port_max = 0; mrcp_logger.priority = MRCP_PRIO_INFO; - - if(options->client_ip == NULL) { - options->client_ip = "127.0.0.1"; - } - if(options->client_port == 0) { - options->client_port = 8062; - } - if(options->server_ip == NULL) { - options->server_ip = "127.0.0.1"; - } - if(options->server_port == 0) { - options->server_port = 8060; - } - if(options->rtp_port_min == 0) { - options->rtp_port_min = 4000; - } - if(options->rtp_port_max == 0) { - options->rtp_port_max = 6000; - } - + options->client_ip = globals.client_ip; + options->server_ip = globals.server_ip; + options->client_port = globals.client_port; + options->server_port = globals.server_port; + options->rtp_port_min = globals.rtp_port_min; + options->rtp_port_max = globals.rtp_port_max; return APR_SUCCESS; } + /** * Called back by openmcp client thread every time its ready for more audio * Reads data that was put into a shared fifo queue upon receiving audio frames @@ -487,22 +472,24 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_open called, codec: %s, rate: %d\n", codec, rate); /*! - sanity checking regarding codec/rate - NOTE: some of the other codecs and rates might - actually work, but since they have not been tested yet, they are currently not - allowed. forcing MRCP to use 20 as the CODEC_FRAME_TIME_BASE effectively ensures + NOTE: According to the current FS media bugs design, the media bug can only feed audio + data in SLIN (L16) format. So we dont need to worry about other codecs. + + NOTE: forcing MRCP to use 20 as the CODEC_FRAME_TIME_BASE effectively ensures that it matches with 16-bit audio at 8kz with 320 byte frames. in testing, leaving CODEC_FRAME_TIME_BASE at 10 and using pop (instead of trypop) in openmrcp_recognizer_read_frame() actually produces clean audio, however it causes other problems as the full channel/session cleanup never completes in openmrcp, most likely due to a thread being blocked on a pop call from audio queue. but with trypop (to avoid the cleanup problem), it only produces clean audio when CODEC_FRAME_TIME_BASE - is set to 20. + is set to 20. */ if (strcmp(codec,"L16")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only L16 codec supported\n"); return SWITCH_STATUS_GENERR; } if (rate != 8000) { + // TODO: look into supporting other sample rates switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only 8kz supported\n"); return SWITCH_STATUS_GENERR; } @@ -619,8 +606,14 @@ return SWITCH_STATUS_MEMERR; } - /** since *data buffer might get freed by caller (true or false?), allocate a - new buffer and copy *data into it **/ + /** + * since *data buffer might get freed by caller (true or false?), allocate a + * new buffer and copy *data into it. + * + * MAJOR DESIGN ISSUE!! It is way too expensive to be calling malloc on every audio frame, + * this needs to send the packet directly. OpenMrcp will need a way to disable their own + * timer so that the fs timer is the only one driving the media. + **/ buffer = (switch_byte_t *) switch_core_alloc(openmrcp_session->pool, sizeof(switch_byte_t)*len); if (!buffer) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate buffer\n"); @@ -810,6 +803,45 @@ }; +static switch_status_t do_config(void) +{ + char *cf = "mod_openmrcp.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + memset(&globals,0,sizeof(globals)); + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "client_ip")) { + globals.client_ip = val; + } else if (!strcasecmp(var, "server_ip")) { + globals.server_ip = val; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "globals.server_ip: %s\n", globals.server_ip); + } else if (!strcasecmp(var, "client_port")) { + globals.client_port = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "server_port")) { + globals.server_port = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "rtp_port_min")) { + globals.rtp_port_min = (uint32_t) atoi(val); + } else if (!strcasecmp(var, "rtp_port_max")) { + globals.rtp_port_max = (uint32_t) atoi(val); + } + + } + } + + return SWITCH_STATUS_SUCCESS; +} + + static switch_status_t mrcp_init() { /*! @@ -860,6 +892,9 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = &mrcprec_module_interface; + + /* read config */ + do_config(); /* initialize openmrcp */ mrcp_global_init();

1 0

[commit] r5583 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db
by Freeswitch SVN 10 Aug '07

10 Aug '07

Author: anthm Date: Fri Aug 10 10:27:25 2007 New Revision: 5583 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Log: add close method needs testing Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Fri Aug 10 10:27:25 2007 @@ -73,17 +73,33 @@ return JS_FALSE; } -static void db_destroy(JSContext * cx, JSObject * obj) +static JSBool db_close(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct db_obj *dbo = JS_GetPrivate(cx, obj); - + if (dbo) { - switch_memory_pool_t *pool = dbo->pool; if (dbo->stmt) { switch_core_db_finalize(dbo->stmt); dbo->stmt = NULL; } - switch_core_db_close(dbo->db); + if (dbo->db) { + switch_core_db_close(dbo->db); + dbo->db = NULL; + } + } + + return JS_TRUE; +} + +static void db_destroy(JSContext *cx, JSObject *obj) +{ + struct db_obj *dbo = JS_GetPrivate(cx, obj); + + if (dbo) { + switch_memory_pool_t *pool = dbo->pool; + jsval rval = JS_TRUE; + + db_close(cx, obj, 0, NULL, &rval); switch_core_destroy_memory_pool(&pool); pool = NULL; } @@ -119,6 +135,10 @@ struct db_obj *dbo = JS_GetPrivate(cx, obj); *rval = INT_TO_JSVAL(0); + if (!dbo->db) { + return JS_FALSE; + } + if (argc > 0) { char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *err = NULL; @@ -153,6 +173,10 @@ struct db_obj *dbo = JS_GetPrivate(cx, obj); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + if (!dbo->db) { + return JS_FALSE; + } + if (dbo->stmt) { int running = 1; while (running < 5000) { @@ -180,6 +204,10 @@ char code[1024]; int x; + if (!dbo->db) { + return JS_FALSE; + } + snprintf(code, sizeof(code), "~var _dB_RoW_DaTa_ = {}"); eval_some_js(code, dbo->cx, dbo->obj, rval); if (*rval == JS_FALSE) { @@ -207,6 +235,10 @@ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + if (!dbo->db) { + return JS_FALSE; + } + if (dbo->stmt) { switch_core_db_finalize(dbo->stmt); dbo->stmt = NULL; @@ -229,6 +261,7 @@ static JSFunctionSpec db_methods[] = { {"exec", db_exec, 1}, + {"close", db_close, 0}, {"next", db_next, 0}, {"fetch", db_fetch, 1}, {"prepare", db_prepare, 0},

1 0

[commit] r5582 - freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec
by Freeswitch SVN 09 Aug '07

09 Aug '07

Author: greenlizard Date: Thu Aug 9 17:24:12 2007 New Revision: 5582 Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c Log: rough (but working) version of a module which connects to a speech recognition server via openmrcp client lib Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/Makefile Thu Aug 9 17:24:12 2007 @@ -0,0 +1,27 @@ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to impact your build + +# TODO +# - needs to compile/link against the freeswitch sofia libs +# - tie up these includes somehow so there isn't so many +# - ditto for the .a library files + +OPENMRCP_DIR=/usr/src/openmrcp_stable # FIXME!!! + +OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ + +OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcplivemedia/.libs/libmrcplivemedia.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a + +MRCP_APR_INCLUDES = -I../../../../libs/apr/include +MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include +MRCP_SOFIA_INCLUDES = -I/usr/local/include/sofia-sip-1.12 # FIXME!! + +LOCAL_CFLAGS= -Wno-unused +LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) $(MRCP_SOFIA_INCLUDES) + +LOCAL_LDFLAGS=$(OPENMRCP_LIBS) +VERBOSE=TRUE +include ../../../../build/modmake.rules + Added: freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c ============================================================================== --- (empty file) +++ freeswitch/branches/greenlizard/src/mod/asr_tts/mod_mrcprec/mod_mrcprec.c Thu Aug 9 17:24:12 2007 @@ -0,0 +1,875 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Traun Leyden <tleyden(a)branchcut.com> + * + * Module which acts as an MRCP client to an MRCP speech recognition + * server. In other words it bridges freeswitch to an external speech + * recognition system. + * + * Uses OpenMrcp (http://wiki.freeswitch.org/wiki/OpenMRCP) as the + * the client library. + * + */ +#ifdef __ICC +#pragma warning (disable:188) +#endif + + +#include "openmrcp_client.h" +#include "mrcp_client_context.h" +#include "mrcp_recognizer.h" +#include "mrcp_generic_header.h" +#include "rtp_session.h" +#include "mrcp_client.h" +#include "mrcp_client_context.h" +#include "mrcp_client_defs.h" +#include "mrcp_client_session.h" +#include "mrcp_client_resource.h" +#include "mrcp_client_signaling_agent.h" +#include "mrcp_media_agent.h" +#include "mrcp_resource.h" +#include "mrcp_consumer_task.h" +#include <apr_general.h> +#include <apr_file_io.h> +#include <apr_thread_proc.h> +#include <apr_thread_cond.h> +#include <apr_strings.h> + +#include <switch.h> + +#define OPENMRCP_WAIT_TIMEOUT 5000 + +SWITCH_MODULE_LOAD_FUNCTION(mod_mrcprec_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mrcprec_shutdown); +SWITCH_MODULE_DEFINITION(mod_mrcprec, mod_mrcprec_load, + mod_mrcprec_shutdown, NULL); + +typedef enum { + OPENMRCP_EVENT_NONE, + OPENMRCP_EVENT_SESSION_INITIATE, + OPENMRCP_EVENT_SESSION_TERMINATE, + OPENMRCP_EVENT_CHANNEL_CREATE, + OPENMRCP_EVENT_CHANNEL_DESTROY, + OPENMRCP_EVENT_CHANNEL_MODIFY +} openmrcp_event_t; + +static const char *openmrcp_event_names[] = { + "NONE", + "SESSION_INITIATE", + "SESSION_TERMINATE", + "CHANNEL_CREATE", + "CHANNEL_DESTROY", + "CHANNEL_MODIFY", +}; + +// TODO: rename this to mrcprec_session_t +typedef struct openmrcp_session_t openmrcp_session_t; +struct openmrcp_session_t { + mrcp_session_t *client_session; + mrcp_client_channel_t *channel; + switch_queue_t *audio_input_queue; + switch_queue_t *event_queue; + mrcp_message_t *mrcp_message_last_rcvd; + audio_source_t *source; + apr_pool_t *pool; + apr_thread_cond_t *wait_object; + apr_thread_mutex_t *wait_object_mutex; + openmrcp_event_t wait_event; + uint32_t flags; + switch_mutex_t *flag_mutex; +}; + +static apr_status_t openmrcp_recognizer_read_frame(audio_source_t *source, media_frame_t *frame); + +static const audio_source_method_set_t audio_source_method_set = { + NULL, + NULL, + NULL, + openmrcp_recognizer_read_frame +}; + +typedef enum { + FLAG_HAS_TEXT = (1 << 0), + FLAG_BARGE = (1 << 1), + FLAG_READY = (1 << 2) +} mrcp_flag_t; + +typedef struct { + mrcp_client_t *mrcp_client; + mrcp_client_context_t *mrcp_client_context; +} mrcprec_module_t; + +static mrcprec_module_t mrcprec_module; + +static void log_callback(const char* message, void* userdata) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", message); +} + +static const char *state_names[] = { + "NOT_READY", + "READY", + "BARGE_IN", + "END_SPEECH", + "STOPPED", + "BARGE_IN_TIMEOUT", + "END_SPEECH_TIMEOUT", + "BEEP" +}; + +static openmrcp_session_t* openmrcp_session_create() +{ + openmrcp_session_t *openmrcp_session; + apr_pool_t *session_pool; + + if(apr_pool_create(&session_pool,NULL) != APR_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create session_pool\n"); + return NULL; + } + + openmrcp_session = apr_palloc(session_pool,sizeof(openmrcp_session_t)); + openmrcp_session->pool = session_pool; + openmrcp_session->client_session = NULL; + openmrcp_session->channel = NULL; + openmrcp_session->audio_input_queue = NULL; + openmrcp_session->event_queue = NULL; + openmrcp_session->wait_event = OPENMRCP_EVENT_NONE; + + apr_thread_mutex_create(&openmrcp_session->wait_object_mutex, APR_THREAD_MUTEX_UNNESTED, openmrcp_session->pool); + + apr_thread_cond_create(&openmrcp_session->wait_object, openmrcp_session->pool); + + + /* create an event queue */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "creating event queue\n"); + if (switch_queue_create(&openmrcp_session->event_queue, 1000, openmrcp_session->pool)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "event queue creation failed\n"); + } + + return openmrcp_session; +} + +static mrcp_status_t openmrcp_session_destroy(openmrcp_session_t *openmrcp_session) +{ + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + + if(openmrcp_session->pool) { + apr_thread_cond_destroy(openmrcp_session->wait_object); + apr_thread_mutex_destroy(openmrcp_session->wait_object_mutex); + apr_pool_destroy(openmrcp_session->pool); + openmrcp_session->pool = NULL; + } + return MRCP_STATUS_SUCCESS; +} + + +static mrcp_status_t openmrcp_session_wait_for_event(openmrcp_session_t *openmrcp_session, openmrcp_event_t openmrcp_event, size_t timeout) +{ + mrcp_status_t status = MRCP_STATUS_SUCCESS; + openmrcp_event_t *popped_event = NULL; + size_t sleep_ms = 100; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_session_wait_for_event()\n"); + + if(openmrcp_session->event_queue) { + if (switch_queue_trypop(openmrcp_session->event_queue, &popped_event)) { + // most likely this failed because queue is empty. how about we sleep for + // timeout seconds and try again? + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "did not pop anything from event queue\n"); + + if (timeout > 0) { + + if (timeout < sleep_ms) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sleeping %d millieconds\n", timeout); + switch_sleep(timeout * 1000); // convert milliseconds -> microseconds + timeout = 0; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "sleeping %d millieconds\n", sleep_ms); + switch_sleep(sleep_ms * 1000); // convert milliseconds -> microseconds + timeout -= sleep_ms; + } + + // call recursively + // TODO: This is going to end up in a lot of recursion and + // maybe blow the stack .. rethink this approach + return openmrcp_session_wait_for_event(openmrcp_session, openmrcp_event, timeout); + + } + else { + // nothing in queue, no timeout left, return failure + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "nothing in queue, no timeout left, return failure\n"); + return MRCP_STATUS_FAILURE; + } + + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped event\n"); + // check if popped event matches the event we are looking for + if (*popped_event == openmrcp_event) { + // just what we were waiting for! + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "just what we were waiting for! rturn success\n"); + return MRCP_STATUS_SUCCESS; + } + else { + // nothing popped, but maybe there's other things in queue, or something will arrive + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped unexpected\n"); + if (!popped_event) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped NULL!!\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped: %d\n", *popped_event); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped name: %s\n", openmrcp_event_names[*popped_event]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "popped [%s] but was expecting [%s], but maybe there's other things in queue, or something will arrive\n", openmrcp_event_names[*popped_event], openmrcp_event_names[openmrcp_event]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "calling recursively\n"); + return openmrcp_session_wait_for_event(openmrcp_session, openmrcp_event, timeout); + } + + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "event queue is null\n"); + return MRCP_STATUS_FAILURE; + } + +} + + +static mrcp_status_t openmrcp_session_signal_event(openmrcp_session_t *openmrcp_session, openmrcp_event_t openmrcp_event) +{ + mrcp_status_t status = MRCP_STATUS_SUCCESS; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got event: %s\n", openmrcp_event_names[openmrcp_event]); + + + // allocate memory for event + openmrcp_event_t *event2queue = (openmrcp_event_t *) switch_core_alloc(openmrcp_session->pool, sizeof(openmrcp_event_t)); + *event2queue = openmrcp_event; + + // add it to queue + if (switch_queue_trypush(openmrcp_session->event_queue, (void *) event2queue)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "could not push event to queue\n"); + status = SWITCH_STATUS_GENERR; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "pushed event to queue: %s\n", openmrcp_event_names[*event2queue]); + } + + return status; +} + + +static mrcp_status_t openmrcp_on_session_initiate(mrcp_client_context_t *context, mrcp_session_t *session) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_session_initiate called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_SESSION_INITIATE); +} + +static mrcp_status_t openmrcp_on_session_terminate(mrcp_client_context_t *context, mrcp_session_t *session) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_session_terminate called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_SESSION_TERMINATE); +} + +static mrcp_status_t openmrcp_on_channel_add(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_client_channel_t *channel) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_channel_add called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_CREATE); +} + +static mrcp_status_t openmrcp_on_channel_remove(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_client_channel_t *channel) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_on_channel_remove called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + return MRCP_STATUS_FAILURE; + } + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_DESTROY); +} + +/** this is called by the mrcp core whenever an mrcp message is received from + the other side. */ +static mrcp_status_t openmrcp_on_channel_modify(mrcp_client_context_t *context, mrcp_session_t *session, mrcp_message_t *mrcp_message) +{ + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "openmrcp_on_channel_modify called\n"); + openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); + if(!openmrcp_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "!openmrcp_session\n"); + return MRCP_STATUS_FAILURE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "openmrcp_session: %p\n", openmrcp_session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mrcp msg method name: %s\n", mrcp_message->start_line.method_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mrcp msg body: %s\n", mrcp_message->body); + + if (!strcmp(mrcp_message->start_line.method_name,"RECOGNITION-COMPLETE")) { + openmrcp_session->mrcp_message_last_rcvd = mrcp_message; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_HAS_TEXT\n"); + switch_set_flag_locked(openmrcp_session, FLAG_HAS_TEXT); + } + else if (!strcmp(mrcp_message->start_line.method_name,"START-OF-SPEECH")) { + openmrcp_session->mrcp_message_last_rcvd = mrcp_message; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_BARGE\n"); + switch_set_flag_locked(openmrcp_session, FLAG_BARGE); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ignoring method: %s\n", mrcp_message->start_line.method_name); + } + + return openmrcp_session_signal_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_MODIFY); +} + + +/* this needs to be moved to a config file */ +static apr_status_t set_default_options(openmrcp_client_options_t *options) +{ + options->client_ip = NULL; + options->client_port = 0; + options->server_ip = NULL; + options->server_port = 0; + options->rtp_port_min = 0; + options->rtp_port_max = 0; + mrcp_logger.priority = MRCP_PRIO_INFO; + + if(options->client_ip == NULL) { + options->client_ip = "127.0.0.1"; + } + if(options->client_port == 0) { + options->client_port = 8062; + } + if(options->server_ip == NULL) { + options->server_ip = "127.0.0.1"; + } + if(options->server_port == 0) { + options->server_port = 8060; + } + if(options->rtp_port_min == 0) { + options->rtp_port_min = 4000; + } + if(options->rtp_port_max == 0) { + options->rtp_port_max = 6000; + } + + return APR_SUCCESS; +} + +/** + * Called back by openmcp client thread every time its ready for more audio + * Reads data that was put into a shared fifo queue upon receiving audio frames + * from asr_feed() + */ +static apr_status_t openmrcp_recognizer_read_frame(audio_source_t *source, media_frame_t *frame) +{ + openmrcp_session_t *openmrcp_session = source->object; + frame->type = MEDIA_FRAME_TYPE_NONE; + apr_status_t result; + media_frame_t *queue_frame = NULL; + + + /* pop next media frame data from incoming queue into frame */ + if(openmrcp_session->audio_input_queue) { + if (switch_queue_trypop(openmrcp_session->audio_input_queue, &queue_frame)) { + // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "could not pop from queue\n"); + result = MRCP_STATUS_FAILURE; + } + else { + frame->codec_frame.size = queue_frame->codec_frame.size; + frame->codec_frame.buffer = queue_frame->codec_frame.buffer; + frame->type = MEDIA_FRAME_TYPE_AUDIO; + result = APR_SUCCESS; + } + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no audio_in queue\n"); + result = MRCP_STATUS_FAILURE; + } + + return result; +} + +/** Read in the grammar and construct an MRCP Recognize message that has + The grammar attached as the payload */ +static mrcp_status_t openmrcp_recog_start(mrcp_client_context_t *context, openmrcp_session_t *openmrcp_session, char *path) +{ + + mrcp_generic_header_t *generic_header; + apr_status_t rv; + apr_file_t *fp; + apr_pool_t *mp; + apr_finfo_t finfo; + char *buf1; + int bytes2read = 0; + + mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, openmrcp_session->client_session, openmrcp_session->channel, RECOGNIZER_RECOGNIZE); + + if(!mrcp_message) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create mrcp msg\n"); + return MRCP_STATUS_FAILURE; + } + + /* open the file with the grammar and read into char* buffer */ + mp = mrcp_message->pool; + if ((rv = apr_file_open(&fp, path, APR_READ, APR_OS_DEFAULT, mp)) != APR_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not read grammar\n"); + return -1; + } + rv = apr_file_info_get(&finfo, APR_FINFO_NORM, fp); + + buf1 = apr_palloc(mp, finfo.size); + bytes2read = finfo.size; + rv = apr_file_read(fp, buf1, &bytes2read); + generic_header = mrcp_generic_header_prepare(mrcp_message); + if(!generic_header) { + return MRCP_STATUS_FAILURE; + } + + generic_header->content_type = mrcp_str_pdup(mrcp_message->pool,"application/srgs+xml"); + mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE); + mrcp_message->body = mrcp_str_pdup(mrcp_message->pool,buf1); + + /* send the MRCP RECOGNIZE message to MRCP server */ + return mrcp_client_context_channel_modify(context, openmrcp_session->client_session, mrcp_message); + +} + + +/** + * Freeswitch calls this from switch_ivr_detect_speech() and then adds a media + * bug to tap into the channel's audio, which will result in all data getting + * passed to asr_feed() and calls to asr_check_results() on each recevied frame. + * + * This code expects certain one-time initialization of the openmrcp client + * engine/systeme to have already taken place.function to open the asr interface + */ +static switch_status_t mrcprec_asr_open(switch_asr_handle_t *ah, char *codec, int rate, char *dest, switch_asr_flag_t *flags) +{ + mrcp_client_t *mrcp_client = mrcprec_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = mrcprec_module.mrcp_client_context ; + openmrcp_client_options_t *options; + openmrcp_session_t *openmrcp_session; + audio_source_t *source; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_open called, codec: %s, rate: %d\n", codec, rate); + + /*! + sanity checking regarding codec/rate - NOTE: some of the other codecs and rates might + actually work, but since they have not been tested yet, they are currently not + allowed. forcing MRCP to use 20 as the CODEC_FRAME_TIME_BASE effectively ensures + that it matches with 16-bit audio at 8kz with 320 byte frames. in testing, leaving + CODEC_FRAME_TIME_BASE at 10 and using pop (instead of trypop) in + openmrcp_recognizer_read_frame() actually produces clean audio, however it causes + other problems as the full channel/session cleanup never completes in openmrcp, most + likely due to a thread being blocked on a pop call from audio queue. but with trypop + (to avoid the cleanup problem), it only produces clean audio when CODEC_FRAME_TIME_BASE + is set to 20. + */ + if (strcmp(codec,"L16")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only L16 codec supported\n"); + return SWITCH_STATUS_GENERR; + } + if (rate != 8000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only 8kz supported\n"); + return SWITCH_STATUS_GENERR; + } + if (CODEC_FRAME_TIME_BASE != 20) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must recompile openmrcp with #define CODEC_FRAME_TIME_BASE 20\n"); + return SWITCH_STATUS_GENERR; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CODEC_FRAME_TIME_BASE: %d\n", CODEC_FRAME_TIME_BASE); + } + + /* create session */ + openmrcp_session = openmrcp_session_create(); + if (!openmrcp_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_session creation FAILED\n"); + return SWITCH_STATUS_GENERR; + } + openmrcp_session->client_session = mrcp_client_context_session_create(mrcp_client_context,openmrcp_session); + if (!openmrcp_session->client_session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_session creation FAILED\n"); + return SWITCH_STATUS_GENERR; + } + + /* create audio source */ + source = mrcp_palloc(openmrcp_session->pool,sizeof(audio_source_t)); + source->method_set = &audio_source_method_set; + source->object = openmrcp_session; + openmrcp_session->source = source; + + /** + * create a new fifo queue. incoming audio received from freeswitch + * will be put into this queue, and it will be later pulled out by + * the openmrcp client thread. + */ + if (switch_queue_create(&openmrcp_session->audio_input_queue, 10000, openmrcp_session->pool)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "audio queue creation failed\n"); + return SWITCH_STATUS_MEMERR; + } + + openmrcp_session->flags = *flags; + switch_mutex_init(&openmrcp_session->flag_mutex, SWITCH_MUTEX_NESTED, openmrcp_session->pool); + + ah->private_info = openmrcp_session; + + return SWITCH_STATUS_SUCCESS; + +} + +/* function to load a grammar to the asr interface */ +static switch_status_t mrcprec_asr_load_grammar(switch_asr_handle_t *ah, char *grammar, char *path) +{ + /** Read grammar from path and create and send and MRCP RECOGNIZE msg + that has the grammar attached to body. + + TODO: - how does DEFINE-GRAMMAR fit into the picture here? (if at all) + */ + + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + mrcp_client_t *mrcp_client = mrcprec_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = mrcprec_module.mrcp_client_context; + audio_source_t *source = openmrcp_session->source; + + /* create recognizer channel, also starts outgoing rtp media */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading grammar\n"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Create Recognizer Channel\n"); + openmrcp_session->channel = mrcp_client_recognizer_channel_create(mrcp_client_context, openmrcp_session->client_session, source); + + if (!openmrcp_session->channel) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create recognizer channel\n"); + return SWITCH_STATUS_FALSE; + } + + /* wait for recognizer channel creation */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "WAITING FOR CHAN CREATE\n"); + if(openmrcp_session_wait_for_event(openmrcp_session, OPENMRCP_EVENT_CHANNEL_CREATE, OPENMRCP_WAIT_TIMEOUT) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Got channel creation event\n"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "WAITING FOR NONE\n"); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_NONE,200) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "GOT NONE EVENT\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "NEVER GOT NONE EVENT\n"); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Start Recognizer\n"); + openmrcp_recog_start(mrcp_client_context, openmrcp_session, path); + + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "never got channel creation event\n"); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Finished loading grammar\n"); + return SWITCH_STATUS_SUCCESS; +} + + +/*! function to feed audio to the ASR*/ +static switch_status_t mrcprec_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) +{ + + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + mrcp_client_t *mrcp_client = mrcprec_module.mrcp_client; + mrcp_client_context_t *mrcp_client_context = mrcprec_module.mrcp_client_context; + media_frame_t *media_frame; + switch_byte_t *buffer; + + /* create new media frame */ + media_frame = (media_frame_t *) switch_core_alloc(openmrcp_session->pool, sizeof(media_frame_t)); + if (!media_frame) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "media_frame creation failed\n"); + return SWITCH_STATUS_MEMERR; + } + + /** since *data buffer might get freed by caller (true or false?), allocate a + new buffer and copy *data into it **/ + buffer = (switch_byte_t *) switch_core_alloc(openmrcp_session->pool, sizeof(switch_byte_t)*len); + if (!buffer) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate buffer\n"); + return SWITCH_STATUS_MEMERR; + } + buffer = memcpy(buffer, data, len); + + media_frame->codec_frame.buffer = buffer; + media_frame->codec_frame.size = len; + media_frame->type = MEDIA_FRAME_TYPE_AUDIO; + + /* push audio to queue */ + if (switch_queue_trypush(openmrcp_session->audio_input_queue, (void *) media_frame)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "could not push audio to queue\n"); + return SWITCH_STATUS_GENERR; + } + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t mrcprec_asr_pause(switch_asr_handle_t *ah) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcprec_asr_pause called\n"); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t mrcprec_asr_resume(switch_asr_handle_t *ah) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "mrcprec_asr_resume called\n"); + + return SWITCH_STATUS_SUCCESS; +} + + +/*! function to unload a grammar to the asr interface */ +static switch_status_t mrcprec_asr_unload_grammar(switch_asr_handle_t *ah, char *grammar) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + return SWITCH_STATUS_SUCCESS; +} + +/** + * Freeswitch calls this whenever the channel is hungup or the + * speech detection is stopped via a call to switch_ivr_stop_detect_speech() + */ +static switch_status_t mrcprec_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcprec_asr_close()\n"); + + mrcp_client_t *mrcp_client = mrcprec_module.mrcp_client; + mrcp_client_context_t *context = mrcprec_module.mrcp_client_context; + + // TODO!! should we do a switch_pool_clear(switch_memory_pool_t *p) on the pool held + // by openmrcp_session? + + // destroy channel + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to DESTROY CHANNEL\n"); + mrcp_client_context_channel_destroy(context, openmrcp_session->client_session, 1); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_CHANNEL_DESTROY,10000) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPENMRCP_EVENT_CHANNEL_DESTROY received\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "timed out waiting for OPENMRCP_EVENT_CHANNEL_DESTROY\n"); + } + + // terminate client session + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); + mrcp_client_context_session_terminate(context, openmrcp_session->client_session); + if (openmrcp_session_wait_for_event(openmrcp_session,OPENMRCP_EVENT_SESSION_TERMINATE,10000) == MRCP_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPENMRCP_EVENT_SESSION_TERMINATE recevied\n"); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "timed out waiting for OPENMRCP_EVENT_SESSION_TERMINATE\n"); + } + + // destroy client session (NOTE: this sends a BYE to the other side) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to DESTROY SESSION\n"); + mrcp_client_context_session_destroy(context, openmrcp_session->client_session); + + // destroys the openmrcp_session struct + openmrcp_session_destroy(openmrcp_session); + + switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); + + return SWITCH_STATUS_SUCCESS; +} + + +/** + * Freeswitch calls this method from the speech_thread() thread body method + * in switch_ivr_async.c every time a new frame is received by the media bug + * attached to the audio channel. If this method returns SWITCH_STATUS_SUCCESS, + * then Freeswitch will call mrcprec_asr_get_results() to get the result value. + */ +static switch_status_t mrcprec_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + + switch_status_t rv = (switch_test_flag(openmrcp_session, FLAG_HAS_TEXT) || switch_test_flag(openmrcp_session, FLAG_BARGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + + return rv; +} + +/*! This will be called after asr_check_results returns SUCCESS */ +static switch_status_t mrcprec_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags) +{ + openmrcp_session_t *openmrcp_session = (openmrcp_session_t *) ah->private_info; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcprec_asr_get_results called\n"); + switch_status_t ret = SWITCH_STATUS_SUCCESS; + + if (switch_test_flag(openmrcp_session, FLAG_BARGE)) { + switch_clear_flag_locked(openmrcp_session, FLAG_BARGE); + ret = SWITCH_STATUS_BREAK; + } + + if (switch_test_flag(openmrcp_session, FLAG_HAS_TEXT)) { + /*! + we have to extract the XML but stripping off the <?xml version="1.0"?> + header. the body looks like: + + Completion-Cause:001 no-match + Content-Type: application/nlsml+xml + Content-Length: 260 + + <?xml version="1.0"?> + <result xmlns="http://www.ietf.org/xml/ns/mrcpv2" xmlns:ex="http://www.example.com/example" score="100" grammar="session:request1@form-level.store"> + <interpretation> + <input mode="speech">open a</input> + </interpretation> + </result> + */ + + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(openmrcp_session->mrcp_message_last_rcvd->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", openmrcp_session->mrcp_message_last_rcvd->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } + + // since we are returning our result here, future calls to check_results + // should return False + switch_clear_flag_locked(openmrcp_session, FLAG_HAS_TEXT); + ret = SWITCH_STATUS_SUCCESS; + } + return ret; +} + +static switch_asr_interface_t mrcprec_asr_interface = { + /*.interface_name*/ "mrcprec", + /*.asr_open*/ mrcprec_asr_open, + /*.asr_load_grammar*/ mrcprec_asr_load_grammar, + /*.asr_unload_grammar*/ mrcprec_asr_unload_grammar, + /*.asr_close*/ mrcprec_asr_close, + /*.asr_feed*/ mrcprec_asr_feed, + /*.asr_resume*/ mrcprec_asr_resume, + /*.asr_pause*/ mrcprec_asr_pause, + /*.asr_check_results*/ mrcprec_asr_check_results, + /*.asr_get_results*/ mrcprec_asr_get_results +}; + +static switch_loadable_module_interface_t mrcprec_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ NULL, + /*.say_interface */ NULL, + /*.asr_interface */ &mrcprec_asr_interface +}; + + +static switch_status_t mrcp_init() +{ + /*! + Perform one-time initialization of client library + */ + + mrcp_mem_pool_t *pool; + mrcp_client_event_handler_t *client_event_handler; + mrcp_client_t *mrcp_client; + mrcp_client_context_t *mrcp_client_context; + openmrcp_client_options_t *options; + + pool = mrcp_global_pool_get(); + options = mrcp_palloc(pool,sizeof(openmrcp_client_options_t)); + client_event_handler = mrcp_palloc(pool,sizeof(mrcp_client_event_handler_t)); + set_default_options(options); + + client_event_handler->on_session_initiate = openmrcp_on_session_initiate; + client_event_handler->on_session_terminate = openmrcp_on_session_terminate; + client_event_handler->on_channel_add = openmrcp_on_channel_add; + client_event_handler->on_channel_remove = openmrcp_on_channel_remove; + client_event_handler->on_channel_modify = openmrcp_on_channel_modify; + + // create client context, which to must be passed to client engine + mrcp_client_context = mrcp_client_context_create(&mrcprec_module,client_event_handler); + if(!mrcp_client_context) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mrcp_client_context creation failed\n"); + return SWITCH_STATUS_GENERR; + } + mrcprec_module.mrcp_client_context = mrcp_client_context; + + // this basically starts a thread that pulls events from the event queue + // and handles them + mrcp_client = openmrcp_client_start(options,mrcp_client_context); + if(!mrcp_client) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_client_start FAILED\n"); + mrcp_client_context_destroy(mrcp_client_context); + return SWITCH_STATUS_GENERR; + } + + mrcprec_module.mrcp_client = mrcp_client; + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_mrcprec_load) +{ + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &mrcprec_module_interface; + + /* initialize openmrcp */ + mrcp_global_init(); + mrcp_init(); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mrcprec_shutdown) +{ + return SWITCH_STATUS_UNLOAD; +}

1 0

[commit] r5581 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 09 Aug '07

09 Aug '07

Author: anthm Date: Thu Aug 9 14:20:58 2007 New Revision: 5581 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Aug 9 14:20:58 2007 @@ -767,6 +767,7 @@ { if (tech_pvt->iax_session) { iax_reject(tech_pvt->iax_session, msg->string_arg ? msg->string_arg : "Call Rejected"); + switch_set_flag(tech_pvt, TFLAG_HANGUP); } } break;

1 0

[commit] r5580 - in freeswitch/trunk/src/mod: endpoints/mod_iax languages/mod_spidermonkey
by Freeswitch SVN 09 Aug '07

09 Aug '07

Author: anthm Date: Thu Aug 9 13:57:14 2007 New Revision: 5580 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: small tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Aug 9 13:57:14 2007 @@ -763,8 +763,17 @@ assert(tech_pvt != NULL); switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_REJECT: + { + if (tech_pvt->iax_session) { + iax_reject(tech_pvt->iax_session, msg->string_arg ? msg->string_arg : "Call Rejected"); + } + } + break; case SWITCH_MESSAGE_INDICATE_ANSWER: - channel_answer_channel(session); + { + channel_answer_channel(session); + } break; default: break; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Aug 9 13:57:14 2007 @@ -1788,9 +1788,9 @@ channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); - - CHANNEL_SANITY_CHECK(); - + /* you can execute some apps before you answer */ + /* CHANNEL_SANITY_CHECK(); */ + if (argc > 0) { const switch_application_interface_t *application_interface;

1 0

[commit] r5579 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 09 Aug '07

09 Aug '07

Author: mikej Date: Wed Aug 8 23:19:07 2007 New Revision: 5579 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix for MODAPP-25. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Aug 8 23:19:07 2007 @@ -4451,7 +4451,10 @@ switch_xml_t xml_kvp; assert(conference != NULL); - assert(xml_controls != NULL); + + if (!xml_controls) { + return status; + } /* parse the controls tree for caller control digit strings */ for (xml_kvp = switch_xml_child(xml_controls, "control"); xml_kvp; xml_kvp = xml_kvp->next) {

1 0

[commit] r5578 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 08 Aug '07

08 Aug '07

Author: anthm Date: Wed Aug 8 10:37:19 2007 New Revision: 5578 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: add context option Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Wed Aug 8 10:37:19 2007 @@ -116,6 +116,7 @@ int configured_spans; int configured_boost_spans; char *dialplan; + char *context; switch_hash_t *call_hash; switch_mutex_t *hash_mutex; switch_mutex_t *channel_mutex; @@ -387,6 +388,16 @@ globals.dialplan = strdup(dialplan); } +static void set_global_context(char *context) +{ + if (globals.context) { + free(globals.context); + globals.context = NULL; + } + + globals.context = strdup(context); +} + static int str2node(char *node) { @@ -446,6 +457,7 @@ static void set_global_dialplan(char *dialplan); +static void set_global_context(char *context); static int str2node(char *node); static int str2switch(char *swtype); static switch_status_t wanpipe_on_init(switch_core_session_t *session); @@ -1546,7 +1558,7 @@ NULL, NULL, (char *)modname, - NULL, + globals.context, pevent->ring.callednum))) { switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } @@ -2225,6 +2237,8 @@ globals.dtmf_off = atoi(val); } else if (!strcmp(var, "dialplan")) { set_global_dialplan(val); + } else if (!strcmp(var, "context")) { + set_global_context(val); } else if (!strcmp(var, "suppress-dtmf-tone")) { globals.suppress_dtmf_tone = switch_true(val); } else if (!strcmp(var, "ignore-dtmf-tone")) {

1 0

[commit] r5577 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 07 Aug '07

07 Aug '07

Author: mikej Date: Mon Aug 6 22:46:55 2007 New Revision: 5577 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix for MODAPP-17, using the +pin on the conference app args, with nothing following the + will now override and not prompt for a pin Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Aug 6 22:46:55 2007 @@ -4047,7 +4047,7 @@ rl++; /* if this is not an outbound call, deal with conference pins */ - if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin) { + if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin && *(conference->pin)) { char pin_buf[80] = ""; int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_valid = 0;

1 0

[commit] r5576 - in freeswitch/branches/greenlizard/src: . include mod/languages/mod_python
by Freeswitch SVN 07 Aug '07

07 Aug '07

Author: greenlizard Date: Mon Aug 6 21:33:15 2007 New Revision: 5576 Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/greenlizard/src/switch_cpp.cpp Log: 1. add collectInput method. 2. modify the dtmf callback handlers to better deal with event inputs, as opposed to dtmf inputs. currently returns a dictionary where one key contains the body, and another contains the headers as a subdictionary. Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_cpp.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_cpp.h Mon Aug 6 21:33:15 2007 @@ -158,7 +158,7 @@ * * The DTMF callback function will be set and persist * for the life of the session, and be called when a dtmf - * is pressed by user during playFile(), streamfile(), and + * is pressed by user during streamfile(), collectDigits(), and * certain other methods are executing. * */ @@ -168,6 +168,19 @@ int speak(char *text); void set_tts_parms(char *tts_name, char *voice_name); + /** + * For timeout milliseconds, call the dtmf function set previously + * by setDTMFCallback whenever a dtmf or event is received + */ + int collectDigits(int timeout); + + /** + * Collect up to maxdigits digits worth of digits + * and store them in dtmf_buf. In the case of mod_python, the + * dtmf_buf parameter is configured to act as a _return_ value, + * (see mod_python.i). This does NOT call any callbacks upon + * receiving dtmf digits. For that, use collectDigits. + */ int getDigits(char *dtmf_buf, int buflen, int maxdigits, Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py Mon Aug 6 21:33:15 2007 @@ -118,6 +118,7 @@ def setDTMFCallback(*args): return _freeswitch.CoreSession_setDTMFCallback(*args) def speak(*args): return _freeswitch.CoreSession_speak(*args) def set_tts_parms(*args): return _freeswitch.CoreSession_set_tts_parms(*args) + def collectDigits(*args): return _freeswitch.CoreSession_collectDigits(*args) def getDigits(*args): return _freeswitch.CoreSession_getDigits(*args) def transfer(*args): return _freeswitch.CoreSession_transfer(*args) def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args) Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp Mon Aug 6 21:33:15 2007 @@ -105,10 +105,12 @@ } switch_status_t PySession::run_dtmf_callback(void *input, - switch_input_type_t itype) { + switch_input_type_t itype) { PyObject *func, *arglist; PyObject *pyresult; + PyObject* headerdict; + char *resultStr; char *funcargs; switch_file_handle_t *fh = NULL; @@ -137,7 +139,47 @@ funcargs = (char *) cb_state.funcargs; - arglist = Py_BuildValue("(sis)", input, itype, funcargs); + if (itype == SWITCH_INPUT_TYPE_DTMF) { + + arglist = Py_BuildValue("(sis)", input, itype, funcargs); + } + else if (itype == SWITCH_INPUT_TYPE_EVENT) { + // DUNNO if this is correct in the case we have an event + // will be of type switch_event_t *event; + // http://www.freeswitch.org/docs/structswitch__event.html + switch_event_t *event = (switch_event_t *) input; + arglist = Py_BuildValue("({s:s}is)", + "body", event->body, + itype, + funcargs); + + // build a dictionary with all the headers + + switch_event_header_t *hp; + headerdict = PyDict_New(); + for (hp = event->headers; hp; hp = hp->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding event header to result"); + PyDict_SetItem(headerdict, + Py_BuildValue("s", hp->name), + Py_BuildValue("s", hp->value)); + + } + + // add it to the main event dictionary (first arg in list) + // under key 'headers' + PyObject *dict = PyTuple_GetItem(arglist, 0); + PyDict_SetItemString(dict, + "headers", + headerdict); + + //arglist = Py_BuildValue("(sis)", event->body, itype, funcargs); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown input type: %d\n", itype); + return SWITCH_STATUS_FALSE; + } + + if (!arglist) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); return SWITCH_STATUS_FALSE; @@ -150,13 +192,15 @@ Py_XDECREF(arglist); // Trash arglist + Py_XDECREF(headerdict); + if (pyresult && pyresult != Py_None) { resultStr = (char *) PyString_AsString(pyresult); switch_status_t cbresult = process_callback_result(resultStr, &cb_state, session); return cbresult; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error calling python callback\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Python callback\n returned None"); PyErr_Print(); PyErr_Clear(); } Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h Mon Aug 6 21:33:15 2007 @@ -40,8 +40,19 @@ bool begin_allow_threads(); bool end_allow_threads(); + /** + * Run DTMF callback + * + * A static method in CoreSession is the first thing called + * upon receving a dtmf/event callback from fs engine, and then + * it gets the PySession instance and calls this method with + * dtmf/event object. + * + * @param input - a dtmf char buffer, or an event 'object' (not sure..) + * @param itype - a SWITCH_INPUT_TYPE_DTMF or a SWITCH_INPUT_TYPE_EVENT + */ switch_status_t run_dtmf_callback(void *input, - switch_input_type_t itype); + switch_input_type_t itype); }; Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp Mon Aug 6 21:33:15 2007 @@ -4080,6 +4080,37 @@ } +SWIGINTERN PyObject *_wrap_CoreSession_collectDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + int arg2 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_collectDigits",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_collectDigits" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CoreSession_collectDigits" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + result = (int)(arg1)->collectDigits(arg2); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_CoreSession_getDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -5228,6 +5259,7 @@ { (char *)"CoreSession_setDTMFCallback", _wrap_CoreSession_setDTMFCallback, METH_VARARGS, NULL}, { (char *)"CoreSession_speak", _wrap_CoreSession_speak, METH_VARARGS, NULL}, { (char *)"CoreSession_set_tts_parms", _wrap_CoreSession_set_tts_parms, METH_VARARGS, NULL}, + { (char *)"CoreSession_collectDigits", _wrap_CoreSession_collectDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_getDigits", _wrap_CoreSession_getDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_transfer", _wrap_CoreSession_transfer, METH_VARARGS, NULL}, { (char *)"CoreSession_playAndGetDigits", _wrap_CoreSession_playAndGetDigits, METH_VARARGS, NULL}, Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Mon Aug 6 21:33:15 2007 @@ -92,7 +92,7 @@ const switch_application_interface_t *application_interface; sanity_check_noreturn; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::execute. data:%s\n", data); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::execute. app: %s data:%s\n", app, data); if ((application_interface = switch_loadable_module_get_application_interface(app))) { begin_allow_threads(); switch_core_session_exec(session, application_interface, data); @@ -158,6 +158,15 @@ voice_name = strdup(voice_name_p); } + + +int CoreSession::collectDigits(int timeout) { + sanity_check(-1); + begin_allow_threads(); + switch_ivr_collect_digits_callback(session, ap, timeout); + end_allow_threads(); +} + int CoreSession::getDigits(char *dtmf_buf, int buflen, int maxdigits, @@ -214,7 +223,8 @@ terminators, audio_files, bad_input_audio_files, - dtmf_buf, 128, + dtmf_buf, + 128, digits_regex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playAndGetDigits dtmf_buf: %s\n", dtmf_buf); @@ -522,7 +532,7 @@ CoreSession *coresession = NULL; switch_status_t result; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dtmf_callback called\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "dtmf_callback called\n"); fflush(stdout); channel = switch_core_session_get_channel(session_cb);

1 0