don't use Siren or iLBC by default in example configs

These codecs are non-free which creates issues for distributions, so
let's not require these by default to run our example configs.  We can
add back in iLBC once we resolve the licensing situation with our
in-tree implementation.

diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml
index 8793a003badc593349e8759df414793d94ae2674..3c864aec1c318dca96ddaebcb2927c884621a5e9 100644 (file)
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -60,7 +60,7 @@
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
-    <load module="mod_ilbc"/>
+    <!--<load module="mod_ilbc"/>-->
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
     <!--<load module="mod_siren"/>-->

diff --git a/conf/sbc/autoload_configs/modules.conf.xml b/conf/sbc/autoload_configs/modules.conf.xml
index 31b96dd27a92b2f15ef7fc6178667ecd80672aa7..fb59b386be9f41bd39fde752e32b5064a9fc6a52 100644 (file)
--- a/conf/sbc/autoload_configs/modules.conf.xml
+++ b/conf/sbc/autoload_configs/modules.conf.xml
@@ -39,7 +39,7 @@
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
-    <load module="mod_ilbc"/>
+    <!--<load module="mod_ilbc"/>-->
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
     <!--<load module="mod_siren"/>-->

diff --git a/conf/softphone/freeswitch.xml b/conf/softphone/freeswitch.xml
index 00a2bc31cb263ed3fc267b7d1836fb6388ffe23d..66e7c2a9237a3df05a3d49c89a0ba26a99ab1792 100644 (file)
--- a/conf/softphone/freeswitch.xml
+++ b/conf/softphone/freeswitch.xml
@@ -3,7 +3,7 @@
   <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
-  <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+  <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G722,PCMU,PCMA,GSM"/>
   <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
   <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
@@ -86,10 +86,8 @@
        <load module="mod_dptools"/>
        <load module="mod_dialplan_xml"/>
        <load module="mod_voipcodecs"/>
-       <load module="mod_ilbc"/>
        <load module="mod_speex"/>
        <load module="mod_celt"/>
-       <load module="mod_siren"/>
        <load module="mod_sndfile"/>
        <load module="mod_tone_stream"/>
        <load module="mod_local_stream"/>

diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index 266b32204a0e65fa6e2b553a332bead53c4bedb7..f88bb7b7c0df15bc760f3431ea58e4605a9aeab4 100644 (file)
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -82,10 +82,10 @@
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
-    <load module="mod_ilbc"/>
+    <!--<load module="mod_ilbc"/>-->
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
-    <load module="mod_siren"/>
+    <!--<load module="mod_siren"/>-->
     <!--<load module="mod_isac"/>-->
     <!--<load module="mod_celt"/>-->
     <!--<load module="mod_opus"/>-->

diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml
index 4f13a61fbb5c89d573d5ee58b85d6aff6caa63ee..907c6f101584d0d7147317f8697f5172f82bd250 100644 (file)
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@@ -123,7 +123,7 @@
        127 - BV32
 
   -->
-  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/>
   <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/>
 
   <!--