- gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: pySim-shell: do not show user home path in help text
by daniel 22 Dec '25

22 Dec '25

Attention is currently required from: dexter. daniel has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41748?usp=email ) Change subject: pySim-shell: do not show user home path in help text ...................................................................... Patch Set 1: -Code-Review (1 comment) Patchset: PS1: I was just about to propose that --script and --card_handler should also use expanduser, but after testing this seems to already work. Are you sure that FILE and PATH metavars don't already expand '~'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41748?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied8b1e553de8f5370369c4485a2360906c874ed2 Gerrit-Change-Number: 41748 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Dec 2025 14:05:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ttcn3-hacks[master]: 5gc: Test UE Triggered Service Request
by pespin 22 Dec '25

22 Dec '25

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41747?usp=email ) Change subject: 5gc: Test UE Triggered Service Request ...................................................................... 5gc: Test UE Triggered Service Request Related: SYS#7073 Change-Id: I65cf7844d11be55d9d5c8e31fd87a3c72e6a607b --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml M library/NGAP_Functions.ttcn M library/NG_NAS_Osmo_Templates.ttcn M library/NG_NAS_Osmo_Types.ttcn 6 files changed, 345 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/41747/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41747?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I65cf7844d11be55d9d5c8e31fd87a3c72e6a607b Gerrit-Change-Number: 41747 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim-shell: do not show user home path in help text
by daniel 22 Dec '25

22 Dec '25

Attention is currently required from: dexter. daniel has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41748?usp=email ) Change subject: pySim-shell: do not show user home path in help text ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41748?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied8b1e553de8f5370369c4485a2360906c874ed2 Gerrit-Change-Number: 41748 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Dec 2025 13:59:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by daniel 22 Dec '25

22 Dec '25

Attention is currently required from: dexter, fixeria, laforge. daniel has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email ) Change subject: card_key_provider: add PostgreSQL support ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Dec 2025 13:58:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: pySim-shell: do not show user home path in help text
by dexter 22 Dec '25

22 Dec '25

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/41748?usp=email ) Change subject: pySim-shell: do not show user home path in help text ...................................................................... pySim-shell: do not show user home path in help text At the moment, the help text for the --csv option shows the path to the users home. This is due to the default value, which is dynamically generated. Let's use a static string with "~/" and resolve the full path later when we need it. Related: SYS#7725 Change-Id: Ied8b1e553de8f5370369c4485a2360906c874ed2 --- M pySim-shell.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/41748/1 diff --git a/pySim-shell.py b/pySim-shell.py index a8b15d5..26bf12c 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1138,7 +1138,7 @@ card_key_group = option_parser.add_argument_group('Card Key Provider Options') card_key_group.add_argument('--csv', metavar='FILE', - default=str(Path.home()) + "/.osmocom/pysim/card_data.csv", + default="~/.osmocom/pysim/card_data.csv", help='Read card data from CSV file') card_key_group.add_argument('--csv-column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', help=argparse.SUPPRESS, dest='column_key') @@ -1177,8 +1177,8 @@ for par in opts.column_key: name, key = par.split(':') column_keys[name] = key - if os.path.isfile(opts.csv): - card_key_provider_register(CardKeyProviderCsv(opts.csv, column_keys)) + if os.path.isfile(os.path.expanduser(opts.csv)): + card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), column_keys)) # Init card reader driver sl = init_reader(opts, proactive_handler = Proact()) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41748?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied8b1e553de8f5370369c4485a2360906c874ed2 Gerrit-Change-Number: 41748 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by dexter 22 Dec '25

22 Dec '25

Attention is currently required from: daniel, fixeria, laforge. Hello Jenkins Builder, daniel, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: card_key_provider: add PostgreSQL support ...................................................................... card_key_provider: add PostgreSQL support The Card Key Provider currently only has support for CSV files as input. Unfortunately using CSV files does not scale very well when the card inventory is very large and continously updated. In this case a centralized storage in the form of a database is the more suitable approach. This patch adds PostgreSQL support next to the existing CSV file support. It also adds an importer tool to import existing CSV files into the database. Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Related: SYS#7725 --- A contrib/csv-to-pgsql.py M docs/card-key-provider.rst M pySim-shell.py M pySim/card_key_provider.py M setup.py 5 files changed, 587 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/41508/9 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by dexter 22 Dec '25

22 Dec '25

Attention is currently required from: daniel, fixeria, laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email ) Change subject: card_key_provider: add PostgreSQL support ...................................................................... Patch Set 9: (2 comments) File contrib/csv-to-pgsql.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/ac29290a_d7330054?usp=em… : PS8, Line 37: PQSQL > PGSQL or PSQL are usual acronyms for postgres. […] Done https://gerrit.osmocom.org/c/pysim/+/41508/comment/72a70abc_64ec120c?usp=em… : PS8, Line 261: str(Path.home()) + "/.osmocom/pysim/card_data_pqsql.cfg" > Not critical, but I guess the clean/pythonic way would be to use `os.path. […] Thanks, having the user name in the helptext is indeed something we should avoid. I remember having problems with resolving ~, but os.path.expanduser() works well when I apply it on the path when accessing opts.pqsql. I have also fixed this for pySim-shell.py -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Dec 2025 13:50:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: pySim-shell: output git hash in case get_distribution fails
by laforge 22 Dec '25

