diff options
-rw-r--r-- | include/osmocom/bsc/bsc_msc_data.h | 1 | ||||
-rw-r--r-- | src/osmo-bsc/mgw_endpoint_fsm.c | 19 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_vty.c | 23 |
3 files changed, 43 insertions, 0 deletions
diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 520217404..debd24087 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -79,6 +79,7 @@ struct bsc_msc_data { /* audio codecs */ struct gsm48_multi_rate_conf amr_conf; + bool amr_octet_aligned; struct gsm_audio_support **audio_support; int audio_length; enum bsc_lcls_mode lcls_mode; diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c index fc49886c3..5462914fb 100644 --- a/src/osmo-bsc/mgw_endpoint_fsm.c +++ b/src/osmo-bsc/mgw_endpoint_fsm.c @@ -34,6 +34,7 @@ #include <osmocom/bsc/mgw_endpoint_fsm.h> #include <osmocom/bsc/lchan_fsm.h> #include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bsc_msc_data.h> #define LOG_CI(ci, level, fmt, args...) do { \ if (!ci || !ci->mgwep) \ @@ -774,4 +775,22 @@ void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *l verb_info->ptmap[0].pt = custom_pt; verb_info->ptmap_len = 1; } + + /* AMR requires additional parameters to be set up (framing mode) */ + if (verb_info->codecs[0] == CODEC_AMR_8000_1) { + verb_info->param_present = true; + verb_info->param.amr_octet_aligned_present = true; + } + + if (bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) { + /* FIXME: At the moment all BTSs we support are using the + * octet-aligned payload format. However, in the future + * we may support BTSs that are using bandwith-efficient + * format. In this case we will have to add functionality + * that distinguishes by the BTS model which mode to use. */ + verb_info->param.amr_octet_aligned = true; + } + else if (!bss_side && verb_info->codecs[0] == CODEC_AMR_8000_1) { + verb_info->param.amr_octet_aligned = lchan->conn->sccp.msc->amr_octet_aligned; + } } diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 6e3d1c190..78196cfc4 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -100,6 +100,11 @@ static void write_msc_amr_options(struct vty *vty, struct bsc_msc_data *msc) WRITE_AMR(vty, msc, "5_15k", m5_15); WRITE_AMR(vty, msc, "4_75k", m4_75); #undef WRITE_AMR + + if (msc->amr_octet_aligned) + vty_out(vty, " amr-payload octet-aligned%s", VTY_NEWLINE); + else + vty_out(vty, " amr-payload bandwith-efficient%s", VTY_NEWLINE); } static void write_msc(struct vty *vty, struct bsc_msc_data *msc) @@ -952,6 +957,23 @@ DEFUN_DEPRECATED(cfg_net_msc_dest, cfg_net_msc_dest_cmd, ALIAS_DEPRECATED(cfg_net_msc_dest, cfg_net_msc_no_dest_cmd, "no dest A.B.C.D <1-65000> <0-255>", NO_STR LEGACY_STR "-\n" "-\n" "-\n"); +DEFUN(cfg_net_msc_amr_octet_align, + cfg_net_msc_amr_octet_align_cmd, + "amr-payload (octet-aligned|bandwith-efficient", + "Set AMR payload framing mode\n" + "payload fields aligned on octet boundaries\n" + "payload fields packed (AoIP)\n") +{ + struct bsc_msc_data *data = bsc_msc_data(vty); + + if (strcmp(argv[0], "octet-aligned") == 0) + data->amr_octet_aligned = true; + else if (strcmp(argv[0], "bandwith-efficient") == 0) + data->amr_octet_aligned = false; + + return CMD_SUCCESS; +} + int bsc_vty_init_extra(void) { struct gsm_network *net = bsc_gsmnet; @@ -996,6 +1018,7 @@ int bsc_vty_init_extra(void) install_element(MSC_NODE, &cfg_net_msc_amr_5_90_cmd); install_element(MSC_NODE, &cfg_net_msc_amr_5_15_cmd); install_element(MSC_NODE, &cfg_net_msc_amr_4_75_cmd); + install_element(MSC_NODE, &cfg_net_msc_amr_octet_align_cmd); install_element(MSC_NODE, &cfg_net_msc_lcls_mode_cmd); install_element(MSC_NODE, &cfg_net_msc_lcls_mismtch_cmd); install_element(MSC_NODE, &cfg_msc_acc_lst_name_cmd); |