- gerrit-log - lists.osmocom.org

[XS] Change in osmo-dev[master]: gen_makefile: erlang: fix missing clone and deps
by osmith 09 Oct '25

09 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email ) Change subject: gen_makefile: erlang: fix missing clone and deps ...................................................................... gen_makefile: erlang: fix missing clone and deps Add a dummy configure target for erlang that ensures the git clone and building of dependencies is done before attempting to build erlang projects. A dummy target is used to make the logic consistent with autotools and meson. This is in preparation for building python libraries for pyhss, which will work similarly. Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27 --- M gen_makefile.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/12/41212/1 diff --git a/gen_makefile.py b/gen_makefile.py index 3885e10..e5f07ab 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -382,7 +382,10 @@ touch $@ ''' elif buildsystem == "erlang": - return "" + return f''' +.make.{proj}.configure: .make.{proj}.clone {deps_installed} + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -414,7 +417,7 @@ ''' elif buildsystem == "erlang": return f''' -.make.{proj}.build: $({proj}_files) +.make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" set -x && \\ export REBAR_BASE_DIR="$$PWD/{build_proj}" && \\ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27 Gerrit-Change-Number: 41212 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-dev[master]: gen_makefile: support building PyHSS
by osmith 09 Oct '25

09 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email ) Change subject: gen_makefile: support building PyHSS ...................................................................... gen_makefile: support building PyHSS Support cloning and building PyHSS and "interesting" dependencies (that we might want to patch while hacking on PyHSS). Other dependencies such as sqlalchemy get installed via pip into a venv that is currently shared by all python projects that osmo-dev can build. We can change this later on to use multiple venvs or change the dependencies that get built from source, if needed. Python projects get built with "python3 -m build" into a whl file, and then installed into the venv with "pip install". The above works with projects that have a pyproject.toml. PyHSS currently doesn't have this yet, but this patchset adds one: https://github.com/nickvsnetworking/pyhss/pull/258 python-venv-requirements.txt in this patch is a combination of the relevant dependencies from PyHSS and dependencies that get built from source. Related: OS#6862 Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae --- M all.buildsystems M all.deps M all.urls M gen_makefile.py A python-venv-requirements.txt 5 files changed, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/13/41213/1 diff --git a/all.buildsystems b/all.buildsystems index 7b5a573..63eab23 100644 --- a/all.buildsystems +++ b/all.buildsystems @@ -4,3 +4,9 @@ osmo-s1gw erlang osmo-epdg erlang osmo_dia2gsup erlang + +comp128-python python +gsm0338 python +pyosmocom python +pysctp python +pyhss python diff --git a/all.deps b/all.deps index a49eb87..3439de7 100644 --- a/all.deps +++ b/all.deps @@ -60,3 +60,10 @@ strongswan-epdg libosmocore upf-benchmark libosmocore libosmo-pfcp + +# PyHSS + deps +comp128-python +gsm0338 +pyosmocom gsm0338 +pysctp +pyhss comp128-python pyosmocom pysctp diff --git a/all.urls b/all.urls index ef1b0ab..507399e 100644 --- a/all.urls +++ b/all.urls @@ -5,3 +5,8 @@ open5gs https://github.com/open5gs/open5gs strongswan-epdg https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg osmo-gsm-shark https://gitea.osmocom.org/nhofmeyr/osmo-gsm-shark + +comp128-python https://github.com/Takuto88/comp128-python +gsm0338 https://github.com/dsch/gsm0338 +pysctp https://github.com/P1sec/pysctp +pyhss https://github.com/nickvsnetworking/pyhss diff --git a/gen_makefile.py b/gen_makefile.py index e5f07ab..cfc681b 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -55,6 +55,7 @@ topdir = os.path.dirname(os.path.realpath(__file__)) all_deps_file = os.path.join(topdir, "all.deps") all_urls_file = os.path.join(topdir, "all.urls") +venv_req_file = os.path.join(topdir, "python-venv-requirements.txt") all_buildsystems_file = os.path.join(topdir, "all.buildsystems") parser = argparse.ArgumentParser(epilog=__doc__, formatter_class=argparse.RawTextHelpFormatter) @@ -218,6 +219,9 @@ ret += f"{short}: {' '.join(full)}\n" return ret +def gen_venv_activate(): + return f". {shlex.quote(args.install_prefix)}/venv/bin/activate" + def filter_projects_deps_targets(): if not args.targets: return projects_deps @@ -345,7 +349,7 @@ sync touch $@ ''' - elif buildsystem in ["meson", "erlang"]: + elif buildsystem in ["meson", "erlang", "python"]: return "" else: assert False, f"unknown buildsystem: {buildsystem}" @@ -381,7 +385,7 @@ sync touch $@ ''' - elif buildsystem == "erlang": + elif buildsystem in ["erlang", "python"]: return f''' .make.{proj}.configure: .make.{proj}.clone {deps_installed} touch $@ @@ -426,6 +430,19 @@ sync touch $@ ''' + elif buildsystem == "python": + return f''' +.make.{proj}.build: .make.{proj}.configure .make.{proj}.clone $({proj}_files) + @echo "\\n\\n\\n===== $@\\n" + rm -f {build_proj}/*.whl + python3 \ + -m build \ + --no-isolation \ + {src_proj} \ + --outdir {build_proj} + sync + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -474,6 +491,14 @@ sync touch $@ ''' + elif buildsystem == "python": + return f''' +.make.{proj}.install: .make.venv .make.{proj}.build + @echo "\\n\\n\\n===== $@\\n" + {gen_venv_activate()} && pip install {shlex.quote(build_proj)}/*.whl --force-reinstall + sync + touch $@ + ''' else: assert False, f"unknown buildsystem: {buildsystem}" @@ -556,6 +581,7 @@ \\( \\ -name "*.[hc]" \\ -or -name "*.py" \\ + -or -name "pyproject.toml" \\ -or -name "*.cpp" \\ -or -name "*.tpl" \\ -or -name "*.map" \\ @@ -651,6 +677,12 @@ $(MAKE) --dry-run -d all | grep "is newer than target" $(MAKE) all +# one shared venv for python projects +.make.venv: {venv_req_file} + python3 -m venv {args.install_prefix}/venv + {gen_venv_activate()} && pip install -r {venv_req_file} + touch $@ + # regenerate this Makefile, in case the deps or opts changed .PHONY: regen regen: diff --git a/python-venv-requirements.txt b/python-venv-requirements.txt new file mode 100644 index 0000000..aba74c7 --- /dev/null +++ b/python-venv-requirements.txt @@ -0,0 +1,23 @@ +# These dependencies will be installed into one shared venv in the make dir +# when building python projects such as pyhss. Dependencies that are built from +# source are in all.deps. + +Flask==2.2.3 +Jinja2==3.1.2 +PyYAML +Requests==2.31.0 +SQLAlchemy==2.0.9 +SQLAlchemy_Utils==0.41.1 +Werkzeug==2.2.3 +aiohttp +alembic +comp128==1.0.0 +flask_restx==1.1.0 +prometheus_flask_exporter +pycryptodome==3.17 +pydantic==2.8.2 +pydantic_core==2.20.1 +pysnmp==4.4.12 +redis==5.0.0 +tzlocal==4.3 +xmltodict==0.14.2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae Gerrit-Change-Number: 41213 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: gsm/protocol/gsm_48_103.h: new header file
by falconia 09 Oct '25

09 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41211?usp=email ) Change subject: gsm/protocol/gsm_48_103.h: new header file ...................................................................... gsm/protocol/gsm_48_103.h: new header file 3GPP TS 48.103 prescribes a set of fixed RTP payload type numbers for use on GSM AoIP interface - however, until now there was no Osmocom header file that formally captures these spec definitions. Fix this omission. Change-Id: Id41d4dffd0eb562df4fc948b237d629e858e495b --- M include/osmocom/gsm/protocol/Makefile.am A include/osmocom/gsm/protocol/gsm_48_103.h 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/41211/1 diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am index 23429dc..ada2ce2 100644 --- a/include/osmocom/gsm/protocol/Makefile.am +++ b/include/osmocom/gsm/protocol/Makefile.am @@ -22,6 +22,7 @@ gsm_44_318.h \ gsm_48_049.h \ gsm_48_071.h \ + gsm_48_103.h \ gsm_49_031.h \ ipaccess.h \ smpp34_osmocom.h \ diff --git a/include/osmocom/gsm/protocol/gsm_48_103.h b/include/osmocom/gsm/protocol/gsm_48_103.h new file mode 100644 index 0000000..d40acac --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_48_103.h @@ -0,0 +1,21 @@ +/* + * This header file captures the set of fixed RTP payload type definitions + * specified in 3GPP TS 48.103 (GSM AoIP interface) Table 5.4.2.2.1. + */ + +#pragma once + +/* uncompressed speech */ +#define OSMO_AOIP_RTP_PT_PCMU 0 +#define OSMO_AOIP_RTP_PT_PCMA 8 + +/* compressed speech */ +#define OSMO_AOIP_RTP_PT_FR1 3 +#define OSMO_AOIP_RTP_PT_EFR 110 +#define OSMO_AOIP_RTP_PT_HR1 111 +#define OSMO_AOIP_RTP_PT_AMR 112 +#define OSMO_AOIP_RTP_PT_AMRWB 113 + +/* circuit-switched data */ +#define OSMO_AOIP_RTP_PT_CSD 120 /* without redundancy */ +#define OSMO_AOIP_RTP_PT_CSD_RED 121 /* with redundancy */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41211?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id41d4dffd0eb562df4fc948b237d629e858e495b Gerrit-Change-Number: 41211 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[XS] Change in libosmo-abis[master]: osmo_trau_frame_encode(): fix encoding of 16k O&M frames
by falconia 09 Oct '25

