diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-04-28 16:57:12 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-04-28 17:04:56 +0200 |
| commit | 36a3b0d85b514b92052ac2f85d4afa53780304e5 (patch) | |
| tree | 4638e62a39f92fb740b1f90cda193134a119ee51 /src/osmo-bts-sysmo/oml.c | |
| parent | 36179bbcdf9407bcc4c06f7608f28e0dfcc29861 (diff) | |
sysmo-bts: Move the payload setting into a new method
Make this code a bit easier to read by moving the payload setting
into a new method.
Diffstat (limited to 'src/osmo-bts-sysmo/oml.c')
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index f46a2ce6..b1b0aa13 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -531,6 +531,17 @@ static void clear_amr_params(GsmL1_LogChParam_t *lch_par) lch_par->tch.amrActiveCodecSet[j] = GsmL1_AmrCodec_Unset; } +static void set_payload_format(GsmL1_LogChParam_t *lch_par) +{ +#ifdef L1_HAS_RTP_MODE +#ifdef USE_L1_RTP_MODE + lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_Rtp; +#else + lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_If2; +#endif /* USE_L1_RTP_MODE */ +#endif /* L1_HAS_RTP_MODE */ +} + static void lchan2lch_par(GsmL1_LogChParam_t *lch_par, struct gsm_lchan *lchan) { int j; @@ -553,35 +564,17 @@ static void lchan2lch_par(GsmL1_LogChParam_t *lch_par, struct gsm_lchan *lchan) lch_par->tch.tchPlType = GsmL1_TchPlType_Fr; else lch_par->tch.tchPlType = GsmL1_TchPlType_Hr; -#ifdef L1_HAS_RTP_MODE -#ifdef USE_L1_RTP_MODE - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_Rtp; -#else - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_If2; -#endif /* USE_L1_RTP_MODE */ -#endif /* L1_HAS_RTP_MODE */ + set_payload_format(lch_par); clear_amr_params(lch_par); break; case GSM48_CMODE_SPEECH_EFR: lch_par->tch.tchPlType = GsmL1_TchPlType_Efr; -#ifdef L1_HAS_RTP_MODE -#ifdef USE_L1_RTP_MODE - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_Rtp; -#else - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_If2; -#endif /* USE_L1_RTP_MODE */ -#endif /* L1_HAS_RTP_MODE */ + set_payload_format(lch_par); clear_amr_params(lch_par); break; case GSM48_CMODE_SPEECH_AMR: lch_par->tch.tchPlType = GsmL1_TchPlType_Amr; -#ifdef L1_HAS_RTP_MODE -#ifdef USE_L1_RTP_MODE - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_Rtp; -#else - lch_par->tch.tchPlFmt = GsmL1_TchPlFmt_If2; -#endif /* USE_L1_RTP_MODE */ -#endif /* L1_HAS_RTP_MODE */ + set_payload_format(lch_par); lch_par->tch.amrCmiPhase = GsmL1_AmrCmiPhase_Odd; /* FIXME? */ lch_par->tch.amrInitCodecMode = amr_get_initial_mode(lchan); |