- gerrit-log - lists.osmocom.org

Change in libosmo-netif[master]: amr: Introduce APIs to convert BE to IuUP/IuFP format

by pespin

Hello Jenkins Builder, laforge, lynxis lazus, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/26717 to look at the new patch set (#3). Change subject: amr: Introduce APIs to convert BE to IuUP/IuFP format ...................................................................... amr: Introduce APIs to convert BE to IuUP/IuFP format These APIs allow for easy re-formatting of received AMR to forward between regular RTP and IuUP. Related: OS#1937 Change-Id: Id2bd32d5f2060abe581730996dc4251381bf7d4f --- M include/osmocom/netif/amr.h M src/amr.c M tests/amr/amr_test.c M tests/amr/amr_test.ok 4 files changed, 140 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/17/26717/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id2bd32d5f2060abe581730996dc4251381bf7d4f Gerrit-Change-Number: 26717 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 1: Let's also merge all this to the new osmo-hnbgw.git (anything related to the new mgw support). -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jan 2022 13:47:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-mgw[master]: cosmetic: mgcp_codec.c: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/26718 ) Change subject: cosmetic: mgcp_codec.c: Fix typo in comment ...................................................................... cosmetic: mgcp_codec.c: Fix typo in comment Change-Id: Ic93c9bcf6d3a12cc42fdfee2be97662adf068409 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 7ab2a17..70a6638 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -417,7 +417,7 @@ if (!codec_src) return -EINVAL; - /* Use the codec infrmation from the source and try to find the + /* Use the codec information from the source and try to find the * equivalent of it on the destination side */ codecs_assigned = rtp_dst->codecs_assigned; OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/26718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic93c9bcf6d3a12cc42fdfee2be97662adf068409 Gerrit-Change-Number: 26718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-mgw[master]: Define mgcp_rtp_end.output_enabled as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/26686 ) Change subject: Define mgcp_rtp_end.output_enabled as bool ...................................................................... Define mgcp_rtp_end.output_enabled as bool Change-Id: I55f7796ef774f86050041f2c5e3a2f8f7d1f56df --- M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_msg.c M tests/mgcp/mgcp_test.c 4 files changed, 6 insertions(+), 7 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/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index b9cf5e3..e3fa3b1 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -110,8 +110,8 @@ uint32_t packet_duration_ms; int maximum_packet_time; /* -1: not set */ char *fmtp_extra; - /* are we transmitting packets (1) or dropping (0) outbound packets */ - int output_enabled; + /* are we transmitting packets (true) or dropping (false) outbound packets */ + bool output_enabled; /* FIXME: This parameter can be set + printed, but is nowhere used! */ int force_output_ptime; diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 5c3c60e..9c2fb0f 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -108,7 +108,7 @@ /* Set default values */ end->frames_per_packet = 0; /* unknown */ end->packet_duration_ms = DEFAULT_RTP_AUDIO_PACKET_DURATION_MS; - end->output_enabled = 0; + end->output_enabled = false; end->maximum_packet_time = -1; conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index++); diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index f36fa71..4581b76 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -110,8 +110,7 @@ /* Special handling for RTP connections */ if (conn->type == MGCP_CONN_TYPE_RTP) { - conn->u.rtp.end.output_enabled = - conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0; + conn->u.rtp.end.output_enabled = !!(conn->mode & MGCP_CONN_SEND_ONLY); } LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn)); @@ -121,7 +120,7 @@ /* Special handling für RTP connections */ if (conn->type == MGCP_CONN_TYPE_RTP) { - LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %d\n", + LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %u\n", conn->u.rtp.end.output_enabled); } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index a8aad14..9b4933c 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -868,7 +868,7 @@ printf("Connection mode not set\n"); OSMO_ASSERT(conn->end.output_enabled - == (conn->conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0)); + == !!(conn->conn->mode & MGCP_CONN_SEND_ONLY)); conn->conn->mode |= CONN_UNMODIFIED; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/26686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I55f7796ef774f86050041f2c5e3a2f8f7d1f56df Gerrit-Change-Number: 26686 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in libosmo-netif[master]: amr: don't rely on pad bits to be zero

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/26715 ) Change subject: amr: don't rely on pad bits to be zero ...................................................................... amr: don't rely on pad bits to be zero Change-Id: I354fbbcbaf7ff7e7d498b22c175a57a79b6b8856 --- M src/amr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/amr.c b/src/amr.c index 2706432..0cd1821 100644 --- a/src/amr.c +++ b/src/amr.c @@ -152,7 +152,7 @@ return -1; /* Move TOC close to CMR */ - payload[0] |= (payload[1] >> 4) & 0x0f; + payload[0] = (payload[0] & 0xf0) | ((payload[1] >> 4) & 0x0f); payload[1] = (payload[1] << 4) & 0xf0; for (i = 0; i < frame_len; i++) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I354fbbcbaf7ff7e7d498b22c175a57a79b6b8856 Gerrit-Change-Number: 26715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in libosmo-netif[master]: export osmo_amr_bits

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/26716 ) Change subject: export osmo_amr_bits ...................................................................... export osmo_amr_bits Change-Id: Ic03653b2a885c5d9419c6c75a718b550fc30b86e --- M include/osmocom/netif/amr.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index c5a8e28..1a90af9 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -109,6 +109,7 @@ int osmo_amr_ft_valid(uint8_t amr_ft); size_t osmo_amr_bytes(uint8_t amr_cmr); +size_t osmo_amr_bits(uint8_t amr_ft); bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len); int osmo_amr_oa_to_bwe(uint8_t *payload, unsigned int payload_len); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic03653b2a885c5d9419c6c75a718b550fc30b86e Gerrit-Change-Number: 26716 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in libosmo-netif[master]: amr: Introduce APIs to convert BE to IuUP/IuFP format

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/26717 ) Change subject: amr: Introduce APIs to convert BE to IuUP/IuFP format ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmo-netif/+/26717/2/src/amr.c File src/amr.c: https://gerrit.osmocom.org/c/libosmo-netif/+/26717/2/src/amr.c@264 PS2, Line 264: int i; > Consistency with osmo_amr_bwe_to_iuup(): unsigned. It doesn't need to be consistent because the loop is totally different. In any case, I uses int i here because I initially whent up to 0 when writting it,and I wanted to avoid a similar bug to the one I recently introduced :) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id2bd32d5f2060abe581730996dc4251381bf7d4f Gerrit-Change-Number: 26717 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jan 2022 13:43:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmo-netif[master]: export osmo_amr_bits

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/26716 ) Change subject: export osmo_amr_bits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic03653b2a885c5d9419c6c75a718b550fc30b86e Gerrit-Change-Number: 26716 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jan 2022 13:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmo-netif[master]: export osmo_amr_bits

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/26716 ) Change subject: export osmo_amr_bits ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > it's not really exporting anything, it's just adding a declaration for an existing export? Yes well, but usually no one knows about a function being exported unless you check the header file :) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic03653b2a885c5d9419c6c75a718b550fc30b86e Gerrit-Change-Number: 26716 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jan 2022 13:41:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-mgw[master]: mgcp_client: add new codec IUFP as VND.3GPP.IUFP

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/26651 ) Change subject: mgcp_client: add new codec IUFP as VND.3GPP.IUFP ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/26651/5/src/libosmo-mgcp-client/mgc… File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/26651/5/src/libosmo-mgcp-client/mgc… PS5, Line 62: { CODEC_IUFP, "VND.3GPP.IUFP/16000" }, > So far we use upper case everywhere. however in theory this code is called IuFP. […] Why do you say it's called IuFP? See 3GPP TS 29.414 6.3.3.5 "Media Attributes": """ The following media attribute shall be supplied: “a=rtpmap:<dynamic payload number> VND.3GPP.IUFP/16000”, where :<dynamic payload number> is the same dynamic payload type number as in the above media announcement <fmt list>. """ It's true though that 6.3 says: """ NOTE: The IuFP is registered with IANA as the MIME type ”VND.3GPP.IuFP”of the ”audio” category, however, this registration does not preclude the use of IuFP to transport ”data”. """ But the one in case in section 6.3.3.5 seems to be more similar to what's needed by SDP, so I'd go for all caps. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/26651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifd1210a897743396899f34457c96e6fd2109c6b3 Gerrit-Change-Number: 26651 Gerrit-PatchSet: 5 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Jan 2022 13:39:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log