summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2011-07-20 23:14:09 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-05-02 19:24:30 +0200
commitb6a077e888de1f4d4a862e33699387d2bd7bf9ba (patch)
tree176d46a4a03b43d8be4147d54433d43841940298
parent56d7809215ca36c1da674b2dcf3b05bacec496d6 (diff)
audio: Remove the hardcoding of the RTP Payload
The MGCP config must be correct and use 99 for RTP AMR.
-rw-r--r--openbsc/include/openbsc/gsm_data.h1
-rw-r--r--openbsc/src/libbsc/abis_rsl.c4
-rw-r--r--openbsc/src/osmo-bsc/osmo_bsc_audio.c1
3 files changed, 0 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index a08f831ad..2ce6905ed 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -283,7 +283,6 @@ struct gsm_network {
/* MSC data in case we are a true BSC */
struct osmo_bsc_data *bsc_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 d74907b0a..3df3a0dc4 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -1522,10 +1522,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;
}