From 3b42bbaa29fc4ac8f67e2cdae7665f2b75fec3f6 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Tue, 30 Jun 2015 17:04:50 -0500
Subject: [PATCH] FS-7726 updates

---
 conf/testing/autoload_configs/amd.conf.xml    | 17 ++++++
 .../autoload_configs/conference.conf.xml      | 57 +++++++++++++++++++
 .../testing/autoload_configs/modules.conf.xml |  2 +
 conf/testing/dialplan/default/0019_conf.xml   | 20 ++++++-
 .../default/0022_mod_com_amd_testing.xml      | 21 +++++++
 conf/testing/sip_profiles/external.xml        |  2 +-
 6 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 conf/testing/autoload_configs/amd.conf.xml
 create mode 100644 conf/testing/dialplan/default/0022_mod_com_amd_testing.xml

diff --git a/conf/testing/autoload_configs/amd.conf.xml b/conf/testing/autoload_configs/amd.conf.xml
new file mode 100644
index 0000000000..e26761aafa
--- /dev/null
+++ b/conf/testing/autoload_configs/amd.conf.xml
@@ -0,0 +1,17 @@
+<configuration name="amd.conf" description="AMD Configuration">
+  <!-- AMD -->
+  <settings>
+    <param name="silent_threshold" value="256"/>
+    <param name="silent_initial" value="4500"/>
+    <param name="silent_after_intro" value="2500"/>
+    <param name="silent_max_session" value="200"/>
+    <param name="noise_max_intro" value="1250"/>
+    <param name="noise_min_length" value="120"/>
+    <param name="noise_inter_silence" value="50"/>
+    <param name="noise_max_count" value="3"/>
+    <param name="total_analysis_time" value="5000"/>
+    <param name="ring_timeout" value="36"/>
+    <param name="break_digit" value="#"/>
+    <param name="debug" value="1"/>
+  </settings>
+</configuration>
diff --git a/conf/testing/autoload_configs/conference.conf.xml b/conf/testing/autoload_configs/conference.conf.xml
index 861bf8c1cb..ec2e7d7335 100644
--- a/conf/testing/autoload_configs/conference.conf.xml
+++ b/conf/testing/autoload_configs/conference.conf.xml
@@ -293,6 +293,63 @@
       <param name="video-fps" value="15"/>
     </profile>
 
+    <profile name="video-mcu-stereo-chime-record">
+      <param name="domain" value="$${domain}"/>
+      <param name="rate" value="48000"/>
+      <param name="channels" value="2"/>
+      <param name="interval" value="20"/>
+      <param name="energy-level" value="200"/>
+      <param name="muted-sound" value="conference/conf-muted.wav"/>
+      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+      <param name="alone-sound" value="conference/conf-alone.wav"/>
+      <param name="moh-sound" value="local_stream://video_chime"/>
+      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
+      <param name="locked-sound" value="conference/conf-locked.wav"/>
+      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+      <param name="pin-sound" value="conference/conf-pin.wav"/>
+      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+      <param name="caller-id-name" value="$${outbound_caller_name}"/>
+      <param name="caller-id-number" value="$${outbound_caller_id}"/>
+      <param name="comfort-noise" value="false"/>
+      <param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding"/>
+      <param name="video-mode" value="mux"/> 
+      <param name="video-layout-name" value="3x3"/>
+      <param name="video-layout-name" value="group:grid"/>
+      <param name="video-canvas-size" value="1920x1080"/>
+      <param name="video-canvas-bgcolor" value="#333333"/>
+      <param name="video-layout-bgcolor" value="#000000"/>
+      <param name="video-codec-bandwidth" value="3mb"/>
+      <param name="video-fps" value="15"/>
+      <param name="auto-record" value="/var/www/html/rec/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.mp4"/>
+    </profile>
+
+    <profile name="video-mcu-stereo-passthrough">
+      <param name="domain" value="$${domain}"/>
+      <param name="rate" value="48000"/>
+      <param name="channels" value="2"/>
+      <param name="interval" value="20"/>
+      <param name="energy-level" value="200"/>
+      <param name="muted-sound" value="conference/conf-muted.wav"/>
+      <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+      <param name="alone-sound" value="conference/conf-alone.wav"/>
+      <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+      <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+      <param name="kicked-sound" value="conference/conf-kicked.wav"/>
+      <param name="locked-sound" value="conference/conf-locked.wav"/>
+      <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+      <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+      <param name="pin-sound" value="conference/conf-pin.wav"/>
+      <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+      <param name="caller-id-name" value="$${outbound_caller_name}"/>
+      <param name="caller-id-number" value="$${outbound_caller_id}"/>
+      <param name="comfort-noise" value="false"/>
+      <param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding"/>
+      <param name="video-mode" value="passthrough"/> 
+    </profile>
+
     <profile name="sla">
       <param name="domain" value="$${domain}"/>
       <param name="rate" value="16000"/>
