ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 05:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-6450 [unimrcp] Update library

Browse Source 
[apr] Backport APR_RING_FOREACH and APR_RING_FOREACH_SAFE macros to APR for unimrcp compatibility.

 [unimrcp] configure.gnu - need full path, not relative path for library paths

 [unimrcp] added uni_revision.h - couldn't get it to autogenerate from build

 [mod_unimrcp] add better logging and error checking on module load.  Currently dumps core on MRCPv1 TTS attempt

 [mod_unimrcp] don't configure MRCPv1 session with a connection agent- causes crash
This commit is contained in:
Chris Rienzo committed 2014-11-18 14:23:54 -05:00
1 parent f198d82bac
commit 8330336e9a
533 files changed
+16386 -18997
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/unimrcp/platforms/umc/include/dtmfscenario.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: dtmfscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: dtmfscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef DTMF_SCENARIO_H
libs/unimrcp/platforms/umc/include/dtmfsession.h
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: dtmfsession.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: dtmfsession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef DTMF_SESSION_H
@@ -45,7 +45,7 @@ protected:
mrcp_message_t* CreateRecognizeRequest(mrcp_channel_t* pMrcpChannel);
bool ParseNLSMLResult(mrcp_message_t* pMrcpMessage) const;
static bool ParseNLSMLResult(mrcp_message_t* pMrcpMessage);
/* ============================ HANDLERS =================================== */
virtual bool OnSessionTerminate(mrcp_sig_status_code_e status);
libs/unimrcp/platforms/umc/include/recogscenario.h
+9 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: recogscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: recogscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef RECOG_SCENARIO_H
@@ -41,6 +41,7 @@ public:
/* ============================ ACCESSORS ================================== */
const char* GetContentType() const;
const char* GetContent() const;
apr_size_t GetContentLength() const;
const char* GetAudioSource() const;
/* ============================ INQUIRIES ================================== */
@@ -58,6 +59,7 @@ protected:
bool m_Recognize;
const char* m_ContentType;
const char* m_Content;
apr_size_t m_ContentLength;
const char* m_AudioSource;
};
@@ -72,6 +74,11 @@ inline const char* RecogScenario::GetContent() const
return m_Content;
}
inline apr_size_t RecogScenario::GetContentLength() const
{
return m_ContentLength;
}
inline const char* RecogScenario::GetAudioSource() const
{
return m_AudioSource;
libs/unimrcp/platforms/umc/include/recogsession.h
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: recogsession.h 1587 2010-03-12 19:40:02Z achaloyan $
* $Id: recogsession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef RECOG_SESSION_H
@@ -48,7 +48,7 @@ protected:
mrcp_message_t* CreateDefineGrammarRequest(mrcp_channel_t* pMrcpChannel);
mrcp_message_t* CreateRecognizeRequest(mrcp_channel_t* pMrcpChannel);
bool ParseNLSMLResult(mrcp_message_t* pMrcpMessage) const;
static bool ParseNLSMLResult(mrcp_message_t* pMrcpMessage);
FILE* GetAudioIn(const mpf_codec_descriptor_t* pDescriptor, apr_pool_t* pool) const;
/* ============================ HANDLERS =================================== */
libs/unimrcp/platforms/umc/include/recorderscenario.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: recorderscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: recorderscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef RECORDER_SCENARIO_H
libs/unimrcp/platforms/umc/include/recordersession.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: recordersession.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: recordersession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef RECORDER_SESSION_H
libs/unimrcp/platforms/umc/include/setparamscenario.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: setparamscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: setparamscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef SETPARAM_SCENARIO_H
libs/unimrcp/platforms/umc/include/setparamsession.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: setparamsession.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: setparamsession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef SETPARAM_SESSION_H
libs/unimrcp/platforms/umc/include/synthscenario.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: synthscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: synthscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef SYNTH_SCENARIO_H
libs/unimrcp/platforms/umc/include/synthsession.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: synthsession.h 1586 2010-03-12 19:39:02Z achaloyan $
* $Id: synthsession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef SYNTH_SESSION_H
libs/unimrcp/platforms/umc/include/umcconsole.h
+10 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: umcconsole.h 1525 2010-02-16 14:58:56Z achaloyan $
* $Id: umcconsole.h 2197 2014-10-16 01:34:19Z achaloyan@gmail.com $
*/
#ifndef UMC_CONSOLE_H
@@ -42,19 +42,24 @@ protected:
bool LoadOptions(int argc, const char * const *argv, apr_pool_t *pool);
bool RunCmdLine();
bool ProcessCmdLine(char* pCmdLine);
void Usage() const;
static void Usage();
private:
/* ============================ DATA ======================================= */
struct UmcOptions
{
const char* m_RootDirPath;
const char* m_DirLayoutConf;
const char* m_LogPriority;
const char* m_LogOutput;
UmcOptions() :
m_RootDirPath(NULL), m_DirLayoutConf(NULL),
m_LogPriority(NULL), m_LogOutput(NULL) {}
};
UmcOptions m_Options;
UmcFramework* m_pFramework;
UmcOptions m_Options;
UmcFramework* m_pFramework;
};
#endif /* UMC_CONSOLE_H */
libs/unimrcp/platforms/umc/include/umcframework.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: umcframework.h 1585 2010-03-12 19:12:05Z achaloyan $
* $Id: umcframework.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef UMC_FRAMEWORK_H
libs/unimrcp/platforms/umc/include/umcscenario.h
+11 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: umcscenario.h 1474 2010-02-07 20:51:47Z achaloyan $
* $Id: umcscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef UMC_SCENARIO_H
@@ -65,11 +65,12 @@ protected:
bool LoadCapabilities(const apr_xml_elem* pElem, apr_pool_t* pool);
bool LoadRtpTermination(const apr_xml_elem* pElem, apr_pool_t* pool);
const char* LoadFileContent(const char* pFileName, apr_size_t& size, apr_pool_t* pool) const;
const char* LoadFileContent(const char* pFileName, apr_pool_t* pool) const;
int ParseRates(const char* pStr, apr_pool_t* pool) const;
static int ParseRates(const char* pStr, apr_pool_t* pool);
/* ============================ INQUIRIES ================================== */
bool IsElementEnabled(const apr_xml_elem* pElem) const;
static bool IsElementEnabled(const apr_xml_elem* pElem);
/* ============================ DATA ======================================= */
const char* m_pName;
@@ -119,4 +120,10 @@ inline bool UmcScenario::IsDiscoveryEnabled() const
}
inline const char* UmcScenario::LoadFileContent(const char* pFileName, apr_pool_t* pool) const
{
apr_size_t dummy;
return LoadFileContent(pFileName, dummy, pool);
}
#endif /* UMC_SCENARIO_H */
libs/unimrcp/platforms/umc/include/umcsession.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: umcsession.h 1585 2010-03-12 19:12:05Z achaloyan $
* $Id: umcsession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef UMC_SESSION_H
libs/unimrcp/platforms/umc/include/verifierscenario.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: verifierscenario.h 1775 2010-08-26 18:23:38Z achaloyan $
* $Id: verifierscenario.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef VERIFIER_SCENARIO_H
libs/unimrcp/platforms/umc/include/verifiersession.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Arsen Chaloyan
* Copyright 2008-2014 Arsen Chaloyan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
* $Id: verifiersession.h 1776 2010-08-27 16:36:38Z achaloyan $
* $Id: verifiersession.h 2136 2014-07-04 06:33:36Z achaloyan@gmail.com $
*/
#ifndef VERIFIER_SESSION_H