From 13e34e0fa90fbcf6fa455a70dae7f7ea5fa0778a Mon Sep 17 00:00:00 2001 From: file Date: Wed, 11 Jul 2007 16:19:00 +0000 Subject: Allow the native formats of a channel to influence the audio that is going to the engine. The best format will try to be chosen with an ultimate fallback to signed linear if possible. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74570 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_speech.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'res/res_speech.c') diff --git a/res/res_speech.c b/res/res_speech.c index b902f40d7..e848b06ca 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -159,17 +159,22 @@ int ast_speech_change(struct ast_speech *speech, char *name, const char *value) } /*! \brief Create a new speech structure using the engine specified */ -struct ast_speech *ast_speech_new(char *engine_name, int format) +struct ast_speech *ast_speech_new(char *engine_name, int formats) { struct ast_speech_engine *engine = NULL; struct ast_speech *new_speech = NULL; + int format = AST_FORMAT_SLINEAR; /* Try to find the speech recognition engine that was requested */ if (!(engine = find_engine(engine_name))) return NULL; - /* Make sure the requested format fits */ - if (!(engine->formats & format)) + /* Before even allocating the memory below do some codec negotiation, we choose the best codec possible and fall back to signed linear if possible */ + if ((format = (engine->formats & formats))) + format = ast_best_codec(format); + else if ((engine->formats & AST_FORMAT_SLINEAR)) + format = AST_FORMAT_SLINEAR; + else return NULL; /* Allocate our own speech structure, and try to allocate a structure from the engine too */ -- cgit v1.2.3