Attention is currently required from: falconia.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: trau_rtp_conv: add support for HRv1 in 8k format
......................................................................
trau_rtp_conv: add support for HRv1 in 8k format
GSM 08.61 defines two alternative Abis transport formats for
HRv1 codec, using either 16 kbit/s or 8 kbit/s submultiplexing,
as chosen by each BSS hardware manufacturer. libosmotrau previously
supported TRAU<->RTP conversion only for 16k format - add support
for HRv1 in 8k submux format.
Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be
---
M src/trau/trau_rtp_conv.c
1 file changed, 188 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/87/37287/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be
Gerrit-Change-Number: 37287
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-MessageType: newpatchset
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email )
Change subject: trau_rtp_conv: add support for HRv1 in 8k format
......................................................................
Patch Set 1:
(1 comment)
File src/trau/trau_rtp_conv.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16848):
https://gerrit.osmocom.org/c/libosmo-abis/+/37287/comment/2871fdfd_10752fd7
PS1, Line 347: bad_frame:
labels should not be indented
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be
Gerrit-Change-Number: 37287
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 25 Jun 2024 03:59:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37286?usp=email )
Change subject: trau_frame: fix 8k decoding
......................................................................
trau_frame: fix 8k decoding
osmo_trau_frame_decode_8k() API was broken for most TRAU frame types:
the processing begins with identifying the sync pattern, but the check
for the leading 8 zeros in HRv1, AMR-low and AMR-6k7 formats was
broken in that it was checking for 16 zero bits instead of 8.
While at it, fix global namespace pollution: the bit8_0[] datum
used in this logic was defined as global when it should be static.
Change-Id: Idabc1283d477473b479f2d76d783ca9aeaf0af5d
---
M src/trau/trau_frame.c
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/86/37286/1
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index 389495c..98e26da 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -1360,7 +1360,7 @@
#define TRAU8_FT_AMR_NO_SPEECH_CMR 0x14 /* 1, 0, 1, 0, 0 */
#define TRAU8_FT_AMR_475_515_590 0..7
-const uint8_t bit8_0[16] = { 0, };
+static const uint8_t bit8_0[8] = { 0, };
/*!< check sync pattern for hr/data/oam */
static bool is_hr(const ubit_t *bits)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37286?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Idabc1283d477473b479f2d76d783ca9aeaf0af5d
Gerrit-Change-Number: 37286
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-MessageType: newchange
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37285?usp=email )
Change subject: {de,en}code8_hr: fix totally broken functions
......................................................................
{de,en}code8_hr: fix totally broken functions
The functions decode8_hr() and encode8_hr() in trau_frame.c (encoding
and decoding HRv1 TRAU frames in 8 kbit/s format) are available via
osmo_trau_frame_decode_8k() and osmo_trau_frame_encode() public APIs,
but they are not currently used anywhere in Osmocom. (OsmoMGW-E1 has
no working support for HR codec, and there is no support for HRv1-8k
in the TRAU<->RTP layer until next patch in this series.) Study of
the code reveals that these functions were totally broken prior to
this change:
* The movement of Dn bits between trau_bits and fr->d_bits used wrong
offsets for some of the bits (and even missed one group of bits
entirely in the encoding direction), producing garbled codec frames.
* The filling of XCn bits in the encoding direction was likewise
garbled by use of wrong offset.
* When encoding TRAU-UL frames in this format, bit C5 (odd parity)
was set incorrectly.
* The order of bits in fr->crc_bits array (Osmocom internal) was
opposite the order needed for osmo_crc8gen_check_bits() and
osmo_crc8gen_set_bits() functions - contrast with HRv1-16k functions
that use sensible bit order for this fr->crc_bits array.
Given that this HRv1-8k mode within TRAU frame encoding and decoding
API was totally broken and not used anywhere, there are no compatibility
concerns with changing aspects of this API such as CRC bit order.
Change-Id: I7cf0275f2ff212e001db38d7b090f222f292cdb0
---
M src/trau/trau_frame.c
1 file changed, 49 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/85/37285/1
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index 0be005a..389495c 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -780,15 +780,14 @@
}
/* CRC0 .. CRC2 */
- fr->crc_bits[2] = trau_bits[82];
- fr->crc_bits[1] = trau_bits[83];
- fr->crc_bits[0] = trau_bits[84];
+ memcpy(fr->crc_bits, trau_bits + 73, 3);
/* D45 .. D48 */
- memcpy(fr->d_bits + d_idx, trau_bits + 85, 4);
+ memcpy(fr->d_bits + d_idx, trau_bits + 76, 4);
+ d_idx += 4;
/* D49 .. D111 */
- for (i = 10; i < 10 + 10; i++) {
+ for (i = 10; i < 10 + 9; i++) {
int offset = i * 8;
memcpy(fr->d_bits + d_idx, trau_bits + offset + 1, 7);
d_idx += 7;
@@ -843,7 +842,7 @@
cbits_out[1] = 0;
cbits_out[2] = 0;
cbits_out[3] = 1;
- cbits_out[4] = 1;
+ cbits_out[4] = 0;
} else {
cbits_out[0] = 0;
cbits_out[1] = 0;
@@ -855,7 +854,7 @@
/* XC1 .. XC2 */
memcpy(trau_bits + 1 * 8 + 6, fr->xc_bits, 2);
/* XC3 .. XC6 */
- memcpy(trau_bits + 2 * 8 + 2, fr->xc_bits, 4);
+ memcpy(trau_bits + 2 * 8 + 2, fr->xc_bits + 2, 4);
/* D1 .. D2 */
memcpy(trau_bits + 2 * 8 + 6, fr->d_bits, 2);
d_idx += 2;
@@ -868,12 +867,14 @@
};
/* CRC0 .. CRC2 */
- trau_bits[82] = fr->crc_bits[2];
- trau_bits[83] = fr->crc_bits[1];
- trau_bits[84] = fr->crc_bits[0];
+ memcpy(trau_bits + 73, fr->crc_bits, 3);
+
+ /* D45 .. D48 */
+ memcpy(trau_bits + 76, fr->d_bits + d_idx, 4);
+ d_idx += 4;
/* D49 .. D111 */
- for (i = 10; i < 10 + 10; i++) {
+ for (i = 10; i < 10 + 9; i++) {
int offset = i * 8;
memcpy(trau_bits + offset + 1, fr->d_bits + d_idx, 7);
d_idx += 7;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37285?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I7cf0275f2ff212e001db38d7b090f222f292cdb0
Gerrit-Change-Number: 37285
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, neels.
falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email )
Change subject: build config: add --disable-ortp option
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> hmm, except, do we now need to update the build system to ensure that this option builds successfully?
I am not asking Osmocom core team to test builds with this new option. **I** will be making a lot of builds with --disable-ortp, and if it breaks in the future, I will be the one to raise the alert and fix it.
> Might reconsider the effort:benefit ratio...?
What effort? I am not asking your team to add the new build variant to your CI, just merge the patch (providing the option) so I don't have to keep reapplying it to every new release and every sandbox build I do.
With the two +1's from you and @osmith@sysmocom.de I can now merge the patch - but I'll give it another few days for further review.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883
Gerrit-Change-Number: 36975
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 25 Jun 2024 01:21:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: falconia, laforge.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email )
Change subject: build config: add --disable-ortp option
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> even if premature for osmo-bts, it's not harmful to add this compiler option; makes the build more f […]
hmm, except, do we now need to update the build system to ensure that this option builds successfully? Might reconsider the effort:benefit ratio...?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883
Gerrit-Change-Number: 36975
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 25 Jun 2024 01:04:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: falconia, laforge.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email )
Change subject: build config: add --disable-ortp option
......................................................................
Patch Set 2: Code-Review+1
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/libosmo-abis/+/36975/comment/9bf8806d_6a2c944d
PS2, Line 25: and work with ortp dependency eliminated.
(nitpick: very low word-count to information ratio...
isn't this already all that needs to be said:
```
Add --disable-ortp option
Assist distributions where it is incovenient to install libortp.
```
)
Patchset:
PS2:
even if premature for osmo-bts, it's not harmful to add this compiler option; makes the build more flexible without adverse effects AFAICT.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883
Gerrit-Change-Number: 36975
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 25 Jun 2024 01:01:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment