From bbfa531bdd7751155fbe9c94c331f43df0040317 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Fri, 21 Apr 2023 12:53:35 -0400 Subject: [PATCH] freeswitch updates --- cloudformation/jambonz-mini.yaml | 2 +- .../files/mod_avmd.c.patch | 38 ++++++------------- .../files/modules.conf.vanilla.xml.extra | 1 + .../scripts/install_freeswitch.sh | 2 +- packer/jambonz-mini/files/Makefile.am.extra | 15 +++++++- packer/jambonz-mini/files/mod_avmd.c.patch | 38 ++++++------------- .../files/modules.conf.vanilla.xml.extra | 1 + .../scripts/install_freeswitch.sh | 2 +- 8 files changed, 40 insertions(+), 59 deletions(-) diff --git a/cloudformation/jambonz-mini.yaml b/cloudformation/jambonz-mini.yaml index 9ef1b03..52f8bd0 100644 --- a/cloudformation/jambonz-mini.yaml +++ b/cloudformation/jambonz-mini.yaml @@ -103,7 +103,7 @@ Conditions: Mappings: AWSRegion2AMI: us-east-1: - Ami: ami-0eedbdac5ab1b336f + Ami: ami-0ec9460dc739838ff Resources: IamCloudwatchRole: diff --git a/packer/jambonz-feature-server/files/mod_avmd.c.patch b/packer/jambonz-feature-server/files/mod_avmd.c.patch index d3650bc..ae995b9 100644 --- a/packer/jambonz-feature-server/files/mod_avmd.c.patch +++ b/packer/jambonz-feature-server/files/mod_avmd.c.patch @@ -1,12 +1,17 @@ ---- src/mod/applications/mod_avmd/mod_avmd.c 2022-07-21 09:22:01.000000000 +0200 -+++ src/mod/applications/mod_avmd/mod_avmd.c.new 2022-07-21 09:21:55.000000000 +0200 -@@ -1479,12 +1479,17 @@ - direction = "READ_REPLACE"; +--- mod_avmd.c 2022-02-10 11:19:05 ++++ mod_avmd.c.new 2023-04-19 13:28:03 +@@ -1476,15 +1476,20 @@ } - if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) && (avmd_session->settings.inbound_channnel == 1)) { + if ((SWITCH_CALL_DIRECTION_OUTBOUND == switch_channel_direction(channel)) && (avmd_session->settings.outbound_channnel == 1)) { + flags |= SMBF_READ_REPLACE; +- direction = "READ_REPLACE"; ++ direction = "READ_REPLACE"; + } +- if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) && (avmd_session->settings.inbound_channnel == 1)) { ++ if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) /* && (avmd_session->settings.inbound_channnel == 1) */) { + /* DCH: for drachtio-fsmrf */ + flags |= SMBF_READ_REPLACE; -+ direction = "READ_REPLACE"; ++ direction = "READ_REPLACE"; +/* flags |= SMBF_WRITE_REPLACE; if (!strcmp(direction, "READ_REPLACE")) { @@ -18,24 +23,3 @@ } if (flags == 0) { -@@ -1849,6 +1854,20 @@ - - avmd_session = (avmd_session_t *) switch_core_session_alloc(fs_session, sizeof(avmd_session_t)); /* Allocate memory attached to this FreeSWITCH session for use in the callback routine and to store state information */ - status = init_avmd_session_data(avmd_session, fs_session, NULL); -+ -+ /* DCH: for drachtio-fsmrf */ -+ avmd_session->settings.inbound_channnel = 1; -+ avmd_session->settings.debug = 0; -+ avmd_session->settings.report_status = 1; -+ avmd_session->settings.mode = 2; -+ avmd_session->settings.detectors_n = 36; -+ avmd_session->settings.detectors_lagged_n = 1; -+ avmd_session->settings.require_continuous_streak = 1; -+ avmd_session->settings.sample_n_continuous_streak = 3; -+ avmd_session->settings.require_continuous_streak_amp = 1; -+ avmd_session->settings.simplified_estimation = 1; -+ /* */ -+ - if (status != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "-ERR, failed to initialize avmd session\n for FreeSWITCH session [%s]\n", uuid); - switch (status) { diff --git a/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra b/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra index 2eaf703..4774bf7 100644 --- a/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra +++ b/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra @@ -64,6 +64,7 @@ + diff --git a/packer/jambonz-feature-server/scripts/install_freeswitch.sh b/packer/jambonz-feature-server/scripts/install_freeswitch.sh index 06bc7f3..facd22d 100644 --- a/packer/jambonz-feature-server/scripts/install_freeswitch.sh +++ b/packer/jambonz-feature-server/scripts/install_freeswitch.sh @@ -6,7 +6,7 @@ GRPC_VERSION=c66d2cc GOOGLE_API_VERSION=e9da6f8b469c52b83f900e820be30762e9e05c57 AWS_SDK_VERSION=1.8.129 LWS_VERSION=v3.2.3 -MODULES_VERSION=v0.6.12 +MODULES_VERSION=v0.6.14 echo "freeswitch version to install is ${FREESWITCH_VERSION}" echo "drachtio modules version to install is ${MODULES_VERSION}" diff --git a/packer/jambonz-mini/files/Makefile.am.extra b/packer/jambonz-mini/files/Makefile.am.extra index cb6888c..7ba2f2e 100644 --- a/packer/jambonz-mini/files/Makefile.am.extra +++ b/packer/jambonz-mini/files/Makefile.am.extra @@ -402,6 +402,7 @@ libs/googleapis/gens/google/cloud/dialogflow/v2beta1/webhook.pb.cc libfreeswitch_libgoogleapis_la_CPPFLAGS = -I/usr/local/include -I$(GOOGLEAPIS_GENS_PATH) -std=c++17 -pthread +# nuance asr NUANCE_GENS_PATH = libs/nuance-asr-grpc-api/stubs/ nodist_libfreeswitch_libnuanceapis_la_SOURCES = \ @@ -420,6 +421,7 @@ libs/nuance-asr-grpc-api/stubs/nuance/asr/v1/recognizer.grpc.pb.cc libfreeswitch_libnuanceapis_la_CPPFLAGS = -I/usr/local/include -I$(NUANCE_GENS_PATH) -std=c++17 -pthread +#nvidia asr NVIDIA_GENS_PATH = libs/riva-asr-grpc-api/stubs/ nodist_libfreeswitch_libnvidiaapis_la_SOURCES = \ @@ -430,8 +432,17 @@ libs/riva-asr-grpc-api/stubs/riva/proto/riva_audio.grpc.pb.cc libfreeswitch_libnvidiaapis_la_CPPFLAGS = -I/usr/local/include -I$(NVIDIA_GENS_PATH) -std=c++17 -pthread -CORE_LIBS+=libfreeswitch_libgoogleapis.la libfreeswitch_libnuanceapis.la libfreeswitch_libnvidiaapis.la -noinst_LTLIBRARIES += libfreeswitch_libgoogleapis.la libfreeswitch_libnuanceapis.la libfreeswitch_libnvidiaapis.la +#soniox asr +SONIOX_GENS_PATH = libs/soniox-asr-grpc-api/stubs/ + +nodist_libfreeswitch_libsonioxapis_la_SOURCES = \ +libs/soniox-asr-grpc-api/stubs/soniox/speech_service.pb.cc \ +libs/soniox-asr-grpc-api/stubs/soniox/speech_service.grpc.pb.cc + +libfreeswitch_libsonioxapis_la_CPPFLAGS = -I/usr/local/include -I$(SONIOX_GENS_PATH) -std=c++17 -pthread + +CORE_LIBS+=libfreeswitch_libgoogleapis.la libfreeswitch_libnuanceapis.la libfreeswitch_libnvidiaapis.la libfreeswitch_libsonioxapis.la +noinst_LTLIBRARIES += libfreeswitch_libgoogleapis.la libfreeswitch_libnuanceapis.la libfreeswitch_libnvidiaapis.la libfreeswitch_libsonioxapis.la endif diff --git a/packer/jambonz-mini/files/mod_avmd.c.patch b/packer/jambonz-mini/files/mod_avmd.c.patch index 07ada89..ae995b9 100644 --- a/packer/jambonz-mini/files/mod_avmd.c.patch +++ b/packer/jambonz-mini/files/mod_avmd.c.patch @@ -1,12 +1,17 @@ ---- mod_avmd.c 2022-07-21 09:22:01.000000000 +0200 -+++ mod_avmd.c.new 2022-07-21 09:21:55.000000000 +0200 -@@ -1479,12 +1479,17 @@ - direction = "READ_REPLACE"; +--- mod_avmd.c 2022-02-10 11:19:05 ++++ mod_avmd.c.new 2023-04-19 13:28:03 +@@ -1476,15 +1476,20 @@ } - if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) && (avmd_session->settings.inbound_channnel == 1)) { + if ((SWITCH_CALL_DIRECTION_OUTBOUND == switch_channel_direction(channel)) && (avmd_session->settings.outbound_channnel == 1)) { + flags |= SMBF_READ_REPLACE; +- direction = "READ_REPLACE"; ++ direction = "READ_REPLACE"; + } +- if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) && (avmd_session->settings.inbound_channnel == 1)) { ++ if ((SWITCH_CALL_DIRECTION_INBOUND == switch_channel_direction(channel)) /* && (avmd_session->settings.inbound_channnel == 1) */) { + /* DCH: for drachtio-fsmrf */ + flags |= SMBF_READ_REPLACE; -+ direction = "READ_REPLACE"; ++ direction = "READ_REPLACE"; +/* flags |= SMBF_WRITE_REPLACE; if (!strcmp(direction, "READ_REPLACE")) { @@ -18,24 +23,3 @@ } if (flags == 0) { -@@ -1849,6 +1854,20 @@ - - avmd_session = (avmd_session_t *) switch_core_session_alloc(fs_session, sizeof(avmd_session_t)); /* Allocate memory attached to this FreeSWITCH session for use in the callback routine and to store state information */ - status = init_avmd_session_data(avmd_session, fs_session, NULL); -+ -+ /* DCH: for drachtio-fsmrf */ -+ avmd_session->settings.inbound_channnel = 1; -+ avmd_session->settings.debug = 0; -+ avmd_session->settings.report_status = 1; -+ avmd_session->settings.mode = 2; -+ avmd_session->settings.detectors_n = 36; -+ avmd_session->settings.detectors_lagged_n = 1; -+ avmd_session->settings.require_continuous_streak = 1; -+ avmd_session->settings.sample_n_continuous_streak = 3; -+ avmd_session->settings.require_continuous_streak_amp = 1; -+ avmd_session->settings.simplified_estimation = 1; -+ /* */ -+ - if (status != SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "-ERR, failed to initialize avmd session\n for FreeSWITCH session [%s]\n", uuid); - switch (status) { diff --git a/packer/jambonz-mini/files/modules.conf.vanilla.xml.extra b/packer/jambonz-mini/files/modules.conf.vanilla.xml.extra index 2eaf703..4774bf7 100644 --- a/packer/jambonz-mini/files/modules.conf.vanilla.xml.extra +++ b/packer/jambonz-mini/files/modules.conf.vanilla.xml.extra @@ -64,6 +64,7 @@ + diff --git a/packer/jambonz-mini/scripts/install_freeswitch.sh b/packer/jambonz-mini/scripts/install_freeswitch.sh index 06bc7f3..facd22d 100644 --- a/packer/jambonz-mini/scripts/install_freeswitch.sh +++ b/packer/jambonz-mini/scripts/install_freeswitch.sh @@ -6,7 +6,7 @@ GRPC_VERSION=c66d2cc GOOGLE_API_VERSION=e9da6f8b469c52b83f900e820be30762e9e05c57 AWS_SDK_VERSION=1.8.129 LWS_VERSION=v3.2.3 -MODULES_VERSION=v0.6.12 +MODULES_VERSION=v0.6.14 echo "freeswitch version to install is ${FREESWITCH_VERSION}" echo "drachtio modules version to install is ${MODULES_VERSION}"