09 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41208?usp=email ) Change subject: osmo_trau_frame_encode(): fix encoding of 16k O&M frames ...................................................................... osmo_trau_frame_encode(): fix encoding of 16k O&M frames The behavior of osmo_trau_frame_encode() for OSMO_TRAU16_FT_OAM has the same unfortunate (but now officially documented) design quirk as all other 16k frame types: bits C1..C5 are set internally by the encoding function and not from caller-supplied fr->c_bits[]. However, there was also a bug: bits C6..C15, which are taken from fr->c_bits[] for all frame types, were copied from the wrong part of this fr->c_bits[] array. Fix the latter bug. Change-Id: Ia366d5b0385b764c492bbed9a030ca27db71fcff --- M src/trau/trau_frame.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/08/41208/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 652c703..ad7a102 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -397,7 +397,7 @@ /* C1 .. C5 */ memcpy(trau_bits + 17, cbits5, 5); /* C6 .. C15 */ - memcpy(trau_bits + 17 + 5, fr->c_bits, 15 - 5); + memcpy(trau_bits + 17 + 5, fr->c_bits + 5, 15 - 5); /* D1 .. D255 */ for (i = 32, d_idx = 0; i < 304; i += 16, d_idx += 15) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia366d5b0385b764c492bbed9a030ca27db71fcff Gerrit-Change-Number: 41208 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in libosmo-abis[master]: osmo_trau_frame_encode(): reduce space requirement in common case
by falconia 09 Oct '25