22 Dec '25

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41738?usp=email ) Change subject: pySim-shell: output git hash in case get_distribution fails ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/41738/comment/88b928f9_51c60694?usp=em… : PS2, Line 530: cwd + "/.git" AFAIK os.path.join instead of string concatenation exists so would be the OS-independent version that would still work e.g. on windows where backslashes are used. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2b9038f88cfcaa07894a2f09c7f5ad8a5474083d Gerrit-Change-Number: 41738 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Dec 2025 13:26:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-abis[master]: trau cosmetic: update osmo_trau2rtp API comments
by laforge 22 Dec '25

22 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41743?usp=email ) Change subject: trau cosmetic: update osmo_trau2rtp API comments ...................................................................... trau cosmetic: update osmo_trau2rtp API comments Since the writing of Doxygen API comments for osmo_trau2rtp() and osmo_trau2rtp_ufe(), these APIs gained the ability to convert CSD TRAU frames to TW-TS-007 in addition to CLEARMODE - document this addition. Also update comments regarding AMR, which is now supported via AMR TRAU frame interworking facility with its own API. Change-Id: Id287474c5824ab334da244701700051f9f014e66 --- M src/trau/trau_rtp_conv.c 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 9d23065..9b1dc58 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -1719,9 +1719,10 @@ * * In the case of FR/EFR speech, the output format is either RFC 3551 or * TW-TS-001; in the case of HRv1 speech, the output format is either RFC 5993 - * or TW-TS-002. st->rtp_extensions field selects the use or non-use of - * Themyscira RTP extensions; the structure passed in \ref st currently - * has no other uses in the TRAU->RTP direction. + * or TW-TS-002. In the case of CSD, the output format is either 160-octet + * CLEARMODE or compressed TW-TS-007. st->rtp_extensions field selects the use + * or non-use of Themyscira RTP extensions; the structure passed in \ref st + * currently has no other uses in the TRAU->RTP direction. * * The following TRAU frame types are _not_ supported: * @@ -1734,7 +1735,9 @@ * - D144 sync frames: these special frames are not convertible to RTP; * their synchronization function needs to be handled by the application. * - * - AMR speech frames: not currently implemented. + * - AMR speech frames are not supported by this API; AMR TRAU frame + * interworking facility of <osmocom/trau/amr_trau.h> needs to be used + * instead. */ int osmo_trau2rtp(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf, struct osmo_trau2rtp_state *st) @@ -1767,8 +1770,9 @@ * * - UFE checks exist only for HRv1 and EFR speech frames; for all other frame * types, this function never writes to *ufe. (AMR is another frame type - * for which TRAU-UL decoding would include a UFE check, but we currently - * don't support AMR at all.) + * for which high-level decoding can produce UFE and DFE results, but those + * frames need to be decoded with osmo_amrt_decode_trau_frame() and not the + * present API.) */ int osmo_trau2rtp_ufe(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf, struct osmo_trau2rtp_state *st, bool *ufe) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id287474c5824ab334da244701700051f9f014e66 Gerrit-Change-Number: 41743 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: trau2rtp: rm defunct AMR WIP code
by laforge 22 Dec '25

22 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41744?usp=email ) Change subject: trau2rtp: rm defunct AMR WIP code ...................................................................... trau2rtp: rm defunct AMR WIP code When the present TRAU<->RTP conversion module was initially introduced in 2020, there was a WIP plan to eventually extend it to support AMR in addition to FR/HR/EFR. Defunct code for a beginning of trau2rtp implementation for AMR has sat in trau_rtp_conv.c under '#if 0' all these years - but it never became anything beyond dead code. When the time came to implement AMR TRAU support for real, the existing TRAU<->RTP API from 2020 design turned out to be insufficient; the AMR support that was merged just before 2025-12 major release takes the form of an entirely new AMR TRAU frame interworking facility with its own API. As a result of these developments, the original defunct AMR code from 2020 now only adds confusion - remove it. Change-Id: Ieeee8eb6dbf9c753458a91e13f2bf22311936259 --- M src/trau/trau_rtp_conv.c 1 file changed, 0 insertions(+), 136 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 9b1dc58..56cc109 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -1121,142 +1121,6 @@ return 0; } -#if 0 -static inline memcpy_inc(uint8_t *out, const uint8_t *in, size_t len, unsigned int *idx) -{ - memcpy_inc(out, in, len); - *idx += len; -} - -static int amr_speech_extract_sbits(ubit_t *s_bits, const struct osmo_trau_frame *tf, - enum osmo_amr_mode mode) -{ - unsigned int s_idx = 0; - - switch (mode) { - case AMR_4_75: - memcpy_inc(s_bits + s_idx, tf->d_bits + 44, 67 - 44, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 67, 92 - 67, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 108 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 111, 132 - 111, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 135, 148 - 135, &s_idx); - break; - case AMR_5_15: - memcpy_inc(s_bits + s_idx, tf->d_bits + 46, 96 - 46, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 69, 92 - 69, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 114 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 117, 136 - 117, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 139, 158 - 139, &s_idx); - break; - case AMR_5_90: - memcpy_inc(s_bits + s_idx, tf->d_bits + 41, 67 - 41, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 67, 92 - 67, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 116 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 119, 144 - 119, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 147, 168 - 147, &s_idx); - break; - case AMR_6_70: - memcpy_inc(s_bits + s_idx, tf->d_bits + 37, 63 - 37, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 63, 92 - 63, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 120 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 123, 152 - 123, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 155, 180 - 155, &s_idx); - break; - case AMR_7_40: - memcpy_inc(s_bits + s_idx, tf->d_bits + 34, 60 - 34, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 60, 92 - 60, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 124 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 127, 159 - 127, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 162, 191 - 162, &s_idx); - break; - case AMR_7_95: - memcpy_inc(s_bits + s_idx, tf->d_bits + 31, 58 - 31, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 58, 92 - 58, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 127 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 130, 164 - 130, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 167, 199 - 167, &s_idx); - break; - case AMR_10_2: - memcpy_inc(s_bits + s_idx, tf->d_bits + 20, 46 - 20, &s_idx); /* D21..D46 */ - memcpy_inc(s_bits + s_idx, tf->d_bits + 46, 92 - 46, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 95, 138 - 95, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 141, 187 - 141, &s_idx); - memcpy_inc(s_bits + s_idx, tf->d_bits + 190, 233 - 190, &s_idx); - break; - case AMR_12_2: - memcpy_inc(s_bits + s_idx, tf->d_bits + 0, 38 - 0, &s_idx); /* D1..D38 */ - memcpy_inc(s_bits + s_idx, tf->d_bits + 38, 91 - 38, &s_idx); /* D39..D91 */ - memcpy_inc(s_bits + s_idx, tf->d_bits + 94, 144 - 94, &s_idx); /* D95..D144 */ - memcpy_inc(s_bits + s_idx, tf->d_bits + 147, 200 - 147, &s_idx);/* D148..D200 */ - memcpy_inc(s_bits + s_idx, tf->d_bits + 203, 253 - 203, &s_idx);/* D204..D253 */ - break; - } - - return s_idx; -} - -/* TS 48.060 Section 5.5.1.2.2 */ -static int trau2rtp_16(uint8_t *out, const struct osmo_trau_frame *tf, enum osmo_amr_mode last_cmi) -{ - enum osmo_amr_mode mode = last_cmi; - uint8_t frame_class = tf->c_bits[21] << 1 | tf->c_bits[20]; - uint8_t cmr_cmi = tf->c_bits[23] << 2 | tf->c_bits[24] << 1 | tf->cb_bits[25]; - uint8_t no_speech_cls; - uint8_t s_bits[242]; - uint8_t d_bits[242]; - unsigned int s_idx = 0; - ubit_t rif = FIXME; - - if (tf->type != OSMO_TRAU16_FT_AMR) - return -EINVAL; - - if (rif == 0) - mode = cmr_cmi; - - switch (frame_class) { - case 0: // no speech - no_speech_cls = tf->d_bits[32] << 2 | tf->d_bits[33] << 1 | tf->d_bits[34]; - cmi_abs = tf->d_bits[35] << 2 | tf->d_bits[36] < 1 || tf->d_bits[37]; - cmr_abs = tf->d_bits[38] << 2 | tf->d_bits[39] < 1 || tf->d_bits[40]; - switch (no_speech_cls) { - case 7: // sid first - break; - case 6: // onset - break; - case 5: // sid_update - break; - case 4: // sid_bad - break; - case 0: // no_data - break; - } - break; - case 1: // speech bad - break; - case 2: - case 3: - /* Extract the s-bits from the TRAU frame */ - amr_speech_extract_sbits(s_bits, tf, mode); - /* Convert the s-bits to d-bits */ - osmo_amr_s_to_d(d_bits, s_bits, mode); - break; - } -} - -int trau2rtp_amr(uint8_t *out, const struct osmo_trau_frame *tf, enum osmo_amr_mode last_cmi)) -{ - switch (tf->type) { - case OSMO_TRAU16_FT_AMR: - return trau2rtp_16(out, tf, last_cmi); - case OSMO_TRAU8_AMR_LOW: - case OSMO_TRAU8_AMR_6k7: - case OSMO_TRAU8_AMR_7k4: - default: - return -EINVAL; - } -} -#endif - /* * CSD support: converting TRAU frames of type 'data' to 64 kbit/s * like the RA part of TRAU, using RTP clearmode representation. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ieeee8eb6dbf9c753458a91e13f2bf22311936259 Gerrit-Change-Number: 41744 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log