AMR modes: make better use of 'adaptive' in amr

modules/rhizo_base/files/etc/freeswitch/autoload_configs/amr.conf.xml

@@ -3,7 +3,7 @@
   <settings name="default">
     <!-- AMR mode set (see RFC 4867) -->
     <!-- param name="mode-set" value="0,1,2,3,4,5,6,7" /-->
-    <param name="mode-set" value="4" />
+    <param name="mode-set" value="0,1,3,5,6,7" />
 
     <!-- enable octet alignment -->
     <param name="octet-align" value="1"/>
@@ -13,6 +13,6 @@
 
     <!-- enable discontinuous transmission -->
     <param name="dtx" value="false"/>
-    <param name="default-bitrate" value="4"/>
+    <param name="default-bitrate" value="5"/>
   </settings>
 </configuration>

modules/rhizo_base/templates/osmo-bsc-bts.erb

@@ -30,18 +30,18 @@
 <% if bts["lte_n"] -%>  si2quater neighbor-list add earfcn <%= bts["lte_n"] %> thresh-hi 4 thresh-lo 32 prio 7 qrxlv 32 meas 6
 <% end -%>
   codec-support fr amr
-  amr tch-f modes 4 5 7
+  amr tch-f modes 3 5 6 7
   amr tch-f threshold ms 12 31 37
   amr tch-f hysteresis ms 4 4 4
   amr tch-f threshold bts 12 31 37
   amr tch-f hysteresis bts 4 4 4
-  amr tch-f start-mode auto
-  amr tch-h modes 4
+  amr tch-f start-mode 2
+  amr tch-h modes 0 1 3 5
   amr tch-h threshold ms 4 6 8
   amr tch-h hysteresis ms 4 4 4
   amr tch-h threshold bts 4 6 8
   amr tch-h hysteresis bts 4 4 4
-  amr tch-h start-mode auto
+  amr tch-h start-mode 3
   gprs mode <%= bts["gprs_m"] %>
   gprs routing area 21
   gprs network-control-order nc0

modules/rhizo_base/templates/osmo-bsc-tail.erb

@@ -8,13 +8,13 @@ msc 0
 <% end -%>
  allow-emergency allow
  amr-config 12_2k allowed
- amr-config 10_2k forbidden
+ amr-config 10_2k allowed
  amr-config 7_95k allowed
- amr-config 7_40k allowed
+ amr-config 7_40k forbidden
  amr-config 6_70k allowed
  amr-config 5_90k forbidden
  amr-config 5_15k allowed
- amr-config 4_75k forbidden
+ amr-config 4_75k allowed
  amr-payload octet-aligned
  asp-protocol m3ua
  lcls-mode <% if @lcls == '1' -%>bts-loop<% else %>disabled<% end %>