pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/30759 )
Change subject: amr: use OSMO_BYTES_FOR_BITS()
......................................................................
amr: use OSMO_BYTES_FOR_BITS()
Change-Id: Ib92856ede3f493615c24d883954989e952c51157
---
M src/amr.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
diff --git a/src/amr.c b/src/amr.c
index 18e699c..81bcd08 100644
--- a/src/amr.c
+++ b/src/amr.c
@@ -188,7 +188,7 @@
}
/* Calculate new payload length */
- bwe_payload_len = (AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft) + 7) / 8;
+ bwe_payload_len = OSMO_BYTES_FOR_BITS(AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft));
return bwe_payload_len;
}
@@ -268,7 +268,7 @@
/* shift of AMR_HDR_BWE_LEN_BITS (10) bits, aka remove BWE Hdr + ToC: */
required_len_bits = AMR_HDR_BWE_LEN_BITS + amr_speech_len_bits;
- if (payload_len < (required_len_bits + 7)/8)
+ if (payload_len < OSMO_BYTES_FOR_BITS(required_len_bits))
return -1;
for (i = 0; i < amr_speech_len_bytes; i++) {
@@ -297,7 +297,7 @@
return ft;
required_len_bits = osmo_amr_bits(ft) + 10;
- required_len_bytes = (required_len_bits + 7)/8;
+ required_len_bytes = OSMO_BYTES_FOR_BITS(required_len_bits);
if (payload_maxlen < required_len_bytes)
return -1;
--
To view, visit
https://gerrit.osmocom.org/c/libosmo-netif/+/30759
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Ib92856ede3f493615c24d883954989e952c51157
Gerrit-Change-Number: 30759
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged