September 2022 - gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: osmux: Support local CID != remote CID

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29465 ) Change subject: osmux: Support local CID != remote CID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6b03eabc0305580c9788c529bec7dda9044a008f Gerrit-Change-Number: 29465 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Sep 2022 17:06:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: Use bool type instead of int in config field

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29463 ) Change subject: Use bool type instead of int in config field ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie2624a6a6848c3c88deb39760317860d8074acb9 Gerrit-Change-Number: 29463 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Sep 2022 17:03:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Rename field osmux usage policy and define it with proper type

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29462 ) Change subject: osmux: Rename field osmux usage policy and define it with proper type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7f41a443f488b75df792597ec3cec8f7e97a7411 Gerrit-Change-Number: 29462 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Sep 2022 17:03:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmocore[master]: add gsm0808_amr_modes_from_cfg

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29473 ) Change subject: add gsm0808_amr_modes_from_cfg ...................................................................... Patch Set 1: (20 comments) File src/gsm/gsm0808.c: Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/57243faa_a832caed PS1, Line 2006: [ 0] = B(4_75), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/1366b73c_5a37b1d7 PS1, Line 2007: [ 1] = B(4_75) | B(5_90) | B(7_40), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/313dfbf0_5601bbfc PS1, Line 2008: [ 2] = B(5_90), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/9b80945f_17a1253d PS1, Line 2009: [ 3] = B(6_70), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/a7b1cb1e_d58206aa PS1, Line 2010: [ 4] = B(7_40), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/7886184e_a2d57c8d PS1, Line 2011: [ 5] = B(7_95), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/0f495742_656d237e PS1, Line 2012: [ 6] = 0, space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/ec2f9441_6f1b2757 PS1, Line 2013: [ 7] = 0, space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/841ef9da_23475e6c PS1, Line 2015: [ 8] = B(4_75) | B(5_90), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/20eeceaa_ee4af5a1 PS1, Line 2016: [ 9] = B(4_75) | B(5_90) | B(6_70), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/5d213229_52bdff2c PS1, Line 2027: [ 0] = B(4_75), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/dae4ab19_2669b899 PS1, Line 2028: [ 1] = B(4_75) | B(5_90) | B(7_40) | B(12_2), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/16480384_d52e3450 PS1, Line 2029: [ 2] = B(5_90), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/ad966da8_48194508 PS1, Line 2030: [ 3] = B(6_70), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/519c3762_0eb7e840 PS1, Line 2031: [ 4] = B(7_40), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/222930af_4590af2d PS1, Line 2032: [ 5] = B(7_95), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/95f8b42b_6ddd0b9f PS1, Line 2033: [ 6] = B(10_2), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/996e53a6_6b48301f PS1, Line 2034: [ 7] = B(12_2), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/36ab1e68_b4cdf022 PS1, Line 2036: [ 8] = B(4_75) | B(5_90), space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmocore-lint-509): https://gerrit.osmocom.org/c/libosmocore/+/29473/comment/c6a918bd_41ed2735 PS1, Line 2037: [ 9] = B(4_75) | B(5_90) | B(6_70), space prohibited after that open square bracket '[' -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 Gerrit-Change-Number: 29473 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Sep 2022 16:53:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmocore[master]: [RFC] fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29475 ) Change subject: [RFC] fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion ...................................................................... [RFC] fix gsm0808_sc_cfg <-> gsm48_mr_cfg conversion This is a REQUEST FOR COMMENTS. I am fairly certain that the conversion between mr_cfg and gsm0808_sc needs fixing, but I do not feel sufficiently certain that what this patch does is the best choice. Deprecate gsm0808_sc_cfg_from_gsm48_mr_cfg() and gsm48_mr_cfg_from_gsm0808_sc_cfg(), and add new functions gsm0808_sc_cfg_from_modes() and gsm0808_sc_cfg_get_best_modes() to fix the behavior as follows: When the mr_cfg enables a specific rate, do not include all AMR configurations that feature this rate. Instead, enable only those configurations that are a subset of the mr_cfg. Before this patch, for example, setting only m4_75 = true would result in enabling all of S0, S8, S9, S10, S12, S14. S14 would allow all of 4.75k, 5.9k, 7.95k, 12.2k, instead of limiting to 4.75k only. This change in behavior has potential repercussions on osmo-bsc installations, where now only those AMR modes listed in the config will be used -- we are becoming stricter. Possibly this deteriorates or breaks sites from upgrading libosmocore alone -- i.e. those sites that fail to list an essential AMR rate for matching with peers, but where that essential AMR rate was erratically allowed by the bug. For that reason, keep the current gsm0808_sc_cfg_from_gsm48_mr_cfg() unchanged, yielding incorrect behavior, and let the API users decide when and how to fix this behavior. The old behavior, by example of osmo-bsc: - It is not possible to freely pick rates. - Picking rates in osmo-bsc.cfg has non-obvious behavior, often including rates that are configured as 'forbidden'. - If any of 4.75, 5.90, 7.40, 12.2 is enabled in osmo-bsc.cfg, the configuration S1 ends up enabled in s15_s0 (gsm0808_sc_cfg_from_gsm48_mr_cfg()). - In gsm48_mr_cfg_from_gsm0808_sc_cfg() used during channel activation, if S1 is present, the four rates from S1 are returned. - In summary, in the vast majority of cases, the S1 set will be used -- even if only one of its AMR rates is originally present in mr_cfg. - Configurations above S7 are ignored. The new behavior: - It is not possible to freely pick rates. - Only one of the rate combinations defined by S0..S15 is going to be used. This is mainly because AMR rate selections are sent to the MSC and back from the MSC in the somewhat limited S0..S15 bit form. Enabling one or more of these combinations of rates in osmo-bsc.cfg makes sense: - 4.75, 5.90, 7.40, 12.2 (S1) - 4.75, 5.90 (S8) - 4.75, 5.90, 6.70 (S9) - 4.75, 5.90, 6.70, 7.40 (S10) - 4.75, 5.90, 6.70, 10.2 (S12) - 4.75, 5.90, 7.95, 12.2 (S14) - e.g. if only 4.75 is enabled, only 4.75 is used (S0). - e.g. in case of 6.70=allowed + 7.75=allowed + 10.2=allowed, we have to choose between "only 6.70", "only 7.75", "only 10.2". On FR we'll pick S6 = "only 10.2", because it is the highest rate. Related: SYS#5066 Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a --- M TODO-RELEASE M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 201 insertions(+), 168 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/29475/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..d5bde1a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm gsm0808_sc_cfg_from_gsm48_mr_cfg() Deprecate; replacement is gsm0808_sc_cfg_from_modes(). +libosmogsm gsm48_mr_cfg_from_gsm0808_sc_cfg() Deprecate; replacement is gsm0808_sc_cfg_get_best_modes(). diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 6abfeec..42d42cc 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -144,8 +144,15 @@ int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); -int gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, uint16_t s15_s0); + +uint16_t gsm0808_sc_cfg_from_modes(uint8_t modes, bool full_rate); +uint8_t gsm0808_sc_cfg_get_all_modes(uint16_t s15_s0, bool full_rate); +uint8_t gsm0808_sc_cfg_get_best_modes(uint16_t s15_s0, bool full_rate); + +uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr) + OSMO_DEPRECATED("use gsm0808_sc_cfg_from_gsm48_mr_cfg2() with fixed behavior"); +int gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, uint16_t s15_s0) + OSMO_DEPRECATED("use gsm48_mr_cfg_from_gsm0808_sc_cfg_all() or gsm48_mr_cfg_from_gsm0808_sc_cfg_four"); /*! \returns 3GPP TS 08.08 §3.2.2.5 Class of a given Cause */ static inline enum gsm0808_cause_class gsm0808_cause_class(enum gsm0808_cause cause) diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index ea77e76..1c446d9 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -622,6 +622,16 @@ #endif } __attribute__((packed)); +static inline uint8_t gsm48_multi_rate_conf_get_modes(const struct gsm48_multi_rate_conf *cfg) +{ + return ((uint8_t *)cfg)[1]; +} + +static inline void gsm48_multi_rate_conf_set_modes(struct gsm48_multi_rate_conf *cfg, uint8_t modes) +{ + ((uint8_t *)cfg)[1] = modes; +} + /* Chapter 10.5.2.28(a) */ struct gsm48_power_cmd { #if OSMO_IS_LITTLE_ENDIAN diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index f1569c9..e963313 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1588,8 +1588,96 @@ return 0; } -/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a - * given GSM 04.08 AMR configuration struct. +/*! Determine a set of AMR speech codec configuration bits (S0-S15) from a given set of AMR modes. + * Enable each of the S0..S15 bits that is a subset of the given modes. + * In other words, there must be no S0..S15 bit enabled that includes a mode that is disabled in modes. + * See 3GPP TS 28.062 Table 7.11.3.1.3-2, where each column defines one of the S0..S15 bits. + * The bits in 'modes' are a binary match for the mX_XX flags in struct gsm48_multi_rate_conf.mX_XX. + * + * Example: + * uint8_t modes = gsm48_multi_rate_conf_get_modes(my_cfg); + * uint16_t s15_s0 = gsm0808_sc_cfg_from_modes(modes, full_rate); + * + * \param[in] modes Set of modes, bitmask of (1 << GSM0808_AMR_MODE_4_75) | (1 << GSM0808_AMR_MODE_5_90) | ... + * \param[in] full_rate When false, apply special HR AMR exceptions. + * \returns configuration bits (S0-S15) */ +uint16_t gsm0808_sc_cfg_from_modes(uint8_t modes, bool full_rate) +{ + uint16_t s15_s0 = 0; + int s_bit; + + for (s_bit = 0; s_bit < 16; s_bit++) { + uint8_t s_modes = gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][s_bit]; + /* When s_modes is a non-zero subset of cfg_modes, add this configuration to s15_s0. */ + if (s_modes && ((s_modes & modes) == s_modes)) + s15_s0 |= (1 << s_bit); + } + return s15_s0; +} + +/*! Return all AMR modes present in any of the given s15_s0 configurations. + * The returned bits are a binary match for the mX_XX flags in struct gsm48_multi_rate_conf.mX_XX. + * + * Example: + * uint8_t modes = gsm0808_sc_cfg_get_all_modes(s15_s0, full_rate); + * gsm48_multi_rate_conf_set_modes(&my_cfg, modes); + * + * \param[in] s15_s0 S15-S0 configuration bits, see gsm0808_amr_modes_from_cfg. + * \param[in] full_rate When false, return only modes compatible with HR AMR, and only observe Sn bits marked as + * supported by HR AMR, as in gsm0808_amr_modes_from_cfg. + * \return Bitmask of modes present in s15_s0, as in (1 << GSM0808_AMR_MODE_X_XX). + */ +uint8_t gsm0808_sc_cfg_get_all_modes(uint16_t s15_s0, bool full_rate) +{ + uint8_t modes = 0; + int s_bit; + for (s_bit = 0; s_bit < 16; s_bit++) { + if (!(s15_s0 & s_bit)) + continue; + modes |= gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][s_bit]; + } + return modes; +} + +/*! Return "the best choice" of at most four AMR modes present in the given s15_s0 configurations. + * This is useful to determine which four modes to send in the MR CFG IE during GSM channel activation. + * + * "The best choice": return the modes for the highest bit present in s15_s0 (that is supported / is non-empty), with + * the exception: favor S1 over S0, S2..S9 -- S1 has a more favorable variety of rates than the latter ones. + * + * Apply limitations of GSM, according to full_rate; see gsm0808_amr_modes_from_cfg for an explanation. + * + * Example: + * uint8_t modes = gsm0808_sc_cfg_get_four_modes(s15_s0, full_rate); + * gsm48_multi_rate_conf_set_modes(&my_cfg, modes); + * + * \param[in] s15_s0 S15-S0 configuration bits, see gsm0808_amr_modes_from_cfg. + * \param[in] full_rate When false, return only modes compatible with HR AMR, and only observe Sn bits marked as + * supported by HR AMR, as in gsm0808_amr_modes_from_cfg. + * \return Bitmask of modes chosen from s15_s0, as in (1 << GSM0808_AMR_MODE_X_XX). + */ +uint8_t gsm0808_sc_cfg_get_best_modes(uint16_t s15_s0, bool full_rate) +{ + const int s_bit_preference[] = { 15, 14, 13, 12, 11, 10, 1, 9, 8, 7, 6, 5, 4, 3, 2, 0 }; + int i; + uint8_t modes = 0; + for (i = 0; (!modes) && (i < ARRAY_SIZE(s_bit_preference)); i++) { + int s_bit = s_bit_preference[i]; + if (!(s15_s0 & s_bit)) + continue; + modes = gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][s_bit]; + } + return modes; +} + +/*! Deprecated, use gsm0808_sc_cfg_from_modes(); The following code is an equivalent replacement for a call to + * s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, fr): + * + * s15_s0 = gsm0808_sc_cfg_from_modes(gsm48_multi_rate_conf_get_modes(cfg), fr); + * + * Determine a set of AMR speech codec configuration bits (S0-S15) from a given GSM 04.08 AMR configuration struct. + * Enable all those AMR configurations where at least one of its AMR rates is enabled in cfg. + * This is usually undesired behavior, use gsm0808_sc_cfg_from_modes() instead. * \param[in] cfg AMR configuration in GSM 04.08 format. * \param[in] hint if the resulting configuration shall be used with a FR or HR TCH. * \returns configuration bits (S0-S15) */ @@ -1641,7 +1729,13 @@ return s15_s0; } -/*! Determine a GSM 04.08 AMR configuration struct from a set of speech codec +/*! Deprecated, use gsm0808_sc_cfg_get_best_modes(); The following code is an equivalent replacement for a call to + * gsm0808_sc_cfg_get_best_modes(cfg, s15_s0): + * + * *cfg = (struct gsm48_multi_rate_conf){ .ver = 1, .icmi = 1 }; + * gsm48_multi_rate_conf_set_modes(cfg, gsm0808_sc_cfg_get_best_modes(s15_s0, true)); + * + * Determine a GSM 04.08 AMR configuration struct from a set of speech codec * configuration bits (S0-S15) * \param[out] cfg AMR configuration in GSM 04.08 format. * \param[in] s15_s0 configuration bits (S15-S0, non-ambiguous). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index aa5df90..91db801 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -244,6 +244,9 @@ gsm0808_cell_id_matches_list; gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; +gsm0808_sc_cfg_from_modes; +gsm0808_sc_cfg_get_all_modes; +gsm0808_sc_cfg_get_best_modes; gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm48_mr_cfg_from_gsm0808_sc_cfg; gsm0808_amr_modes_from_cfg; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 1ab836d..193027c 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1940,11 +1940,11 @@ printf("Input:\n"); print_mr_cfg(cfg); - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); + s15_s0 = gsm0808_sc_cfg_from_modes(gsm48_multi_rate_conf_get_modes(cfg), true); printf("Result (fr):\n"); print_s15_s0(s15_s0, true); - s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); + s15_s0 = gsm0808_sc_cfg_from_modes(gsm48_multi_rate_conf_get_modes(cfg), false); printf("Result (hr):\n"); print_s15_s0(s15_s0, false); @@ -1955,7 +1955,7 @@ { struct gsm48_multi_rate_conf cfg; - printf("Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():\n"); + printf("Testing gsm0808_sc_cfg_from_modes():\n"); memset(&cfg, 0, sizeof(cfg)); @@ -2144,25 +2144,21 @@ static void test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single(uint16_t s15_s0) { struct gsm48_multi_rate_conf cfg; - int rc; printf("Input:\n"); print_s15_s0(s15_s0, true); - rc = gsm48_mr_cfg_from_gsm0808_sc_cfg(&cfg, s15_s0); + gsm48_multi_rate_conf_set_modes(&cfg, gsm0808_sc_cfg_get_best_modes(s15_s0, true)); printf("Output:\n"); print_mr_cfg(&cfg); - if (rc != 0) - printf(" Result invalid!\n"); - printf("\n"); } void test_gsm48_mr_cfg_from_gsm0808_sc_cfg() { - printf("Testing gsm48_mr_cfg_from_gsm0808_sc_cfg():\n"); + printf("Testing gsm0808_sc_cfg_get_best_modes():\n"); /* Test with settings as defined in 3GPP TS 28.062, Table 7.11.3.1.3-2, * (up to four codecs may become selected) */ diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 74baaca..dd1387b 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -85,7 +85,7 @@ test_gsm0808_enc_dec_cell_id_ci: encoded: 05 03 02 04 23 (rc = 5) test_gsm0808_enc_dec_cell_id_lac_and_ci: encoded: 05 05 01 04 23 02 35 (rc = 7) test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) -Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): +Testing gsm0808_sc_cfg_from_modes(): Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 @@ -98,19 +98,11 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x5701 = 0b0101011100000001 + S15-S0 = 0x0001 = 0b0000000000000001 S0 4.75 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0701 = 0b0000011100000001 + S15-S0 = 0x0001 = 0b0000000000000001 S0 4.75 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 @@ -124,54 +116,38 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x5704 = 0b0101011100000100 + S15-S0 = 0x0004 = 0b0000000000000100 S2 5.90 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0704 = 0b0000011100000100 + S15-S0 = 0x0004 = 0b0000000000000100 S2 5.90 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x1608 = 0b0001011000001000 + S15-S0 = 0x0008 = 0b0000000000001000 S3 6.70 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 Result (hr): - S15-S0 = 0x0608 = 0b0000011000001000 + S15-S0 = 0x0008 = 0b0000000000001000 S3 6.70 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x0410 = 0b0000010000010000 + S15-S0 = 0x0010 = 0b0000000000010000 S4 7.40 - S10 4.75 5.90 6.70 7.40 Result (hr): - S15-S0 = 0x0410 = 0b0000010000010000 + S15-S0 = 0x0010 = 0b0000000000010000 S4 7.40 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x4020 = 0b0100000000100000 + S15-S0 = 0x0020 = 0b0000000000100000 S5 7.95 - S14 4.75 5.90 7.95 12.2 Result (hr): S15-S0 = 0x0020 = 0b0000000000100000 S5 7.95 @@ -180,9 +156,8 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 Result (fr): - S15-S0 = 0x1040 = 0b0001000001000000 + S15-S0 = 0x0040 = 0b0000000001000000 S6 10.2 - S12 4.75 5.90 6.70 10.2 Result (hr): S15-S0 = 0x0000 = 0b0000000000000000 @@ -190,9 +165,8 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 0x4080 = 0b0100000010000000 + S15-S0 = 0x0080 = 0b0000000010000000 S7 12.2 - S14 4.75 5.90 7.95 12.2 Result (hr): S15-S0 = 0x0000 = 0b0000000000000000 @@ -200,128 +174,92 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=1 m5_90=1 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x570d = 0b0101011100001101 + S15-S0 = 0x030d = 0b0000001100001101 S0 4.75 S2 5.90 S3 6.70 S8 4.75 5.90 S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x070d = 0b0000011100001101 + S15-S0 = 0x030d = 0b0000001100001101 S0 4.75 S2 5.90 S3 6.70 S8 4.75 5.90 S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=1 m10_2=1 m12_2=1 Result (fr): - S15-S0 = 0x54f0 = 0b0101010011110000 + S15-S0 = 0x00f0 = 0b0000000011110000 S4 7.40 S5 7.95 S6 10.2 S7 12.2 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0430 = 0b0000010000110000 + S15-S0 = 0x0030 = 0b0000000000110000 S4 7.40 S5 7.95 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=0 m5_90=1 m6_70=1 m7_40=0 m7_95=0 m10_2=1 m12_2=1 Result (fr): - S15-S0 = 0x57cc = 0b0101011111001100 + S15-S0 = 0x00cc = 0b0000000011001100 S2 5.90 S3 6.70 S6 10.2 S7 12.2 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x070c = 0b0000011100001100 + S15-S0 = 0x000c = 0b0000000000001100 S2 5.90 S3 6.70 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=1 m5_90=0 m6_70=0 m7_40=1 m7_95=1 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x5731 = 0b0101011100110001 + S15-S0 = 0x0031 = 0b0000000000110001 S0 4.75 S4 7.40 S5 7.95 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0731 = 0b0000011100110001 + S15-S0 = 0x0031 = 0b0000000000110001 S0 4.75 S4 7.40 S5 7.95 - S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=0 m5_15=1 m5_90=0 m6_70=1 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 0x56a8 = 0b0101011010101000 + S15-S0 = 0x00a8 = 0b0000000010101000 S3 6.70 S5 7.95 S7 12.2 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0628 = 0b0000011000101000 + S15-S0 = 0x0028 = 0b0000000000101000 S3 6.70 S5 7.95 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=1 m12_2=0 Result (fr): - S15-S0 = 0x5755 = 0b0101011101010101 + S15-S0 = 0x0155 = 0b0000000101010101 S0 4.75 S2 5.90 S4 7.40 S6 10.2 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0717 = 0b0000011100010111 + S15-S0 = 0x0117 = 0b0000000100010111 S0 4.75 S1 4.75 5.90 7.40 S2 5.90 S4 7.40 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 @@ -357,51 +295,39 @@ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 0x5797 = 0b0101011110010111 + S15-S0 = 0x0197 = 0b0000000110010111 S0 4.75 S1 4.75 5.90 7.40 12.2 S2 5.90 S4 7.40 S7 12.2 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0717 = 0b0000011100010111 + S15-S0 = 0x0117 = 0b0000000100010111 S0 4.75 S1 4.75 5.90 7.40 S2 5.90 S4 7.40 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0x5715 = 0b0101011100010101 + S15-S0 = 0x0115 = 0b0000000100010101 S0 4.75 S2 5.90 S4 7.40 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 - S12 4.75 5.90 6.70 10.2 - S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0x0717 = 0b0000011100010111 + S15-S0 = 0x0117 = 0b0000000100010111 S0 4.75 S1 4.75 5.90 7.40 S2 5.90 S4 7.40 S8 4.75 5.90 - S9 4.75 5.90 6.70 - S10 4.75 5.90 6.70 7.40 -Testing gsm48_mr_cfg_from_gsm0808_sc_cfg(): +Testing gsm0808_sc_cfg_get_best_modes(): Input: S15-S0 = 0xff03 = 0b1111111100000011 S0 4.75 @@ -415,15 +341,14 @@ S14 4.75 5.90 7.95 12.2 S15 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0000 = 0b0000000000000000 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 - Result invalid! Input: S15-S0 = 0xff06 = 0b1111111100000110 @@ -438,8 +363,8 @@ S14 4.75 5.90 7.95 12.2 S15 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x3e08 = 0b0011111000001000 @@ -450,8 +375,8 @@ S12 4.75 5.90 6.70 10.2 S13 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0c12 = 0b0000110000010010 @@ -460,8 +385,8 @@ S10 4.75 5.90 6.70 7.40 S11 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0xc020 = 0b1100000000100000 @@ -469,8 +394,8 @@ S14 4.75 5.90 7.95 12.2 S15 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0x3040 = 0b0011000001000000 @@ -478,8 +403,8 @@ S12 4.75 5.90 6.70 10.2 S13 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0xc082 = 0b1100000010000010 @@ -488,64 +413,64 @@ S14 4.75 5.90 7.95 12.2 S15 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0001 = 0b0000000000000001 S0 4.75 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: S15-S0 = 0x0002 = 0b0000000000000010 S1 4.75 5.90 7.40 12.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0004 = 0b0000000000000100 S2 5.90 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0008 = 0b0000000000001000 S3 6.70 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0010 = 0b0000000000010000 S4 7.40 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0x0020 = 0b0000000000100000 S5 7.95 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0x0040 = 0b0000000001000000 S6 10.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0x0080 = 0b0000000010000000 S7 12.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: S15-S0 = 0x0058 = 0b0000000001011000 @@ -553,24 +478,24 @@ S4 7.40 S6 10.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=1 m7_95=0 m10_2=1 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0021 = 0b0000000000100001 S0 4.75 S5 7.95 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: S15-S0 = 0x0084 = 0b0000000010000100 S2 5.90 S7 12.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0086 = 0b0000000010000110 @@ -578,17 +503,16 @@ S2 5.90 S7 12.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x000a = 0b0000000000001010 S1 4.75 5.90 7.40 12.2 S3 6.70 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 - Result invalid! + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0079 = 0b0000000001111001 @@ -598,16 +522,14 @@ S5 7.95 S6 10.2 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=0 m6_70=1 m7_40=1 m7_95=1 m10_2=0 m12_2=0 - Result invalid! + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Input: S15-S0 = 0x0000 = 0b0000000000000000 Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 - Result invalid! Input: S15-S0 = 0xffff = 0b1111111111111111 @@ -628,9 +550,8 @@ S14 4.75 5.90 7.95 12.2 S15 (empty) Output: - cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 - m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 - Result invalid! + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=1 test_cell_id_matching -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I900fda192742fa8f6dd54e9131ef1704b14cc41a Gerrit-Change-Number: 29475 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmocore[master]: comments: gsm_08_08.h: AMR cfg: explain in much more detail

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29472 ) Change subject: comments: gsm_08_08.h: AMR cfg: explain in much more detail ...................................................................... comments: gsm_08_08.h: AMR cfg: explain in much more detail Change-Id: I1864a6beeeedc301c6dc7e2e0c52a3f94b2fef01 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 48 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/29472/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 611196a..d169e7b 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -568,7 +568,44 @@ * * Default values for FR_AMR_WB, OFR_AMR_WB and OHR_AMR_WB: * See also: 3GPP TS 26.103, Table 5.7-1: Allowed Configurations - * for the Adaptive Multi-Rate - Wideband Codec Types */ + * for the Adaptive Multi-Rate - Wideband Codec Types + * + * This is a copy of 3GPP TS 28.062, Table 7.11.3.1.3-2: + * + * S0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + * 12,20 (x) x x x + * 10,20 x x x + * 7,95 x x x + * 7,40 x x x x + * 6,70 x x x x x x + * 5,90 x x x x x x x x x x + * 5,15 + * 4,75 x x x x x x x x x x + * + * OM F F F F F F F F F F F A F A F A + * + * HR Y Y Y Y Y Y Y Y Y + * FR Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y + * + * Each bit allows one Codec Configuration. + * E.g. when bit S3 is set, look at column labeled "3", and see that only 6,7k is active in this configuration; it is + * "F" forbidden to change in Optimisation Mode, "Y" HR AMR supports this mode, and "Y" FR AMR can also do it. + * + * This means that whichever configuration is chosen from S0 thru S15, there are never more than four rates active. + * + * The spec praises S1 as the most desired configuration: "because it leads in all call cases to TFO/TrFO compatible + * connections with optimal voice quality." (Since HR AMR supports up to 7.95k, it seems that S14 would be more optimal + * voice quality, but it is not marked as supported by HR AMR.) + * + * For FR_AMR below, the default of 0x57ff means: + * 0x57ff = 0101 0111 1111 1111 + * ^14 ^10 ^0 + * allow config 0 thru 10, and configs 12 and 14. + * + * For HR_AMR, drop all those where there is no "Y" in the HR row: + * 0x073f = 0000 0111 0011 1111 + * ^15 ^11 ^6 ^0 + */ enum gsm0808_speech_codec_defaults { GSM0808_SC_CFG_DEFAULT_FR_AMR = 0x57ff, GSM0808_SC_CFG_DEFAULT_HR_AMR = 0x073f, @@ -578,9 +615,12 @@ GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, }; -/*! Default speech codec configurations broken down by reate. +/*! Default speech codec configurations broken down by rate. * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for - * the Adaptive Multi-Rate Codec Types. */ + * the Adaptive Multi-Rate Codec Types. + * + * Set all Sn bits that have this rate listed as active. + */ enum gsm0808_speech_codec_rate_defaults { GSM0808_SC_CFG_DEFAULT_AMR_4_75 = 0xff03, GSM0808_SC_CFG_DEFAULT_AMR_5_15 = 0x0000, @@ -592,9 +632,12 @@ GSM0808_SC_CFG_DEFAULT_AMR_12_2 = 0xc082 }; -/*! Single speech codec configurations broken down by reate. +/*! Single speech codec configurations broken down by rate. * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred Configurations for - * the Adaptive Multi-Rate Codec Types. */ + * the Adaptive Multi-Rate Codec Types. + * + * Set bit Sn (S0 -> 0x01), where Sn is identified by a descriptive name. + */ enum gsm0808_speech_codec_rate { GSM0808_SC_CFG_AMR_4_75 = 0x0001, GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20 = 0x0002, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1864a6beeeedc301c6dc7e2e0c52a3f94b2fef01 Gerrit-Change-Number: 29472 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmocore[master]: add gsm0808_amr_modes_from_cfg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29473 ) Change subject: add gsm0808_amr_modes_from_cfg ...................................................................... add gsm0808_amr_modes_from_cfg Provide the definitions from 3GPP TS 28.062, Table 7.11.3.1.3-2 as generally usable API. Likely users: - upcoming patch to improve conversion between S0-S15 and MultiRate config. - osmo-msc to figure out conversion between SDP AMR mode-set and 3GPP TS 48.008 Permitted Speech S0-S15. - osmo-bsc to choose AMR modes for channel activation. Related: SYS#5066 Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 108 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/29473/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index d169e7b..aba1b84 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -649,6 +649,25 @@ GSM0808_SC_CFG_AMR_12_2 = 0x0080, }; +/* Bit index of a mode as returned by gsm0808_amr_modes_from_cfg[]. + * Example: + * if (gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][9] & GSM0808_AMR_MODE_4_75) + * printf("S9 supports 4k75"); + */ +enum gsm0808_amr_mode { + GSM0808_AMR_MODE_4_75 = 0, + GSM0808_AMR_MODE_5_15, + GSM0808_AMR_MODE_5_90, + GSM0808_AMR_MODE_6_70, + GSM0808_AMR_MODE_7_40, + GSM0808_AMR_MODE_7_95, + GSM0808_AMR_MODE_10_2, + GSM0808_AMR_MODE_12_2, +}; + +extern const uint8_t gsm0808_amr_modes_from_cfg[2][16]; +extern const char *gsm0808_amr_mode_str[8]; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 4bb7303..cb1fe6f 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -1968,4 +1968,91 @@ { 0, NULL } }; +/* Convert one S0-S15 bit to its set of AMR modes, for HR AMR and FR AMR. + * This is 3GPP TS 28.062 Table 7.11.3.1.3-2: "Preferred Configurations", with some configurations removed as specified + * in 3GPP TS 48.008 3.2.2.103: + * + * FR_AMR is coded ‘0011’. + * S11, S13 and S15 are reserved and coded with zeroes. + * + * HR_AMR is coded ‘0100’. + * S6 - S7 and S11 – S15 are reserved and coded with zeroes. + * + * Meaning: for FR, exclude all Optimisation Mode configurations. + * For HR, exclude all that are not supported by HR AMR -- drop all that include at least one of + * 10.2 or 12.2. + * + * Also, for HR, drop 12.2k from S1. + * + * The first array dimension is 0 for half rate and 1 for full rate. + * The second array dimension is the configuration number (0..15) aka Sn. + * The values are bitmask combinations of (1 << GSM0808_AMR_MODE_nnnn). + * + * For example, accumulate all modes that are possible in a given my_s15_s0: + * + * uint8_t modes = 0; + * for (s_bit = 0; s_bit < 15; s_bit++) + * if (my_s15_s0 & (1 << s_bit)) + * modes |= gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][s_bit]; + * for (i = 0; i < 8; i++) + * if (modes & (1 << i)) + * printf(" %s", gsm0808_amr_mode_str[i]); + */ +const uint8_t gsm0808_amr_modes_from_cfg[2][16] = { +#define B(X) (1 << (GSM0808_AMR_MODE_##X)) + /* HR */ + { + /* Sn = modes */ + [ 0] = B(4_75), + [ 1] = B(4_75) | B(5_90) | B(7_40), + [ 2] = B(5_90), + [ 3] = B(6_70), + [ 4] = B(7_40), + [ 5] = B(7_95), + [ 6] = 0, + [ 7] = 0, + + [ 8] = B(4_75) | B(5_90), + [ 9] = B(4_75) | B(5_90) | B(6_70), + [10] = B(4_75) | B(5_90) | B(6_70) | B(7_40), + [11] = 0, + [12] = 0, + [13] = 0, + [14] = 0, + [15] = 0, + }, + /* FR */ + { + /* Sn = modes */ + [ 0] = B(4_75), + [ 1] = B(4_75) | B(5_90) | B(7_40) | B(12_2), + [ 2] = B(5_90), + [ 3] = B(6_70), + [ 4] = B(7_40), + [ 5] = B(7_95), + [ 6] = B(10_2), + [ 7] = B(12_2), + + [ 8] = B(4_75) | B(5_90), + [ 9] = B(4_75) | B(5_90) | B(6_70), + [10] = B(4_75) | B(5_90) | B(6_70) | B(7_40), + [11] = 0, + [12] = B(4_75) | B(5_90) | B(6_70) | B(10_2), + [13] = 0, + [14] = B(4_75) | B(5_90) | B(7_95) | B(12_2), + [15] = 0, + } +}; + +/* AMR mode names from GSM0808_AMR_MODE_*, for use with gsm0808_amr_modes_from_cfg. + * + * For example: + * printf("S9: "); + * uint8_t s9_modes = gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][9]; + * for (bit = 0; bit < 8; bit++) + * if (s9_modes & (1 << bit)) + * printf("%s,", gsm0808_amr_mode_str[bit]); + */ +const char *gsm0808_amr_mode_str[8] = {"4.75", "5.15", "5.90", "6.70", "7.40", "7.95", "10.2", "12.2"}; + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index b971ca0..aa5df90 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -246,6 +246,8 @@ gsm0808_speech_codec_from_chan_type; gsm0808_sc_cfg_from_gsm48_mr_cfg; gsm48_mr_cfg_from_gsm0808_sc_cfg; +gsm0808_amr_modes_from_cfg; +gsm0808_amr_mode_str; gsm0808_speech_codec_type_names; gsm0808_permitted_speech_names; gsm0808_chosen_enc_alg_names; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 Gerrit-Change-Number: 29473 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmocore[master]: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29474 ) Change subject: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg() ...................................................................... improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg() Improve the test output to make it easier to confirm that the fix in an upcoming patch is indeed correct. Spell out each S0-S15 mode along with the bitmask. Rejigger the format of printing the mr_cfg flags, so that the AMR modes line up vertically with the S0-S15 modes. This clearly shows that the mr_cfg <-> s15_s0 conversion is wrong. For example, in this test only 4k75 is enabled, yet we allow configs featuring 6 other rates: Input: cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): S15-S0 = 0x5701 = 0b0101011100000001 S0 4.75 S8 4.75 5.90 S9 4.75 5.90 6.70 S10 4.75 5.90 6.70 7.40 S12 4.75 5.90 6.70 10.2 S14 4.75 5.90 7.95 12.2 Result (hr): S15-S0 = 0x0701 = 0b0000011100000001 S0 4.75 S8 4.75 5.90 S9 4.75 5.90 6.70 S10 4.75 5.90 6.70 7.40 In this test, an s15_s0 featuring a configuration with 6k70 allowed does not result in m6_70 == 1: Input: S15-S0 = 0x0c12 = 0b0000110000010010 S1 4.75 5.90 7.40 12.2 S4 7.40 S10 4.75 5.90 6.70 7.40 S11 4.75 5.90 6.70 7.40 Output: cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Almost every conversion contains errors like this. Related: I900fda192742fa8f6dd54e9131ef1704b14cc41a Change-Id: Iec7c491d9fadd37d9e43fbaac8e709c2029f8a8e --- M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 2 files changed, 448 insertions(+), 418 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/29474/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index b3aa3ab..1ab836d 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1886,29 +1886,67 @@ msgb_free(msg_cgi_ps); } +static void print_s15_s0(uint16_t s15_s0, bool full_rate) +{ + int i; + printf(" S15-S0 = 0x%04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, + OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + for (i = 0; i < 16; i++) { + uint8_t modes; + int m; + int space; + + if (!(s15_s0 & (1 << i))) + continue; + + space = 6; + if (i < 10) + space++; + + printf(" S%d", i); + + modes = gsm0808_amr_modes_from_cfg[full_rate ? 1 : 0][i]; + if (!modes) { + printf(" (empty)\n"); + continue; + } + + for (m = 0; m < 8; m++) { + if (!(modes & (1 << m))) { + /* avoid whitespace at line ends -- accumulate whitespace width until there is + * non-whitespace to actually be printed.*/ + space += 8; + continue; + } + printf("%*s", space, gsm0808_amr_mode_str[m]); + space = 8; + } + printf("\n"); + } +} + +static void print_mr_cfg(const struct gsm48_multi_rate_conf *cfg) +{ + printf(" cfg.smod=%u spare=%u icmi=%u nscb=%u ver=%u\n", + cfg->smod, cfg->spare, cfg->icmi, cfg->nscb, cfg->ver); + printf(" m4_75=%u m5_15=%u m5_90=%u m6_70=%u m7_40=%u m7_95=%u m10_2=%u m12_2=%u\n", + cfg->m4_75, cfg->m5_15, cfg->m5_90, cfg->m6_70, cfg->m7_40, cfg->m7_95, cfg->m10_2, cfg->m12_2); +} + static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) { uint16_t s15_s0; printf("Input:\n"); - printf(" m4_75= %u smod= %u\n", cfg->m4_75, cfg->smod); - printf(" m5_15= %u spare= %u\n", cfg->m5_15, cfg->spare); - printf(" m5_90= %u icmi= %u\n", cfg->m5_90, cfg->icmi); - printf(" m6_70= %u nscb= %u\n", cfg->m6_70, cfg->nscb); - printf(" m7_40= %u ver= %u\n", cfg->m7_40, cfg->ver); - printf(" m7_95= %u\n", cfg->m7_95); - printf(" m10_2= %u\n", cfg->m10_2); - printf(" m12_2= %u\n", cfg->m12_2); + print_mr_cfg(cfg); s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true); printf("Result (fr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + print_s15_s0(s15_s0, true); s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false); printf("Result (hr):\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + print_s15_s0(s15_s0, false); printf("\n"); } @@ -2109,20 +2147,12 @@ int rc; printf("Input:\n"); - printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0, - OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0)); + print_s15_s0(s15_s0, true); rc = gsm48_mr_cfg_from_gsm0808_sc_cfg(&cfg, s15_s0); printf("Output:\n"); - printf(" m4_75= %u smod= %u\n", cfg.m4_75, cfg.smod); - printf(" m5_15= %u spare= %u\n", cfg.m5_15, cfg.spare); - printf(" m5_90= %u icmi= %u\n", cfg.m5_90, cfg.icmi); - printf(" m6_70= %u nscb= %u\n", cfg.m6_70, cfg.nscb); - printf(" m7_40= %u ver= %u\n", cfg.m7_40, cfg.ver); - printf(" m7_95= %u\n", cfg.m7_95); - printf(" m10_2= %u\n", cfg.m10_2); - printf(" m12_2= %u\n", cfg.m12_2); + print_mr_cfg(&cfg); if (rc != 0) printf(" Result invalid!\n"); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 8f91eb1..74baaca 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -87,549 +87,549 @@ test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10) Testing gsm0808_sc_cfg_from_gsm48_mr_cfg(): Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Result (hr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 5701 = 0b0101011100000001 + S15-S0 = 0x5701 = 0b0101011100000001 + S0 4.75 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0701 = 0b0000011100000001 + S15-S0 = 0x0701 = 0b0000011100000001 + S0 4.75 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=1 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Result (hr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 5704 = 0b0101011100000100 + S15-S0 = 0x5704 = 0b0101011100000100 + S2 5.90 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0704 = 0b0000011100000100 + S15-S0 = 0x0704 = 0b0000011100000100 + S2 5.90 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 1608 = 0b0001011000001000 + S15-S0 = 0x1608 = 0b0001011000001000 + S3 6.70 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 Result (hr): - S15-S0 = 0608 = 0b0000011000001000 + S15-S0 = 0x0608 = 0b0000011000001000 + S3 6.70 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 0410 = 0b0000010000010000 + S15-S0 = 0x0410 = 0b0000010000010000 + S4 7.40 + S10 4.75 5.90 6.70 7.40 Result (hr): - S15-S0 = 0410 = 0b0000010000010000 + S15-S0 = 0x0410 = 0b0000010000010000 + S4 7.40 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 4020 = 0b0100000000100000 + S15-S0 = 0x4020 = 0b0100000000100000 + S5 7.95 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0020 = 0b0000000000100000 + S15-S0 = 0x0020 = 0b0000000000100000 + S5 7.95 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 Result (fr): - S15-S0 = 1040 = 0b0001000001000000 + S15-S0 = 0x1040 = 0b0001000001000000 + S6 10.2 + S12 4.75 5.90 6.70 10.2 Result (hr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 4080 = 0b0100000010000000 + S15-S0 = 0x4080 = 0b0100000010000000 + S7 12.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=1 m5_90=1 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 570d = 0b0101011100001101 + S15-S0 = 0x570d = 0b0101011100001101 + S0 4.75 + S2 5.90 + S3 6.70 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 070d = 0b0000011100001101 + S15-S0 = 0x070d = 0b0000011100001101 + S0 4.75 + S2 5.90 + S3 6.70 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=1 m10_2=1 m12_2=1 Result (fr): - S15-S0 = 54f0 = 0b0101010011110000 + S15-S0 = 0x54f0 = 0b0101010011110000 + S4 7.40 + S5 7.95 + S6 10.2 + S7 12.2 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0430 = 0b0000010000110000 + S15-S0 = 0x0430 = 0b0000010000110000 + S4 7.40 + S5 7.95 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=0 m5_90=1 m6_70=1 m7_40=0 m7_95=0 m10_2=1 m12_2=1 Result (fr): - S15-S0 = 57cc = 0b0101011111001100 + S15-S0 = 0x57cc = 0b0101011111001100 + S2 5.90 + S3 6.70 + S6 10.2 + S7 12.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 070c = 0b0000011100001100 + S15-S0 = 0x070c = 0b0000011100001100 + S2 5.90 + S3 6.70 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=1 m5_90=0 m6_70=0 m7_40=1 m7_95=1 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 5731 = 0b0101011100110001 + S15-S0 = 0x5731 = 0b0101011100110001 + S0 4.75 + S4 7.40 + S5 7.95 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0731 = 0b0000011100110001 + S15-S0 = 0x0731 = 0b0000011100110001 + S0 4.75 + S4 7.40 + S5 7.95 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 0 smod= 0 - m5_15= 1 spare= 0 - m5_90= 0 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 0 - m7_95= 1 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=0 m5_15=1 m5_90=0 m6_70=1 m7_40=0 m7_95=1 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 56a8 = 0b0101011010101000 + S15-S0 = 0x56a8 = 0b0101011010101000 + S3 6.70 + S5 7.95 + S7 12.2 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0628 = 0b0000011000101000 + S15-S0 = 0x0628 = 0b0000011000101000 + S3 6.70 + S5 7.95 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 1 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=1 m12_2=0 Result (fr): - S15-S0 = 5755 = 0b0101011101010101 + S15-S0 = 0x5755 = 0b0101011101010101 + S0 4.75 + S2 5.90 + S4 7.40 + S6 10.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0717 = 0b0000011100010111 + S15-S0 = 0x0717 = 0b0000011100010111 + S0 4.75 + S1 4.75 5.90 7.40 + S2 5.90 + S4 7.40 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 1 smod= 0 - m5_15= 1 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 1 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 1 - m10_2= 1 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=1 m5_90=1 m6_70=1 m7_40=1 m7_95=1 m10_2=1 m12_2=1 Result (fr): - S15-S0 = 57ff = 0b0101011111111111 + S15-S0 = 0x57ff = 0b0101011111111111 + S0 4.75 + S1 4.75 5.90 7.40 12.2 + S2 5.90 + S3 6.70 + S4 7.40 + S5 7.95 + S6 10.2 + S7 12.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 073f = 0b0000011100111111 + S15-S0 = 0x073f = 0b0000011100111111 + S0 4.75 + S1 4.75 5.90 7.40 + S2 5.90 + S3 6.70 + S4 7.40 + S5 7.95 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Result (fr): - S15-S0 = 5797 = 0b0101011110010111 + S15-S0 = 0x5797 = 0b0101011110010111 + S0 4.75 + S1 4.75 5.90 7.40 12.2 + S2 5.90 + S4 7.40 + S7 12.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0717 = 0b0000011100010111 + S15-S0 = 0x0717 = 0b0000011100010111 + S0 4.75 + S1 4.75 5.90 7.40 + S2 5.90 + S4 7.40 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Input: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 0 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 0 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 Result (fr): - S15-S0 = 5715 = 0b0101011100010101 + S15-S0 = 0x5715 = 0b0101011100010101 + S0 4.75 + S2 5.90 + S4 7.40 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S12 4.75 5.90 6.70 10.2 + S14 4.75 5.90 7.95 12.2 Result (hr): - S15-S0 = 0717 = 0b0000011100010111 + S15-S0 = 0x0717 = 0b0000011100010111 + S0 4.75 + S1 4.75 5.90 7.40 + S2 5.90 + S4 7.40 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 Testing gsm48_mr_cfg_from_gsm0808_sc_cfg(): Input: - S15-S0 = ff03 = 0b1111111100000011 + S15-S0 = 0xff03 = 0b1111111100000011 + S0 4.75 + S1 4.75 5.90 7.40 12.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S11 (empty) + S12 4.75 5.90 6.70 10.2 + S13 (empty) + S14 4.75 5.90 7.95 12.2 + S15 (empty) Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result invalid! Input: - S15-S0 = ff06 = 0b1111111100000110 + S15-S0 = 0xff06 = 0b1111111100000110 + S1 4.75 5.90 7.40 12.2 + S2 5.90 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S11 (empty) + S12 4.75 5.90 6.70 10.2 + S13 (empty) + S14 4.75 5.90 7.95 12.2 + S15 (empty) Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 3e08 = 0b0011111000001000 + S15-S0 = 0x3e08 = 0b0011111000001000 + S3 6.70 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S11 (empty) + S12 4.75 5.90 6.70 10.2 + S13 (empty) Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: - S15-S0 = 0c12 = 0b0000110000010010 + S15-S0 = 0x0c12 = 0b0000110000010010 + S1 4.75 5.90 7.40 12.2 + S4 7.40 + S10 4.75 5.90 6.70 7.40 + S11 (empty) Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = c020 = 0b1100000000100000 + S15-S0 = 0xc020 = 0b1100000000100000 + S5 7.95 + S14 4.75 5.90 7.95 12.2 + S15 (empty) Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 Input: - S15-S0 = 3040 = 0b0011000001000000 + S15-S0 = 0x3040 = 0b0011000001000000 + S6 10.2 + S12 4.75 5.90 6.70 10.2 + S13 (empty) Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 1 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 Input: - S15-S0 = c082 = 0b1100000010000010 + S15-S0 = 0xc082 = 0b1100000010000010 + S1 4.75 5.90 7.40 12.2 + S7 12.2 + S14 4.75 5.90 7.95 12.2 + S15 (empty) Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 0001 = 0b0000000000000001 + S15-S0 = 0x0001 = 0b0000000000000001 + S0 4.75 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: - S15-S0 = 0002 = 0b0000000000000010 + S15-S0 = 0x0002 = 0b0000000000000010 + S1 4.75 5.90 7.40 12.2 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 0004 = 0b0000000000000100 + S15-S0 = 0x0004 = 0b0000000000000100 + S2 5.90 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: - S15-S0 = 0008 = 0b0000000000001000 + S15-S0 = 0x0008 = 0b0000000000001000 + S3 6.70 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 1 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Input: - S15-S0 = 0010 = 0b0000000000010000 + S15-S0 = 0x0010 = 0b0000000000010000 + S4 7.40 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=0 Input: - S15-S0 = 0020 = 0b0000000000100000 + S15-S0 = 0x0020 = 0b0000000000100000 + S5 7.95 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 Input: - S15-S0 = 0040 = 0b0000000001000000 + S15-S0 = 0x0040 = 0b0000000001000000 + S6 10.2 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 1 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=1 m12_2=0 Input: - S15-S0 = 0080 = 0b0000000010000000 + S15-S0 = 0x0080 = 0b0000000010000000 + S7 12.2 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 0058 = 0b0000000001011000 + S15-S0 = 0x0058 = 0b0000000001011000 + S3 6.70 + S4 7.40 + S6 10.2 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 1 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 1 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=1 m7_40=1 m7_95=0 m10_2=1 m12_2=0 Input: - S15-S0 = 0021 = 0b0000000000100001 + S15-S0 = 0x0021 = 0b0000000000100001 + S0 4.75 + S5 7.95 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=1 m10_2=0 m12_2=0 Input: - S15-S0 = 0084 = 0b0000000010000100 + S15-S0 = 0x0084 = 0b0000000010000100 + S2 5.90 + S7 12.2 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=1 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 0086 = 0b0000000010000110 + S15-S0 = 0x0086 = 0b0000000010000110 + S1 4.75 5.90 7.40 12.2 + S2 5.90 + S7 12.2 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Input: - S15-S0 = 000a = 0b0000000000001010 + S15-S0 = 0x000a = 0b0000000000001010 + S1 4.75 5.90 7.40 12.2 + S3 6.70 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Result invalid! Input: - S15-S0 = 0079 = 0b0000000001111001 + S15-S0 = 0x0079 = 0b0000000001111001 + S0 4.75 + S3 6.70 + S4 7.40 + S5 7.95 + S6 10.2 Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 1 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 1 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=0 m6_70=1 m7_40=1 m7_95=1 m10_2=0 m12_2=0 Result invalid! Input: - S15-S0 = 0000 = 0b0000000000000000 + S15-S0 = 0x0000 = 0b0000000000000000 Output: - m4_75= 0 smod= 0 - m5_15= 0 spare= 0 - m5_90= 0 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 0 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 0 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=0 m5_15=0 m5_90=0 m6_70=0 m7_40=0 m7_95=0 m10_2=0 m12_2=0 Result invalid! Input: - S15-S0 = ffff = 0b1111111111111111 + S15-S0 = 0xffff = 0b1111111111111111 + S0 4.75 + S1 4.75 5.90 7.40 12.2 + S2 5.90 + S3 6.70 + S4 7.40 + S5 7.95 + S6 10.2 + S7 12.2 + S8 4.75 5.90 + S9 4.75 5.90 6.70 + S10 4.75 5.90 6.70 7.40 + S11 (empty) + S12 4.75 5.90 6.70 10.2 + S13 (empty) + S14 4.75 5.90 7.95 12.2 + S15 (empty) Output: - m4_75= 1 smod= 0 - m5_15= 0 spare= 0 - m5_90= 1 icmi= 1 - m6_70= 0 nscb= 0 - m7_40= 1 ver= 1 - m7_95= 0 - m10_2= 0 - m12_2= 1 + cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1 + m4_75=1 m5_15=0 m5_90=1 m6_70=0 m7_40=1 m7_95=0 m10_2=0 m12_2=1 Result invalid! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec7c491d9fadd37d9e43fbaac8e709c2029f8a8e Gerrit-Change-Number: 29474 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Fix incorrect rate_ctr_group used in mgcp_osmux.c

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29469 ) Change subject: osmux: Fix incorrect rate_ctr_group used in mgcp_osmux.c ...................................................................... osmux: Fix incorrect rate_ctr_group used in mgcp_osmux.c During development of the coutners, they were first added to the same RTP counter group and later on splitted, but some places still used the RTP related functions to increment the counters. Let's add a seaprate set of helpers to update the correct osmux counter group. Fixes: 582c2bf7b0b3f6aabfb048a2d71c5fd9c60a105e Change-Id: Ia2e5601c7d476b79afd95032dbc019517f8209af --- M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_ratectr.c 2 files changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/29469/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 72152c7..790c425 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -49,6 +49,21 @@ .ctr_desc = mgcp_conn_osmux_rate_ctr_desc }; +static void rtpconn_osmux_rate_ctr_add(struct mgcp_conn_rtp *conn_rtp, int id, int inc) +{ + struct rate_ctr_group *conn_osmux_stats = conn_rtp->osmux.ctrg; + struct rate_ctr_group *trunk_osmux_stats = conn_rtp->conn->endp->trunk->ratectr.all_osmux_conn_stats; + + /* add to both the per-connection and the global stats */ + rate_ctr_add(rate_ctr_group_get_ctr(conn_osmux_stats, id), inc); + rate_ctr_add(rate_ctr_group_get_ctr(trunk_osmux_stats, id), inc); +} + +static void rtpconn_osmux_rate_ctr_inc(struct mgcp_conn_rtp *conn_rtp, int id) +{ + rtpconn_osmux_rate_ctr_add(conn_rtp, id, 1); +} + /* Deliver OSMUX batch to the remote end */ static void osmux_deliver_cb(struct msgb *batch_msg, void *data) { @@ -204,14 +219,14 @@ struct msgb *msg; if (!conn->end.output_enabled) { - rtpconn_rate_ctr_inc(conn, conn->conn->endp, OSMUX_DROPPED_AMR_PAYLOADS_CTR); + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR); return -1; } if (conn->osmux.state != OSMUX_STATE_ENABLED) { LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to Osmux conn not yet enabled, dropping (cid=%d)\n", conn->osmux.remote_cid); - rtpconn_rate_ctr_inc(conn, conn->conn->endp, OSMUX_DROPPED_AMR_PAYLOADS_CTR); + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR); return -1; } @@ -428,9 +443,9 @@ goto out; }*/ if (endp_osmux_state_check(endp, conn_src, false) == 0) { - rtpconn_rate_ctr_inc(conn_src, endp, OSMUX_CHUNKS_RX_CTR); - rtpconn_rate_ctr_add(conn_src, endp, OSMUX_OCTETS_RX_CTR, - osmux_chunk_length(msg, rem)); + rtpconn_osmux_rate_ctr_inc(conn_src, OSMUX_CHUNKS_RX_CTR); + rtpconn_osmux_rate_ctr_add(conn_src, OSMUX_OCTETS_RX_CTR, + osmux_chunk_length(msg, rem)); osmux_xfrm_output_sched(conn_src->osmux.out, osmuxh); } rem = msg->len; diff --git a/src/libosmo-mgcp/mgcp_ratectr.c b/src/libosmo-mgcp/mgcp_ratectr.c index bf3d9d3..abf3883 100644 --- a/src/libosmo-mgcp/mgcp_ratectr.c +++ b/src/libosmo-mgcp/mgcp_ratectr.c @@ -151,7 +151,7 @@ .group_description = "aggregated statistics for all osmux connections", .class_id = 1, .num_ctr = ARRAY_SIZE(all_osmux_conn_rate_ctr_desc), - .ctr_desc = all_rtp_conn_rate_ctr_desc + .ctr_desc = all_osmux_conn_rate_ctr_desc }; /*! allocate global rate counters -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia2e5601c7d476b79afd95032dbc019517f8209af Gerrit-Change-Number: 29469 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Improve per-conn tx rate counters

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29470 ) Change subject: osmux: Improve per-conn tx rate counters ...................................................................... osmux: Improve per-conn tx rate counters Change-Id: If030f5d921bdfcfcd00b015b4a9e48bb3b04e721 --- M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_osmux.c 2 files changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/70/29470/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 9ffa7dc..d9b38c0 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -186,7 +186,9 @@ enum { OSMUX_CHUNKS_RX_CTR, OSMUX_OCTETS_RX_CTR, - OSMUX_DROPPED_AMR_PAYLOADS_CTR, + OSMUX_RTP_PACKETS_TX_CTR, + OSMUX_RTP_PACKETS_TX_DROPPED_CTR, + OSMUX_AMR_OCTETS_TX_CTR, /* Only available in global stats: */ OSMUX_NUM_CONNECTIONS, OSMUX_PACKETS_RX_CTR, @@ -200,7 +202,9 @@ static const struct rate_ctr_desc mgcp_conn_osmux_rate_ctr_desc[] = { [OSMUX_CHUNKS_RX_CTR] = {"osmux:chunks_rx", "Inbound Osmux chunks."}, [OSMUX_OCTETS_RX_CTR] = {"osmux:octets_rx", "Inbound Osmux octets."}, - [OSMUX_DROPPED_AMR_PAYLOADS_CTR] = {"osmux:dropped_amr_payloads", "Dropped outbound AMR payloads."} + [OSMUX_RTP_PACKETS_TX_CTR] = {"osmux:rtp_packets_tx", "Tx outbound RTP packets to encode as Osmux."}, + [OSMUX_RTP_PACKETS_TX_DROPPED_CTR] = {"osmux:rtp_packets_tx_dropped", "Dropped Tx outbound RTP packets to encode as Osmux."}, + [OSMUX_AMR_OCTETS_TX_CTR] = {"osmux:amr_octets_tx", "Tx outbound AMD payload octets."}, }; /* Aggregated Osmux connection stats. These are updated when an Osmux connection is freed. @@ -208,7 +212,9 @@ static const struct rate_ctr_desc all_osmux_conn_rate_ctr_desc[] = { [OSMUX_CHUNKS_RX_CTR] = {"all_osmux:chunks_rx", "Inbound Osmux chunks."}, [OSMUX_OCTETS_RX_CTR] = {"all_osmux:octets_rx", "Inbound Osmux octets."}, - [OSMUX_DROPPED_AMR_PAYLOADS_CTR] = {"all_osmux:dropped_amr_payloads", "Dropped outbound AMR payloads."}, + [OSMUX_RTP_PACKETS_TX_CTR] = {"all_osmux:rtp_packets_tx", "Tx outbound RTP packets to encode as Osmux."}, + [OSMUX_RTP_PACKETS_TX_DROPPED_CTR] = {"all_osmux:rtp_packets_tx_dropped", "Dropped Tx outbound RTP packets to encode as Osmux."}, + [OSMUX_AMR_OCTETS_TX_CTR] = {"all_osmux:amr_octets_tx", "Tx outbound AMD payload octets."}, /* These last counters below do not exist in per-connection stats, only here: */ [OSMUX_NUM_CONNECTIONS] = {"all_osmux:num_closed_conns", "Total number of osmux connections closed."}, [OSMUX_PACKETS_RX_CTR] = {"all_osmux:packets_rx", "Total inbound UDP/Osmux packets."}, diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 790c425..6ae0d8e 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -219,14 +219,14 @@ struct msgb *msg; if (!conn->end.output_enabled) { - rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR); + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR); return -1; } if (conn->osmux.state != OSMUX_STATE_ENABLED) { LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to Osmux conn not yet enabled, dropping (cid=%d)\n", conn->osmux.remote_cid); - rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR); + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR); return -1; } @@ -241,6 +241,12 @@ /* batch full, build and deliver it */ osmux_xfrm_input_deliver(conn->osmux.in); } + if (ret < 0) { + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR); + } else { + rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_CTR); + rtpconn_osmux_rate_ctr_add(conn, OSMUX_AMR_OCTETS_TX_CTR, buf_len - sizeof(struct rtp_hdr)); + } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If030f5d921bdfcfcd00b015b4a9e48bb3b04e721 Gerrit-Change-Number: 29470 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022