BSC: Improve Codec config

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

@@ -28,18 +28,18 @@
 <% end -%>
 <% end -%>
   codec-support fr amr
-  amr tch-f modes 4 5
+  amr tch-f modes 3 4 5
   amr tch-f threshold ms 32
   amr tch-f hysteresis ms 8
   amr tch-f threshold bts 32
   amr tch-f hysteresis bts 8
-  amr tch-f start-mode 1
-  amr tch-h modes 4 5
+  amr tch-f start-mode 3
+  amr tch-h modes 2 3 4 5
   amr tch-h threshold ms 32
   amr tch-h hysteresis ms 8
   amr tch-h threshold bts 32
   amr tch-h hysteresis bts 8
-  amr tch-h start-mode 1
+  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-head.erb

@@ -83,7 +83,7 @@ network
  handover2 penalty-time failed-ho 5
  handover2 penalty-time failed-assignment 5
  handover2 congestion-check 30
-<% if @mncc_codec != 'GSM' -%>
+<% if @mncc_codec == 'AMR' -%>
  dyn_ts_allow_tch_f 0
 <% end -%>
  timer net T3113 50

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

@@ -1,13 +1,15 @@
 msc 0
 <% if @mncc_codec == 'GSM' -%>
  codec-list fr1
+<% elsif (@mncc_codec == 'GSM:AMR' or @mncc_codec == 'AMR:GSM') -%>
+ codec-list fr1 fr3 hr3
 <% else -%>
- codec-list hr3 fr3
+ codec-list fr3 hr3
 <% end -%>
  allow-emergency allow
  amr-config 12_2k forbidden
  amr-config 10_2k forbidden
- amr-config 7_95k forbidden
+ amr-config 7_95k allowed
  amr-config 7_40k allowed
  amr-config 6_70k allowed
  amr-config 5_90k allowed