<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13078">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">AMR: add define constants for AMR payload length<br><br>AMR uses different payload sizes, those sizes are well defined in RFC<br>3267. Lets add define constants and replace the magic values with the<br>define constants.<br><br>Also correct the value for AMR_FT_SID in amr_ft_to_bytes from 6 to 5<br>(39bits / 8 = 4.875 bytes ==> 5 byte, see also RFC 3267, chapter 3.6)<br><br>Change-Id: I65b5da920d58015b875d6dcf17aacdc04b58955e<br>---<br>M include/osmocom/netif/amr.h<br>M src/amr.c<br>2 files changed, 21 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h</span><br><span>index 5b48bcb..1f048b1 100644</span><br><span>--- a/include/osmocom/netif/amr.h</span><br><span>+++ b/include/osmocom/netif/amr.h</span><br><span>@@ -83,6 +83,18 @@</span><br><span> #define AMR_FT_SID 8 /* SID */</span><br><span> #define AMR_FT_MAX 9</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* AMR voice frame length (in bytes, rounded),</span><br><span style="color: hsl(120, 100%, 40%);">+ * See also RFC 3267, chapter 3.6 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_0_LEN 12 /* 4.75 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_1_LEN 13 /* 5.15 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_2_LEN 15 /* 5.90 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_3_LEN 17 /* 6.70 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_4_LEN 19 /* 7.40 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_5_LEN 20 /* 7.95 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_6_LEN 26 /* 10.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_7_LEN 31 /* 12.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMR_FT_SID_LEN 5 /* SID */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int osmo_amr_ft_valid(uint8_t amr_ft);</span><br><span> size_t osmo_amr_bytes(uint8_t amr_cmr);</span><br><span> </span><br><span>diff --git a/src/amr.c b/src/amr.c</span><br><span>index 6f94a69..06cf429 100644</span><br><span>--- a/src/amr.c</span><br><span>+++ b/src/amr.c</span><br><span>@@ -28,15 +28,15 @@</span><br><span> */</span><br><span> </span><br><span> static size_t amr_ft_to_bytes[AMR_FT_MAX] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_0] = 12,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_1] = 13,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_2] = 15,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_3] = 17,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_4] = 19,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_5] = 20,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_6] = 26,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_7] = 31,</span><br><span style="color: hsl(0, 100%, 40%);">- [AMR_FT_SID] = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_0] = AMR_FT_0_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_1] = AMR_FT_1_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_2] = AMR_FT_2_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_3] = AMR_FT_3_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_4] = AMR_FT_4_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_5] = AMR_FT_5_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_6] = AMR_FT_6_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_7] = AMR_FT_7_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AMR_FT_SID] = AMR_FT_SID_LEN,</span><br><span> };</span><br><span> </span><br><span> size_t osmo_amr_bytes(uint8_t amr_ft)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13078">change 13078</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13078"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I65b5da920d58015b875d6dcf17aacdc04b58955e </div>
<div style="display:none"> Gerrit-Change-Number: 13078 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>