diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-22 18:22:44 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-22 18:22:44 +0200 |
| commit | 128892f55f23ac24e6eb786ca3cf0841fbc45fd2 (patch) | |
| tree | 866fc7fee30cd3d914f881a6900cbd044ea613f1 /openbsc | |
| parent | 3488c3ddc46d74b7b2bbc879692dbf6e7ad2ecc3 (diff) | |
audio: Remove the hardcoding of the RTP Payload
The MGCP config must be correct and use 99 for RTP AMR.
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 1 | ||||
| -rw-r--r-- | openbsc/src/libbsc/abis_rsl.c | 4 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_audio.c | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 20b8fe720..f74ece8fb 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -284,7 +284,6 @@ struct gsm_network { /* MSC data in case we are a true BSC */ struct osmo_msc_data *msc_data; - int hardcoded_rtp_payload; /* subscriber related features */ int keep_subscr; diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index b4babc301..2ce900c51 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -1580,10 +1580,6 @@ static uint8_t ipa_rtp_pt_for_lchan(struct gsm_lchan *lchan) { struct gsm_network *net = lchan->ts->trx->bts->network; - /* allow to hardcode the rtp payload */ - if (net->hardcoded_rtp_payload != 0) - return net->hardcoded_rtp_payload; - switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: switch (lchan->type) { diff --git a/openbsc/src/osmo-bsc/osmo_bsc_audio.c b/openbsc/src/osmo-bsc/osmo_bsc_audio.c index 64260aa88..ed0ece761 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_audio.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_audio.c @@ -64,7 +64,6 @@ static int handle_abisip_signal(unsigned int subsys, unsigned int signal, int osmo_bsc_audio_init(struct gsm_network *net) { - net->hardcoded_rtp_payload = 98; osmo_signal_register_handler(SS_ABISIP, handle_abisip_signal, net); return 0; } |