diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-07-24 21:24:29 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-07-25 09:22:29 +0200 |
| commit | 3674645e20d23d37269ee9226363f94bbde4b5c6 (patch) | |
| tree | 712207c7fdbfbbf2d1ff062bf2ecbcfa6a5b61ba /include | |
| parent | a2b806c375dc6b3e3b7df0496e06b34b1520bd1b (diff) | |
amr: Avoid toggling the CMR from none and a set one
For LCR and other systems without out-of-band information we need
to indicate the CMR. Not every air message will include the mode
and we sent a stream that had the CMR set and not-set. This lead
to the AudioCodes MGW only playing every second frame.
Remember the last used mode and initialize it to _NONE when we
receive the multirate config. In case of a real error we will
still use AMR_CMR_NONE.
The initial patch is from Harald. I have added the initialization
and moving of the defines to amr.h.
Manually verified by enabling AMR5.9 and looking at two RTP
packages in sequence. In both cases the CMR was 2. I have looked
at "amr.nb.cmr != 2" in wireshark and only found the MGCP dummy
packet.
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmo-bts/amr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/osmo-bts/amr.h b/include/osmo-bts/amr.h index 059f2e03..ba66e4df 100644 --- a/include/osmo-bts/amr.h +++ b/include/osmo-bts/amr.h @@ -3,6 +3,9 @@ #include <osmo-bts/gsm_data.h> +#define AMR_TOC_QBIT 0x04 +#define AMR_CMR_NONE 0xF + void amr_log_mr_conf(int ss, int logl, const char *pfx, struct amr_multirate_conf *amr_mrc); |