diff --git a/conf/testing/autoload_configs/modules.conf.xml b/conf/testing/autoload_configs/modules.conf.xml
index 31d4a51a31..5e2ce45e8e 100644
--- a/conf/testing/autoload_configs/modules.conf.xml
+++ b/conf/testing/autoload_configs/modules.conf.xml
@@ -29,5 +29,7 @@
     <load module="mod_tone_stream"/>
     <load module="mod_lua"/>
     <load module="mod_say_en"/>
+    <load module="mod_com_amd"/>
+    <load module="mod_com_g729"/>
   </modules>
 </configuration>
diff --git a/conf/testing/dialplan/default/0019_conf.xml b/conf/testing/dialplan/default/0019_conf.xml
index 3743bd4d41..d7eca58528 100644
--- a/conf/testing/dialplan/default/0019_conf.xml
+++ b/conf/testing/dialplan/default/0019_conf.xml
@@ -41,7 +41,7 @@
     <action application="set" data="video_mute_png=/tmp/does_not_exist.png"/>  
     <action application="set" data="video_banner_text={font_face=/tmp/does_not_exist.ttf}${caller_id_name}(${caller_id_number})"/>  
     <action application="set" data="conference_member_flags=moderator"/>
-    <action application="conference" data="6070@video-mcu-stereo"/>  
+    <action application="conference" data="6070@video-mcu-stereo"/>
   </condition>
 </extension>
 
@@ -49,7 +49,23 @@
 <extension name="conf">
   <condition field="destination_number" expression="^6074$">
     <action application="answer"/>  
-    <action application="conference" data="6070@video-mcu-stereo-chime"/>  
+    <action application="conference" data="6070@video-mcu-stereo-chime"/>
+  </condition>
+</extension>
+
+<!-- test video chime list via local_stream in conference -->
+<extension name="conf">
+  <condition field="destination_number" expression="^6075$">
+    <action application="answer"/>  
+    <action application="conference" data="6070@video-mcu-stereo-chime-record"/>
+  </condition>
+</extension>
+
+
+<extension name="conf">
+  <condition field="destination_number" expression="^6076$">
+    <action application="answer"/>  
+    <action application="conference" data="6070@video-mcu-passthrough"/>
   </condition>
 </extension>
 
diff --git a/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml b/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
new file mode 100644
index 0000000000..cec7fe234b
--- /dev/null
+++ b/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
@@ -0,0 +1,21 @@
+<!-- Testing mod_com_amd -->
+<extension name="amd_example" continue="false">
+  <condition field="destination_number" expression="^6090$">
+    <action application="set" data="media_bug_answer_req=true"/>
+    <action application="set" data="amd_execute_on_machine=transfer machine_detected XML default"/>
+    <action application="voice_start"/>
+    <action application="waitforresult"/>
+    <action application="info"/>
+    <action application="hangup"/>
+  </condition>
+</extension>
+
+<extension name="Found machine">
+  <condition field="destination_number" expression="^(machine_detected)$">
+    <action application="wait_for_silence" data="300 30 5 25000"/>
+    <action application="sleep" data="8000"/>
+    <action application="playback" data="$${sounds_dir}/en/us/callie/ivr/8000/ivr-welcome_to_freeswitch.wav"/>
+    <action application="info"/>
+    <action application="hangup"/>
+  </condition>
+</extension>
diff --git a/conf/testing/sip_profiles/external.xml b/conf/testing/sip_profiles/external.xml
index faaffad2e7..6edc878c06 100644
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@@ -2,7 +2,7 @@
   <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
   <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <NOPRE-PROCESS cmd="include" data="external/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="external/*.xml"/>
   </gateways>
 
   <aliases>