<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18022">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: loopback: support EFR<br><br>Related: SYS#4924<br>Change-Id: I73d1f88b0865ad97b85418ff76739febf2e128a7<br>---<br>M src/host/layer23/src/mobile/voice.c<br>1 file changed, 23 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c</span><br><span>index 4aae8aa..c379265 100644</span><br><span>--- a/src/host/layer23/src/mobile/voice.c</span><br><span>+++ b/src/host/layer23/src/mobile/voice.c</span><br><span>@@ -22,7 +22,9 @@</span><br><span> #include <stdlib.h></span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/codec/codec.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bb/common/logging.h></span><br><span> #include <osmocom/bb/common/osmocom_data.h></span><br><span> #include <osmocom/bb/mobile/mncc.h></span><br><span> #include <osmocom/bb/mobile/voice.h></span><br><span>@@ -43,11 +45,14 @@</span><br><span>                msgb_push(msg, sizeof(struct gsm_data_frame));</span><br><span>       mncc->callref = ms->mncc_entity.ref;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  /* FIXME: FR only! */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: FR, EFR only! */</span><br><span>   switch (ms->rrlayer.cd_now.mode) {</span><br><span>        case GSM48_CMODE_SPEECH_V1:</span><br><span>          mncc->msg_type = GSM_TCHF_FRAME;</span><br><span>          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+          mncc->msg_type = GSM_TCHF_FRAME_EFR;</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</span><br><span>       default:</span><br><span>             /* TODO: print error message here */</span><br><span>                 goto exit_free;</span><br><span>@@ -73,12 +78,26 @@</span><br><span> int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data)</span><br><span> {</span><br><span>         struct msgb *nmsg;</span><br><span style="color: hsl(120, 100%, 40%);">+    int len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    nmsg = msgb_alloc_headroom(33 + 64, 64, "TCH/F");</span><br><span style="color: hsl(120, 100%, 40%);">+   switch (ms->rrlayer.cd_now.mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+           /* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */</span><br><span style="color: hsl(120, 100%, 40%);">+             len = GSM_FR_BYTES;</span><br><span style="color: hsl(120, 100%, 40%);">+           break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+          len = GSM_EFR_BYTES;</span><br><span style="color: hsl(120, 100%, 40%);">+          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DL1C, LOGL_ERROR, "gsm_send_voice, msg_type=0x%02x: not implemented\n", data->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+            return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   nmsg = msgb_alloc_headroom(len + 64, 64, "TCH/F");</span><br><span>         if (!nmsg)</span><br><span>           return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">- nmsg->l2h = msgb_put(nmsg, 33);</span><br><span style="color: hsl(0, 100%, 40%);">-      memcpy(nmsg->l2h, data->data, 33);</span><br><span style="color: hsl(120, 100%, 40%);">+      nmsg->l2h = msgb_put(nmsg, len);</span><br><span style="color: hsl(120, 100%, 40%);">+   memcpy(nmsg->l2h, data->data, len);</span><br><span> </span><br><span>        return gsm48_rr_tx_voice(ms, nmsg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18022">change 18022</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/c/osmocom-bb/+/18022"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I73d1f88b0865ad97b85418ff76739febf2e128a7 </div>
<div style="display:none"> Gerrit-Change-Number: 18022 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>