09 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41209?usp=email ) Change subject: osmo_trau_frame_encode(): reduce space requirement in common case ...................................................................... osmo_trau_frame_encode(): reduce space requirement in common case Since its introduction in 2020, osmo_trau_frame_encode() API has had the ability to emit TRAU-DL frames that are either lengthened or shortened for timing adjustment, like real TRAUs do. However, this capability was never exercised in OsmoMGW-E1, nor is it used in the new tw-e1abis-mgw: given the constraint of having to submit 160-byte blocks to the E1 stack every 20 ms, it is not really feasible for our current sw-only implementation to achieve the same 125 us timing optimizations that are possible and desirable in a hardware or FPGA implementation. Since all current users of osmo_trau_frame_encode() API call it with fr->dl_ta_usec set to 0, the doubled output space requirement imposed by the function becomes an unnecessary burden and an API design bug in need of fixing. Solution: check fr->dir and fr->dl_ta_usec to see if frame output lengthening is actually possible for each given invocation of this function, and require doubled output space only in those cases. Change-Id: I9f3541b0618ebef26e53b69041e5b74abefd3b85 --- M src/trau/trau_frame.c 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/09/41209/1 diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index ad7a102..d0cf3d1 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -1268,6 +1268,8 @@ */ int osmo_trau_frame_encode(ubit_t *bits, size_t n_bits, const struct osmo_trau_frame *fr) { + size_t space_req; + /* check for sufficient space provided by caller in output buffer */ switch (fr->type) { case OSMO_TRAU16_FT_FR: @@ -1276,35 +1278,37 @@ case OSMO_TRAU16_FT_AMR: case OSMO_TRAU16_FT_IDLE: /* timing alignment may happen: increased space requirement */ - if (n_bits < 2 * 40 * 8 - 1) - return -ENOSPC; + if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) + space_req = 2 * 40 * 8 - 1; + else + space_req = 1 * 40 * 8; break; case OSMO_TRAU16_FT_OAM: case OSMO_TRAU16_FT_DATA_HR: case OSMO_TRAU16_FT_DATA: case OSMO_TRAU16_FT_D145_SYNC: case OSMO_TRAU16_FT_EDATA: - if (n_bits < 1 * 40 * 8) - return -ENOSPC; + space_req = 1 * 40 * 8; break; case OSMO_TRAU8_SPEECH: case OSMO_TRAU8_AMR_LOW: case OSMO_TRAU8_AMR_6k7: case OSMO_TRAU8_AMR_7k4: /* timing alignment may happen: increased space requirement */ - if (n_bits < 2 * 20 * 8 - 1) - return -ENOSPC; + if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) + space_req = 2 * 20 * 8 - 1; + else + space_req = 1 * 20 * 8; break; case OSMO_TRAU8_DATA: case OSMO_TRAU8_OAM: - if (n_bits < 1 * 20 * 8) - return -ENOSPC; - break; - case OSMO_TRAU_FT_NONE: + space_req = 1 * 20 * 8; break; default: return -EINVAL; } + if (n_bits < space_req) + return -ENOSPC; switch (fr->type) { case OSMO_TRAU16_FT_FR: @@ -1338,7 +1342,6 @@ return encode8_amr_67(bits, fr); case OSMO_TRAU8_AMR_7k4: return encode8_amr_74(bits, fr); - case OSMO_TRAU_FT_NONE: default: return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9f3541b0618ebef26e53b69041e5b74abefd3b85 Gerrit-Change-Number: 41209 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in libosmo-abis[master]: trau_frame: add support for config frames of 3GPP Rel5+
by falconia 09 Oct '25

09 Oct '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41210?usp=email ) Change subject: trau_frame: add support for config frames of 3GPP Rel5+ ...................................................................... trau_frame: add support for config frames of 3GPP Rel5+ 3GPP Rel5 introduced Generic Config Frame format for TFO, defined in TS 28.062 Annex H (globally interoperable interface), and also defined equivalent Speech Codec Configuration Exchange frames on Abis (treated mostly as vendor-private interface by this point), added to TS 48.060 and 48.061. These Generic Config Frames are mandatory for AMR-WB codec, which not only requires TFO in order to be useful (in the absence of all-IP TrFO), but also lacks the ability to stuff TFO config parameters into regular speech frames in the way that was specified in 3GPP Rel4 for AMR-NB. Support for these GCFs on Abis is necessary in order to support TFO-AMR with some vendors' E1 BTS. Some vendors of TDM-based GSM BSS felt no interest in TFO-AMR for its own sake, and only implemented TFO support for AMR (both NB and WB) when forced to do so by AMR-WB market demand; these vendors (Nokia is one known case) skipped 3GPP Rel4 version of TFO-AMR and went directly for Rel5 version, using Generic Config Frames on Abis for both AMR-NB and AMR-WB. Change-Id: Ifbde07e4a3fb80e4faa0b6a6b32938ed98371c5b --- M include/osmocom/trau/trau_frame.h M src/trau/trau_frame.c 2 files changed, 178 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/10/41210/1 diff --git a/include/osmocom/trau/trau_frame.h b/include/osmocom/trau/trau_frame.h index dd14f27..9048dca 100644 --- a/include/osmocom/trau/trau_frame.h +++ b/include/osmocom/trau/trau_frame.h @@ -62,6 +62,7 @@ #define TRAU_FT_EDATA 0x1f /* 1 1 1 1 1 - 3.5.4 */ #define TRAU_FT_IDLE_UP 0x10 /* 1 0 0 0 0 - 3.5.5 */ #define TRAU_FT_IDLE_DOWN 0x0e /* 0 1 1 1 0 - 3.5.5 */ +#define TRAU_FT_CONFIG_EXCH 0x1e /* 1 1 1 1 0 - TS 48.060 5.5.1.5 */ /* 8k sub-slot types: Bits C1..C5*/ #define TRAU8_FT_SPEECH_UP 0x02 /* 0 0 0 1 P - TS 08.61 5.2.4.1.1 */ @@ -94,6 +95,10 @@ OSMO_TRAU8_AMR_LOW, OSMO_TRAU8_AMR_6k7, OSMO_TRAU8_AMR_7k4, + + /* new types at the end, for ABI compatibility */ + OSMO_TRAU16_FT_CONFIG, + OSMO_TRAU8_CONFIG, }; extern const struct value_string osmo_trau_frame_type_names[]; diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index d0cf3d1..896bc20 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -61,12 +61,14 @@ { OSMO_TRAU16_FT_D145_SYNC, "D145_SYNC" }, { OSMO_TRAU16_FT_DATA_HR, "DATA_HR" }, { OSMO_TRAU16_FT_IDLE, "IDLE" }, + { OSMO_TRAU16_FT_CONFIG, "CONFIG" }, { OSMO_TRAU8_SPEECH, "8SPEECH" }, { OSMO_TRAU8_DATA, "8DATA" }, { OSMO_TRAU8_OAM, "8OAM" }, { OSMO_TRAU8_AMR_LOW, "8AMR_LOW" }, { OSMO_TRAU8_AMR_6k7, "8AMR_6k7" }, { OSMO_TRAU8_AMR_7k4, "8AMR_7k4" }, + { OSMO_TRAU8_CONFIG, "8CONFIG" }, { 0, NULL } }; @@ -763,6 +765,57 @@ return 40 * 8; } +/* TS 48.060 sections 5.1.5 and 5.5.1.5: generic configuration frames */ + +static int decode16_gcf(struct osmo_trau_frame *fr, const ubit_t *trau_bits, + enum osmo_trau_frame_direction dir) +{ + int i, d_idx; + + /* C1 .. C5 */ + memcpy(fr->c_bits, trau_bits + 17, 5); + + /* D1 .. D10 */ + memcpy(fr->d_bits, trau_bits + 22, 10); + d_idx = 10; + /* D11 .. D265 */ + for (i = 32; i < 304; i += 16) { + memcpy(fr->d_bits + d_idx, trau_bits + i + 1, 15); + d_idx += 15; + } + /* D266 .. D276 */ + memcpy(fr->d_bits + d_idx, trau_bits + 305, 11); + + /* T1 .. T4 */ + memcpy(fr->t_bits, trau_bits + 316, 4); + + return 0; +} + +static int encode16_gcf(ubit_t *trau_bits, const struct osmo_trau_frame *fr) +{ + int i, d_idx; + + encode_sync16(trau_bits); + + /* C1 .. C5 */ + memcpy(trau_bits + 17, fr->c_bits, 5); + /* D1 .. D10 */ + memcpy(trau_bits + 22, fr->d_bits, 10); + + /* D11 .. D276 */ + for (i = 32, d_idx = 10; i <= 315; i += 16, d_idx += 15) { + trau_bits[i] = 1; + memcpy(trau_bits + i + 1, fr->d_bits + d_idx, 15); + } + + /* T1 .. T4 */ + memcpy(trau_bits + 316, fr->t_bits, 4); + + /* handle timing adjustment */ + return encode16_handle_ta(trau_bits, fr); +} + /* TS 08.61 Section 5.2.1.1 */ static int decode8_hr(struct osmo_trau_frame *fr, const ubit_t *trau_bits, enum osmo_trau_frame_direction dir) @@ -1229,6 +1282,70 @@ return 20 * 8; } +/* TS 48.061 section 5.2.1.3: generic configuration frames */ + +static int decode8_gcf(struct osmo_trau_frame *fr, const ubit_t *trau_bits, + enum osmo_trau_frame_direction dir) +{ + int i, d_idx = 0; + + /* C1 .. C5 */ + memcpy(fr->c_bits, trau_bits + 1 * 8 + 1, 5); + /* D1 .. D2 */ + memcpy(fr->d_bits + d_idx, trau_bits + 1 * 8 + 6, 2); + d_idx += 2; + /* D3 .. D8 */ + memcpy(fr->d_bits + d_idx, trau_bits + 2 * 8 + 2, 6); + d_idx += 6; + /* D9 .. D120 */ + for (i = 3; i < 19; i++) { + memcpy(fr->d_bits + d_idx, trau_bits + i * 8 + 1, 7); + d_idx += 7; + } + /* D121 .. D125 */ + memcpy(fr->d_bits + d_idx, trau_bits + 19 * 8 + 1, 5); + + /* T1 .. T2 */ + memcpy(fr->t_bits, trau_bits + 19 * 8 + 6, 2); + + return 0; +} + +static int encode8_gcf(ubit_t *trau_bits, const struct osmo_trau_frame *fr) +{ + int i, d_idx = 0; + + /* sync pattern */ + memset(trau_bits, 0, 8); + trau_bits[1 * 8 + 0] = 1; + trau_bits[2 * 8 + 0] = 0; + trau_bits[2 * 8 + 1] = 1; + for (i = 3; i < 20; i++) + trau_bits[i * 8] = 1; + + /* C1 .. C5 */ + memcpy(trau_bits + 1 * 8 + 1, fr->c_bits, 5); + /* D1 .. D2 */ + memcpy(trau_bits + 1 * 8 + 6, fr->d_bits + d_idx, 2); + d_idx += 2; + /* D3 .. D8 */ + memcpy(trau_bits + 2 * 8 + 2, fr->d_bits + d_idx, 6); + d_idx += 6; + /* D9 .. D120 */ + for (i = 3; i < 19; i++) { + memcpy(trau_bits + i * 8 + 1, fr->d_bits + d_idx, 7); + d_idx += 7; + } + /* D121 .. D125 */ + memcpy(trau_bits + 19 * 8 + 1, fr->d_bits + d_idx, 5); + + /* T1 .. T2 */ + memcpy(trau_bits + 19 * 8 + 6, fr->t_bits, 2); + + /* handle timing adjustment */ + return encode8_handle_ta(trau_bits, fr); +} + /*! Encode a TRAU frame from its decoded representation to a sequence of unpacked bits. * \param[out] bits caller-allocated buffer for unpacked output bits @@ -1250,17 +1367,18 @@ * The following list summarizes the behavior of the present function with * regard to C1..C5 bits for different frame types: * - * - For all TRAU-16k frame types in both UL and DL directions, and for - * OSMO_TRAU8_SPEECH (TRAU-8k for HRv1 speech) in UL direction, the first 5 - * bits of fr->c_bits[] are ignored and replaced with internally supplied - * constant values. + * - For all TRAU-16k frame types in both UL and DL directions, with the + * exception of newly added OSMO_TRAU16_FT_CONFIG, and for OSMO_TRAU8_SPEECH + * (TRAU-8k for HRv1 speech) in UL direction, the first 5 bits of fr->c_bits[] + * are ignored and replaced with internally supplied constant values. * * - For OSMO_TRAU8_SPEECH in DL direction, only fr->c_bits[3] is used to set * C4; constant values for C1..C3 and odd parity value for C5 are fixed * by the function. * - * - For OSMO_TRAU8_DATA, OSMO_TRAU8_OAM and all AMR-8k frame types, - * user-supplied fr->c_bits[] are always used. + * - For OSMO_TRAU8_DATA, OSMO_TRAU8_OAM and all AMR-8k frame types, as well as + * newly added OSMO_TRAU16_FT_CONFIG and OSMO_TRAU8_CONFIG, user-supplied + * fr->c_bits[] are always used. * * This unfortunate manipulation applies only to C1..C5 as listed above; * for control bits C6 and higher (for frame types that have them), @@ -1277,6 +1395,7 @@ case OSMO_TRAU16_FT_HR: case OSMO_TRAU16_FT_AMR: case OSMO_TRAU16_FT_IDLE: + case OSMO_TRAU16_FT_CONFIG: /* timing alignment may happen: increased space requirement */ if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) space_req = 2 * 40 * 8 - 1; @@ -1294,6 +1413,7 @@ case OSMO_TRAU8_AMR_LOW: case OSMO_TRAU8_AMR_6k7: case OSMO_TRAU8_AMR_7k4: + case OSMO_TRAU8_CONFIG: /* timing alignment may happen: increased space requirement */ if (fr->dir == OSMO_TRAU_DIR_DL && fr->dl_ta_usec > 0) space_req = 2 * 20 * 8 - 1; @@ -1330,6 +1450,8 @@ return encode16_d145_sync(bits, fr); case OSMO_TRAU16_FT_EDATA: return encode16_edata(bits, fr); + case OSMO_TRAU16_FT_CONFIG: + return encode16_gcf(bits, fr); case OSMO_TRAU8_SPEECH: return encode8_hr(bits, fr, false); case OSMO_TRAU8_DATA: @@ -1342,6 +1464,8 @@ return encode8_amr_67(bits, fr); case OSMO_TRAU8_AMR_7k4: return encode8_amr_74(bits, fr); + case OSMO_TRAU8_CONFIG: + return encode8_gcf(bits, fr); default: return -EINVAL; } @@ -1371,6 +1495,7 @@ case OSMO_TRAU16_FT_FR: case OSMO_TRAU16_FT_EFR: case OSMO_TRAU16_FT_AMR: + case OSMO_TRAU16_FT_CONFIG: if (n_bits < 1 * 40 * 8) return -ENOSPC; break; @@ -1378,6 +1503,7 @@ case OSMO_TRAU8_AMR_LOW: case OSMO_TRAU8_AMR_6k7: case OSMO_TRAU8_AMR_7k4: + case OSMO_TRAU8_CONFIG: if (n_bits < 1 * 20 * 8) return -ENOSPC; break; @@ -1391,6 +1517,8 @@ return encode16_fr(bits, fr, true); case OSMO_TRAU16_FT_AMR: return encode16_amr(bits, fr, true); + case OSMO_TRAU16_FT_CONFIG: + return encode16_gcf(bits, fr); case OSMO_TRAU8_SPEECH: return encode8_hr(bits, fr, true); case OSMO_TRAU8_AMR_LOW: @@ -1399,6 +1527,8 @@ return encode8_amr_67(bits, fr); case OSMO_TRAU8_AMR_7k4: return encode8_amr_74(bits, fr); + case OSMO_TRAU8_CONFIG: + return encode8_gcf(bits, fr); default: return -EINVAL; } @@ -1455,6 +1585,9 @@ case TRAU_FT_D145_SYNC: fr->type = OSMO_TRAU16_FT_D145_SYNC; return decode16_data(fr, bits, dir); + case TRAU_FT_CONFIG_EXCH: + fr->type = OSMO_TRAU16_FT_CONFIG; + return decode16_gcf(fr, bits, dir); default: return -EINVAL; @@ -1499,6 +1632,9 @@ case 0xB: /* OHR_AMR */ fr->type = OSMO_TRAU16_FT_AMR; return decode16_amr(fr, bits, fr->dir); + case TRAU_FT_CONFIG_EXCH >> 1: + fr->type = OSMO_TRAU16_FT_CONFIG; + return decode16_gcf(fr, bits, fr->dir); default: return -EINVAL; } @@ -1617,6 +1753,9 @@ case 0x0B: fr->type = OSMO_TRAU8_OAM; return decode8_oam(fr, bits, dir); + case 0x1F: + fr->type = OSMO_TRAU8_CONFIG; + return decode8_gcf(fr, bits, dir); } } else { /* Downlink */ @@ -1630,6 +1769,9 @@ case 2: fr->type = OSMO_TRAU8_OAM; return decode8_oam(fr, bits, dir); + case 7: + fr->type = OSMO_TRAU8_CONFIG; + return decode8_gcf(fr, bits, dir); } } } else if (is_amr_low(bits)) { @@ -1665,18 +1807,31 @@ * no need to distinguish between HRv1 and AMR-8k frames by their respective * sync patterns: per TS 28.062, these two TFO frame types never occur * in the same bit position in TFO-superimposed PCM speech octets. - * Because HRv1 is the only TFO frame type that can occur in the configuration - * of TS 28.062 section 5.3 (only the one lsb in each PCM speech octet is - * overwritten), this function skips all attempts at frame type classification: - * the TFO application is responsible for detecting the presence of valid - * TFO frames for the negotiated codec type. + * + * Frame type bits C1..C4 are checked only to distinguish between regular + * HRv1 speech frames and Generic Configuration Frames of TS 28.062 Annex H: + * Rel5+ versions of TFO spec allow these GCFs to be used with all codecs + * if both ends of TFO connection implement Rel5+ version of TFO. */ int osmo_trau_frame_decode_tfo_hr1(struct osmo_trau_frame *fr, const ubit_t *bits) { - fr->type = OSMO_TRAU8_SPEECH; + uint8_t cbits4 = get_bits(bits, 9, 4); + /* We don't look at bit C5 because it is EMBED bit in TFO frames */ + + fr->type = OSMO_TRAU_FT_NONE; fr->dir = OSMO_TRAU_DIR_UL; /* TFO frames are modified TRAU-UL */ fr->dl_ta_usec = 0; - return decode8_hr(fr, bits, fr->dir); + + switch (cbits4) { + case 0x01: + fr->type = OSMO_TRAU8_SPEECH; + return decode8_hr(fr, bits, fr->dir); + case 0x0F: + fr->type = OSMO_TRAU8_CONFIG; + return decode8_gcf(fr, bits, fr->dir); + default: + return -EINVAL; + } } /*! Decode/parse an AMR_TFO_8+8k frame from unpacked bits to decoded format. @@ -1690,7 +1845,8 @@ * The second lsb extracted from PCM samples is the entity being decoded here. * Compared to osmo_trau_frame_decode_8k(), the present function requires * the direction to be TRAU-UL (as always the case in TFO) and accepts - * only AMR-8k frame types. + * only AMR-8k frame types, or Generic Configuration Frames of TS 28.062 + * Annex H that are used in Rel5+ version of TFO. */ int osmo_trau_frame_decode_tfo_amr_8k(struct osmo_trau_frame *fr, const ubit_t *bits) { @@ -1707,6 +1863,9 @@ } else if (is_amr_74(bits)) { fr->type = OSMO_TRAU8_AMR_7k4; return decode8_amr_74(fr, bits, fr->dir); + } else if (is_hr(bits) && get_bits(bits, 9, 4) == 0x0F) { + fr->type = OSMO_TRAU8_CONFIG; + return decode8_gcf(fr, bits, fr->dir); } return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41210?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifbde07e4a3fb80e4faa0b6a6b32938ed98371c5b Gerrit-Change-Number: 41210 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in libosmo-abis[master]: trau2rtp CSD: add option to emit TW-TS-007 payloads
by falconia 08 Oct '25

08 Oct '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41164?usp=email ) Change subject: trau2rtp CSD: add option to emit TW-TS-007 payloads ...................................................................... trau2rtp CSD: add option to emit TW-TS-007 payloads Setting OSMO_RTP_EXT_TWTS007 bit in st->rtp_extensions switches CSD RTP output format from standard but inefficient CLEARMODE to the compressed-CSD RTP payload format of TW-TS-007. This new mechanism is fully symmetric with already implemented mechanism that enables or disables TW-TS-001 and TW-TS-002 RTP output for FR/HR/EFR speech codecs. Depends: I2cc2c9340f9fa5c7111447a6beef49c335fa1107 (libosmocore) Change-Id: I86d628c65104a119ef0fb9f27f5835c9a1769971 --- M TODO-RELEASE M src/trau/trau_rtp_conv.c 2 files changed, 91 insertions(+), 1 deletion(-) Approvals: falconia: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 32849fa..ffa6ecf 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-netif >1.6.0 stream OSMO_STREAM_{CLI,SRV}_TCP_SOCKOPT_* +libosmogsm >1.11.0 OSMO_RTP_EXT_TWTS007 definition in rtp_extensions.h diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 156b57a..9d23065 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -1260,6 +1260,7 @@ /* * CSD support: converting TRAU frames of type 'data' to 64 kbit/s * like the RA part of TRAU, using RTP clearmode representation. + * Alternatively, emit compressed-CSD RTP payload format of TW-TS-007. */ static int trau2rtp_data_fr(uint8_t *out, size_t out_len, @@ -1286,6 +1287,34 @@ return OSMO_CLEARMODE_20MS; } +static int trau2rtp_data_fr_ccsd(uint8_t *out, size_t out_len, + const struct osmo_trau_frame *tf) +{ + int len; + + /* function interface preliminaries */ + if (tf->type != OSMO_TRAU16_FT_DATA) + return -EINVAL; + if (out_len < OSMO_CCSD_PL_LEN_9k6) + return -ENOSPC; + + /* Is it TCH/F9.6 with 16 kbit/s IR, + * or TCH/F4.8 or TCH/F2.4 with 8 kbit/s IR? */ + if (tf->c_bits[5]) { + osmo_ccsd_pack_v110_frame(out, tf->d_bits); + osmo_ccsd_pack_v110_frame(out + 8, tf->d_bits + 63); + osmo_ccsd_pack_v110_frame(out + 16, tf->d_bits + 63 * 2); + osmo_ccsd_pack_v110_frame(out + 24, tf->d_bits + 63 * 3); + len = OSMO_CCSD_PL_LEN_9k6; + } else { + osmo_ccsd_pack_v110_frame(out, tf->d_bits); + osmo_ccsd_pack_v110_frame(out + 8, tf->d_bits + 63 * 2); + len = OSMO_CCSD_PL_LEN_4k8; + } + + return len; +} + static int trau2rtp_data_hr16(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf) { @@ -1305,8 +1334,27 @@ return OSMO_CLEARMODE_20MS; } +static int trau2rtp_data_hr16_ccsd(uint8_t *out, size_t out_len, + const struct osmo_trau_frame *tf) +{ + /* function interface preliminaries */ + if (tf->type != OSMO_TRAU16_FT_DATA_HR) + return -EINVAL; + if (out_len < OSMO_CCSD_PL_LEN_4k8) + return -ENOSPC; + + /* Note that Osmocom trau_frame decoding and encoding API + * puts the second reduced V.110 frame at d_bits position 63, + * unlike 8 kbit/s IR in FR-data frame type where it resides + * at d_bits position 63 * 2. */ + osmo_ccsd_pack_v110_frame(out, tf->d_bits); + osmo_ccsd_pack_v110_frame(out + 8, tf->d_bits + 63); + + return OSMO_CCSD_PL_LEN_4k8; +} + static int trau2rtp_data_hr8(uint8_t *out, size_t out_len, - const struct osmo_trau_frame *tf) + const struct osmo_trau_frame *tf) { /* function interface preliminaries */ if (tf->type != OSMO_TRAU8_DATA) @@ -1320,6 +1368,21 @@ return OSMO_CLEARMODE_20MS; } +static int trau2rtp_data_hr8_ccsd(uint8_t *out, size_t out_len, + const struct osmo_trau_frame *tf) +{ + /* function interface preliminaries */ + if (tf->type != OSMO_TRAU8_DATA) + return -EINVAL; + if (out_len < OSMO_CCSD_PL_LEN_4k8) + return -ENOSPC; + + osmo_ccsd_pack_v110_frame(out, tf->d_bits); + osmo_ccsd_pack_v110_frame(out + 8, tf->d_bits + 63); + + return OSMO_CCSD_PL_LEN_4k8; +} + static int trau2rtp_edata(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf) { @@ -1337,6 +1400,24 @@ return OSMO_CLEARMODE_20MS; } +static int trau2rtp_edata_ccsd(uint8_t *out, size_t out_len, + const struct osmo_trau_frame *tf) +{ + /* function interface preliminaries */ + if (tf->type != OSMO_TRAU16_FT_EDATA) + return -EINVAL; + if (out_len < OSMO_CCSD_PL_LEN_14k4) + return -ENOSPC; + + /* Per TS 48.020 section 11.1: + * A-TRAU bit C4 is always 1 in BSS->IWF direction + * A-TRAU bit C5 comes from E-TRAU bit C6 */ + osmo_ccsd_pack_atrau_frame(out, tf->m_bits, tf->d_bits, 1, + tf->c_bits[5]); + + return OSMO_CCSD_PL_LEN_14k4; +} + /* * CSD in the opposite direction: from clearmode RTP input * to TRAU frame output. @@ -1700,14 +1781,22 @@ case OSMO_TRAU16_FT_HR: return trau2rtp_hr16(out, out_len, tf, check_twts002(st), ufe); case OSMO_TRAU16_FT_DATA: + if (st->rtp_extensions & OSMO_RTP_EXT_TWTS007) + return trau2rtp_data_fr_ccsd(out, out_len, tf); return trau2rtp_data_fr(out, out_len, tf); case OSMO_TRAU16_FT_DATA_HR: + if (st->rtp_extensions & OSMO_RTP_EXT_TWTS007) + return trau2rtp_data_hr16_ccsd(out, out_len, tf); return trau2rtp_data_hr16(out, out_len, tf); case OSMO_TRAU16_FT_EDATA: + if (st->rtp_extensions & OSMO_RTP_EXT_TWTS007) + return trau2rtp_edata_ccsd(out, out_len, tf); return trau2rtp_edata(out, out_len, tf); case OSMO_TRAU8_SPEECH: return trau2rtp_hr8(out, out_len, tf, check_twts002(st), ufe); case OSMO_TRAU8_DATA: + if (st->rtp_extensions & OSMO_RTP_EXT_TWTS007) + return trau2rtp_data_hr8_ccsd(out, out_len, tf); return trau2rtp_data_hr8(out, out_len, tf); default: return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41164?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: I86d628c65104a119ef0fb9f27f5835c9a1769971 Gerrit-Change-Number: 41164 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: trau/clearmode.h: add OSMO_CLEARMODE_20MS definition
by falconia 08 Oct '25

08 Oct '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41158?usp=email ) Change subject: trau/clearmode.h: add OSMO_CLEARMODE_20MS definition ...................................................................... trau/clearmode.h: add OSMO_CLEARMODE_20MS definition RFC4040_RTP_PLEN was previously defined privately in OsmoBTS and in trau_rtp_conv.c module in this library, but there was no official definition in any of Osmocom headers. Add <osmocom/trau/clearmode.h> header with OSMO_CLEARMODE_20MS definition. Change-Id: I4b2e49b085574336820468dc8cfb8e32377788bf --- M include/Makefile.am A include/osmocom/trau/clearmode.h M src/trau/trau_rtp_conv.c 3 files changed, 38 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/Makefile.am b/include/Makefile.am index e9820c8..565e3cb 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -24,6 +24,7 @@ osmocom/abis/trau_frame.h \ osmocom/abis/unixsocket_proto.h \ osmocom/abis/version.h \ + osmocom/trau/clearmode.h \ osmocom/trau/csd_ra2.h \ osmocom/trau/csd_raa_prime.h \ osmocom/trau/tfo_frame.h \ diff --git a/include/osmocom/trau/clearmode.h b/include/osmocom/trau/clearmode.h new file mode 100644 index 0000000..60fbc5a --- /dev/null +++ b/include/osmocom/trau/clearmode.h @@ -0,0 +1,23 @@ +/* + * This header file contains some definitions for CSD in CLEARMODE RTP + * representation. + * + * Author: Mychaela N. Falconia <falcon(a)freecalypso.org>, 2025 - however, + * Mother Mychaela's contributions are NOT subject to copyright. + * No rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#pragma once + +/* RFC4040 CLEARMODE RTP payload length for 20 ms as specified in TS 48.103 */ +#define OSMO_CLEARMODE_20MS 160 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index f2e0022..f670578 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -30,12 +30,10 @@ #include <osmocom/trau/trau_frame.h> #include <osmocom/trau/trau_rtp.h> +#include <osmocom/trau/clearmode.h> #include <osmocom/trau/csd_ra2.h> #include <osmocom/trau/csd_raa_prime.h> -/* RFC4040 "clearmode" RTP payload length */ -#define RFC4040_RTP_PLEN 160 - /* this corresponds to the bit-lengths of the individual codec * parameters as indicated in Table 1.1 of TS 46.010 */ static const uint8_t gsm_fr_map[] = { @@ -1304,7 +1302,7 @@ /* function interface preliminaries */ if (tf->type != OSMO_TRAU16_FT_DATA) return -EINVAL; - if (out_len < RFC4040_RTP_PLEN) + if (out_len < OSMO_CLEARMODE_20MS) return -ENOSPC; /* Is it TCH/F9.6 with 16 kbit/s IR, @@ -1319,7 +1317,7 @@ trau2v110_ir8(out + 80, tf->d_bits + 63 * 2); } - return RFC4040_RTP_PLEN; + return OSMO_CLEARMODE_20MS; } static int trau2rtp_data_hr16(uint8_t *out, size_t out_len, @@ -1328,7 +1326,7 @@ /* function interface preliminaries */ if (tf->type != OSMO_TRAU16_FT_DATA_HR) return -EINVAL; - if (out_len < RFC4040_RTP_PLEN) + if (out_len < OSMO_CLEARMODE_20MS) return -ENOSPC; /* Note that Osmocom trau_frame decoding and encoding API @@ -1338,7 +1336,7 @@ trau2v110_ir8(out, tf->d_bits); trau2v110_ir8(out + 80, tf->d_bits + 63); - return RFC4040_RTP_PLEN; + return OSMO_CLEARMODE_20MS; } static int trau2rtp_data_hr8(uint8_t *out, size_t out_len, @@ -1347,13 +1345,13 @@ /* function interface preliminaries */ if (tf->type != OSMO_TRAU8_DATA) return -EINVAL; - if (out_len < RFC4040_RTP_PLEN) + if (out_len < OSMO_CLEARMODE_20MS) return -ENOSPC; trau2v110_ir8(out, tf->d_bits); trau2v110_ir8(out + 80, tf->d_bits + 63); - return RFC4040_RTP_PLEN; + return OSMO_CLEARMODE_20MS; } static int trau2rtp_edata(uint8_t *out, size_t out_len, @@ -1362,7 +1360,7 @@ /* function interface preliminaries */ if (tf->type != OSMO_TRAU16_FT_EDATA) return -EINVAL; - if (out_len < RFC4040_RTP_PLEN) + if (out_len < OSMO_CLEARMODE_20MS) return -ENOSPC; /* Per TS 48.020 section 11.1: @@ -1370,7 +1368,7 @@ * A-TRAU bit C5 comes from E-TRAU bit C6 */ osmo_csd144_to_atrau_ra2(out, tf->m_bits, tf->d_bits, 1, tf->c_bits[5]); - return RFC4040_RTP_PLEN; + return OSMO_CLEARMODE_20MS; } /* @@ -1436,11 +1434,11 @@ { ubit_t ra_bits[80 * 2]; - if (data_len != RFC4040_RTP_PLEN) + if (data_len != OSMO_CLEARMODE_20MS) goto idle_fill; /* reverse RA2 first */ - osmo_csd_ra2_8k_unpack(ra_bits, data, RFC4040_RTP_PLEN); + osmo_csd_ra2_8k_unpack(ra_bits, data, OSMO_CLEARMODE_20MS); /* enforce two properly aligned V.110 frames */ if (!check_v110_align(ra_bits)) @@ -1464,11 +1462,11 @@ { ubit_t ra_bits[80 * 4]; - if (data_len != RFC4040_RTP_PLEN) + if (data_len != OSMO_CLEARMODE_20MS) goto idle_fill; /* reverse RA2 first */ - osmo_csd_ra2_16k_unpack(ra_bits, data, RFC4040_RTP_PLEN); + osmo_csd_ra2_16k_unpack(ra_bits, data, OSMO_CLEARMODE_20MS); /* enforce 4 properly aligned V.110 frames */ if (!check_v110_align(ra_bits)) @@ -1606,7 +1604,7 @@ /* set C6=0: indicate good reception of TRAU-UL frames */ tf->c_bits[5] = 0; - if (data_len == RFC4040_RTP_PLEN && + if (data_len == OSMO_CLEARMODE_20MS && osmo_csd144_from_atrau_ra2(tf->m_bits, tf->d_bits, &atrau_c4, NULL, data) >= 0) { /* We got good A-TRAU input. 3GPP specs define the following -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41158?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: I4b2e49b085574336820468dc8cfb8e32377788bf Gerrit-Change-Number: 41158 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in libosmo-abis[master]: trau: factor out V.110 frame conversion functions
by falconia 08 Oct '25

08 Oct '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41159?usp=email ) Change subject: trau: factor out V.110 frame conversion functions ...................................................................... trau: factor out V.110 frame conversion functions Implementation of CSD conversion between TRAU frames and CLEARMODE inside osmo_trau2rtp() and osmo_rtp2trau() contains lower-level functions for conversion of individual V.110 frames and for alignment checking. Factor these functions out into API, as they are useful for other applications besides TRAU<->RTP conversion: * Compression and decompression functions that convert between standard (but inefficient) CLEARMODE and compressed-CSD RTP format of TW-TS-007; * Implementations of IWFs that terminate CSD RTP streams at the CN and support both CLEARMODE and TW-TS-007. Change-Id: I3f51254b4b985a0f8499c375b61069ca24f77ae8 --- M include/Makefile.am A include/osmocom/trau/csd_v110.h M src/Makefile.am A src/trau/csd_v110.c 4 files changed, 160 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 565e3cb..862292e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,6 +27,7 @@ osmocom/trau/clearmode.h \ osmocom/trau/csd_ra2.h \ osmocom/trau/csd_raa_prime.h \ + osmocom/trau/csd_v110.h \ osmocom/trau/tfo_frame.h \ osmocom/trau/trau_frame.h \ osmocom/trau/trau_pcu_ericsson.h \ diff --git a/include/osmocom/trau/csd_v110.h b/include/osmocom/trau/csd_v110.h new file mode 100644 index 0000000..05d4ed5 --- /dev/null +++ b/include/osmocom/trau/csd_v110.h @@ -0,0 +1,40 @@ +/* + * This header file defines the public API for some helper functions that + * work with CSD V.110 frames represented in the standard 64 kbit/s CLEARMODE + * format of 3GPP TS 48.103, _without_ compression per TW-TS-007, but _with_ + * Osmocom-introduced constraint that the pair or quadruple of V.110 frames + * in RA2 encoding has to be naturally aligned within each 20 ms RTP packet. + * + * Author: Mychaela N. Falconia <falcon(a)freecalypso.org>, 2025 - however, + * Mother Mychaela's contributions are NOT subject to copyright. + * No rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#pragma once + +#include <stdint.h> +#include <stdbool.h> +#include <osmocom/core/bits.h> + +/* conversion from distilled 63-bit format (as used in TRAU frames) to full + * 80-bit V.110 format, with or without RA2. */ + +void osmo_csd_63bits_to_v110_bits(ubit_t *out, const ubit_t *in); +void osmo_csd_63bits_to_v110_ir8(uint8_t *out, const ubit_t *in); +void osmo_csd_63bits_to_v110_ir16(uint8_t *out, const ubit_t *in); + +/* functions to verify V.110 frame alignment after RA2 decoding, and to convert + * to our distilled 63-bit format. */ + +bool osmo_csd_check_v110_align(const ubit_t *ra_bits); +void osmo_csd_v110_to_63bits(ubit_t *out, const ubit_t *ra_bits); diff --git a/src/Makefile.am b/src/Makefile.am index fc5b59b..6683d44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,6 +53,7 @@ $(NULL) libosmotrau_la_LIBADD = $(COMMONLIBS) $(LIBOSMOCODEC_LIBS) $(ORTP_LIBS) libosmotrau_la_SOURCES = trau/csd_ra2.c \ + trau/csd_v110.c \ trau/raa_prime_decode.c \ trau/raa_prime_encode.c \ trau/tfo_frame.c \ diff --git a/src/trau/csd_v110.c b/src/trau/csd_v110.c new file mode 100644 index 0000000..431073c --- /dev/null +++ b/src/trau/csd_v110.c @@ -0,0 +1,118 @@ +/* + * This C module contains the implementation of CSD V.110 helper functions + * for CLEARMODE defined in <osmocom/trau/csd_v110.h>. + * + * Author: Mychaela N. Falconia <falcon(a)freecalypso.org>, 2025 - however, + * Mother Mychaela's contributions are NOT subject to copyright. + * No rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <stdbool.h> +#include <string.h> + +#include <osmocom/core/bits.h> +#include <osmocom/trau/csd_ra2.h> +#include <osmocom/trau/csd_v110.h> + +/*! Convert V.110 frame from distilled 63-bit form (as it appears in TRAU + * frames) to full 80-bit form by adding sync pattern bits. + * \param[out] out buffer of size 80 ubit_t + * \param[in] in 63-bit distilled V.110 frame + */ +void osmo_csd_63bits_to_v110_bits(ubit_t *out, const ubit_t *in) +{ + int i; + + /* the first 8 bits are sync zeros */ + memset(out, 0, 8); + out += 8; + /* for the rest, we have to expand 63 bits into 72 */ + for (i = 0; i < 9; i++) { + *out++ = 1; + memcpy(out, in, 7); + in += 7; + out += 7; + } +} + +/*! Convert V.110 frame from distilled 63-bit form (as it appears in TRAU + * frames) to external octet form (RA2 with 8 kbit/s IR) form by adding + * sync pattern bits and applying RA2. + * \param[out] out buffer of size 80 octets + * \param[in] in 63-bit distilled V.110 frame + */ +void osmo_csd_63bits_to_v110_ir8(uint8_t *out, const ubit_t *in) +{ + ubit_t ra_bits[80]; + + osmo_csd_63bits_to_v110_bits(ra_bits, in); + /* RA2: 1 bit per output byte */ + osmo_csd_ra2_8k_pack(out, ra_bits, 80); +} + +/*! Convert V.110 frame from distilled 63-bit form (as it appears in TRAU + * frames) to external octet form (RA2 with 16 kbit/s IR) form by adding + * sync pattern bits and applying RA2. + * \param[out] out buffer of size 40 octets + * \param[in] in 63-bit distilled V.110 frame + */ +void osmo_csd_63bits_to_v110_ir16(uint8_t *out, const ubit_t *in) +{ + ubit_t ra_bits[80]; + + osmo_csd_63bits_to_v110_bits(ra_bits, in); + /* RA2: 2 bits per output byte */ + osmo_csd_ra2_16k_pack(out, ra_bits, 40); +} + +/*! Check alignment of unpacked 80-bit V.110 frame. + * \param[in] ra_bits candidate V.110 frame in standard 80-bit form + * \returns true if V.110 alignment pattern is correct, false otherwise + */ +bool osmo_csd_check_v110_align(const ubit_t *ra_bits) +{ + int i; + + for (i = 0; i < 8; i++) { + if (ra_bits[i]) + return false; + } + for (i = 1; i < 10; i++) { + if (!ra_bits[i * 8]) + return false; + } + return true; +} + +/*! Convert V.110 frame from standard 80-bit form (unpacked) to + * our distilled 63-bit form (as it appears in TRAU frames). + * \param[out] out buffer of size 63 ubit_t + * \param[in] in 80-bit standard V.110 frame + * + * This function ignores all 17 sync pattern bits and assumes that the + * V.110 frame is correctly aligned. Therefore, this function should + * be called after osmo_csd_check_v110_align(). + */ +void osmo_csd_v110_to_63bits(ubit_t *out, const ubit_t *ra_bits) +{ + memcpy(out, ra_bits + 9, 7); + memcpy(out + 7, ra_bits + 17, 7); + memcpy(out + 14, ra_bits + 25, 7); + memcpy(out + 21, ra_bits + 33, 7); + memcpy(out + 28, ra_bits + 41, 7); + memcpy(out + 35, ra_bits + 49, 7); + memcpy(out + 42, ra_bits + 57, 7); + memcpy(out + 49, ra_bits + 65, 7); + memcpy(out + 56, ra_bits + 73, 7); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41159?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: I3f51254b4b985a0f8499c375b61069ca24f77ae8 Gerrit-Change-Number: 41159 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in libosmo-abis[master]: trau_rtp_conv: use factored-out V.110 functions
by falconia 08 Oct '25

08 Oct '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41160?usp=email ) Change subject: trau_rtp_conv: use factored-out V.110 functions ...................................................................... trau_rtp_conv: use factored-out V.110 functions In the previous patch we factored out V.110 frame conversion functions into API. Now use these new API functions in the implementation of osmo_trau2rtp() and osmo_rtp2trau(). Change-Id: I375311ff9be1b10d27ac94e2e9bd227e7241e7f0 --- M src/trau/trau_rtp_conv.c 1 file changed, 23 insertions(+), 86 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index f670578..a7184fb 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -33,6 +33,7 @@ #include <osmocom/trau/clearmode.h> #include <osmocom/trau/csd_ra2.h> #include <osmocom/trau/csd_raa_prime.h> +#include <osmocom/trau/csd_v110.h> /* this corresponds to the bit-lengths of the individual codec * parameters as indicated in Table 1.1 of TS 46.010 */ @@ -1260,42 +1261,6 @@ * like the RA part of TRAU, using RTP clearmode representation. */ -static void trau2v110_bits(ubit_t *out, const ubit_t *in) -{ - int i; - - /* the first 8 bits are sync zeros */ - memset(out, 0, 8); - out += 8; - /* for the rest, we have to expand 63 bits into 72 */ - for (i = 0; i < 9; i++) { - *out++ = 1; - memcpy(out, in, 7); - in += 7; - out += 7; - } -} - -/* intermediate rate 8 kbit/s */ -static void trau2v110_ir8(uint8_t *out, const ubit_t *in) -{ - ubit_t ra_bits[80]; - - trau2v110_bits(ra_bits, in); - /* RA2: 1 bit per output byte */ - osmo_csd_ra2_8k_pack(out, ra_bits, 80); -} - -/* intermediate rate 16 kbit/s */ -static void trau2v110_ir16(uint8_t *out, const ubit_t *in) -{ - ubit_t ra_bits[80]; - - trau2v110_bits(ra_bits, in); - /* RA2: 2 bits per output byte */ - osmo_csd_ra2_16k_pack(out, ra_bits, 40); -} - static int trau2rtp_data_fr(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf) { @@ -1308,13 +1273,13 @@ /* Is it TCH/F9.6 with 16 kbit/s IR, * or TCH/F4.8 or TCH/F2.4 with 8 kbit/s IR? */ if (tf->c_bits[5]) { - trau2v110_ir16(out, tf->d_bits); - trau2v110_ir16(out + 40, tf->d_bits + 63); - trau2v110_ir16(out + 80, tf->d_bits + 63 * 2); - trau2v110_ir16(out + 120, tf->d_bits + 63 * 3); + osmo_csd_63bits_to_v110_ir16(out, tf->d_bits); + osmo_csd_63bits_to_v110_ir16(out + 40, tf->d_bits + 63); + osmo_csd_63bits_to_v110_ir16(out + 80, tf->d_bits + 63 * 2); + osmo_csd_63bits_to_v110_ir16(out + 120, tf->d_bits + 63 * 3); } else { - trau2v110_ir8(out, tf->d_bits); - trau2v110_ir8(out + 80, tf->d_bits + 63 * 2); + osmo_csd_63bits_to_v110_ir8(out, tf->d_bits); + osmo_csd_63bits_to_v110_ir8(out + 80, tf->d_bits + 63 * 2); } return OSMO_CLEARMODE_20MS; @@ -1333,8 +1298,8 @@ * puts the second reduced V.110 frame at d_bits position 63, * unlike 8 kbit/s IR in FR-data frame type where it resides * at d_bits position 63 * 2. */ - trau2v110_ir8(out, tf->d_bits); - trau2v110_ir8(out + 80, tf->d_bits + 63); + osmo_csd_63bits_to_v110_ir8(out, tf->d_bits); + osmo_csd_63bits_to_v110_ir8(out + 80, tf->d_bits + 63); return OSMO_CLEARMODE_20MS; } @@ -1348,8 +1313,8 @@ if (out_len < OSMO_CLEARMODE_20MS) return -ENOSPC; - trau2v110_ir8(out, tf->d_bits); - trau2v110_ir8(out + 80, tf->d_bits + 63); + osmo_csd_63bits_to_v110_ir8(out, tf->d_bits); + osmo_csd_63bits_to_v110_ir8(out + 80, tf->d_bits + 63); return OSMO_CLEARMODE_20MS; } @@ -1400,34 +1365,6 @@ * how traditional TRAUs do it. */ -static bool check_v110_align(const ubit_t *ra_bits) -{ - int i; - - for (i = 0; i < 8; i++) { - if (ra_bits[i]) - return false; - } - for (i = 1; i < 10; i++) { - if (!ra_bits[i * 8]) - return false; - } - return true; -} - -static void v110_to_63bits(ubit_t *out, const ubit_t *ra_bits) -{ - memcpy(out, ra_bits + 9, 7); - memcpy(out + 7, ra_bits + 17, 7); - memcpy(out + 14, ra_bits + 25, 7); - memcpy(out + 21, ra_bits + 33, 7); - memcpy(out + 28, ra_bits + 41, 7); - memcpy(out + 35, ra_bits + 49, 7); - memcpy(out + 42, ra_bits + 57, 7); - memcpy(out + 49, ra_bits + 65, 7); - memcpy(out + 56, ra_bits + 73, 7); -} - /* intermediate rate 8 kbit/s */ static void rtp2trau_data_ir8(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len, unsigned second_offset) @@ -1441,14 +1378,14 @@ osmo_csd_ra2_8k_unpack(ra_bits, data, OSMO_CLEARMODE_20MS); /* enforce two properly aligned V.110 frames */ - if (!check_v110_align(ra_bits)) + if (!osmo_csd_check_v110_align(ra_bits)) goto idle_fill; - if (!check_v110_align(ra_bits + 80)) + if (!osmo_csd_check_v110_align(ra_bits + 80)) goto idle_fill; /* all checks passed - copy the payload */ - v110_to_63bits(tf->d_bits, ra_bits); - v110_to_63bits(tf->d_bits + second_offset, ra_bits + 80); + osmo_csd_v110_to_63bits(tf->d_bits, ra_bits); + osmo_csd_v110_to_63bits(tf->d_bits + second_offset, ra_bits + 80); return; idle_fill: @@ -1469,20 +1406,20 @@ osmo_csd_ra2_16k_unpack(ra_bits, data, OSMO_CLEARMODE_20MS); /* enforce 4 properly aligned V.110 frames */ - if (!check_v110_align(ra_bits)) + if (!osmo_csd_check_v110_align(ra_bits)) goto idle_fill; - if (!check_v110_align(ra_bits + 80)) + if (!osmo_csd_check_v110_align(ra_bits + 80)) goto idle_fill; - if (!check_v110_align(ra_bits + 80 * 2)) + if (!osmo_csd_check_v110_align(ra_bits + 80 * 2)) goto idle_fill; - if (!check_v110_align(ra_bits + 80 * 3)) + if (!osmo_csd_check_v110_align(ra_bits + 80 * 3)) goto idle_fill; /* all checks passed - copy the payload */ - v110_to_63bits(tf->d_bits, ra_bits); - v110_to_63bits(tf->d_bits + 63, ra_bits + 80); - v110_to_63bits(tf->d_bits + 63 * 2, ra_bits + 80 * 2); - v110_to_63bits(tf->d_bits + 63 * 3, ra_bits + 80 * 3); + osmo_csd_v110_to_63bits(tf->d_bits, ra_bits); + osmo_csd_v110_to_63bits(tf->d_bits + 63, ra_bits + 80); + osmo_csd_v110_to_63bits(tf->d_bits + 63 * 2, ra_bits + 80 * 2); + osmo_csd_v110_to_63bits(tf->d_bits + 63 * 3, ra_bits + 80 * 3); return; idle_fill: -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41160?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: I375311ff9be1b10d27ac94e2e9bd227e7241e7f0 Gerrit-Change-Number: 41160 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log