Change in osmocom-bb[master]: mobile: loopback: support EFR

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18022 )


Change subject: mobile: loopback: support EFR
......................................................................

mobile: loopback: support EFR

Related: SYS#4924
Change-Id: I73d1f88b0865ad97b85418ff76739febf2e128a7
---
M src/host/layer23/src/mobile/voice.c
1 file changed, 33 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/18022/1

diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c
index 235e899..1df3ad9 100644
--- a/src/host/layer23/src/mobile/voice.c
+++ b/src/host/layer23/src/mobile/voice.c
@@ -22,7 +22,9 @@
 #include <stdlib.h>
 
 #include <osmocom/core/msgb.h>
+#include <osmocom/codec/codec.h>
 
+#include <osmocom/bb/common/logging.h>
 #include <osmocom/bb/common/osmocom_data.h>
 #include <osmocom/bb/mobile/mncc.h>
 #include <osmocom/bb/mobile/voice.h>
@@ -42,10 +44,20 @@
 	mncc = (struct gsm_data_frame *)
 		msgb_push(msg, sizeof(struct gsm_data_frame));
 
-	/* FIXME: FR only! */
-	OSMO_ASSERT(ms->rrlayer.cd_now.mode == GSM48_CMODE_SPEECH_V1);
-
-	mncc->msg_type = GSM_TCHF_FRAME;
+	/* set msg_type */
+	switch (ms->rrlayer.cd_now.mode) {
+	case GSM48_CMODE_SPEECH_V1:
+		/* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */
+		mncc->msg_type = GSM_TCHF_FRAME;
+		break;
+	case GSM48_CMODE_SPEECH_EFR:
+		mncc->msg_type = GSM_TCHF_FRAME_EFR;
+		break;
+	default:
+		/* should not have been accepted by traffic_req_frame_verify() */
+		OSMO_ASSERT(false);
+		break;
+	}
 	mncc->callref =  ms->mncc_entity.ref;
 
 	/* send voice frame back, if appropriate */
@@ -67,12 +79,26 @@
 int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data)
 {
 	struct msgb *nmsg;
+	int len;
 
-	nmsg = msgb_alloc_headroom(33 + 64, 64, "TCH/F");
+	switch (ms->rrlayer.cd_now.mode) {
+	case GSM48_CMODE_SPEECH_V1:
+		/* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */
+		len = GSM_FR_BYTES;
+		break;
+	case GSM48_CMODE_SPEECH_EFR:
+		len = GSM_EFR_BYTES;
+		break;
+	default:
+		LOGP(DL1C, LOGL_ERROR, "gsm_send_voice, msg_type=%i: not implemented\n", data->msg_type);
+		return -EINVAL;
+	}
+
+	nmsg = msgb_alloc_headroom(len + 64, 64, "TCH/F");
 	if (!nmsg)
 		return -ENOMEM;
-	nmsg->l2h = msgb_put(nmsg, 33);
-	memcpy(nmsg->l2h, data->data, 33);
+	nmsg->l2h = msgb_put(nmsg, len);
+	memcpy(nmsg->l2h, data->data, len);
 
 	return gsm48_rr_tx_voice(ms, nmsg);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/18022
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I73d1f88b0865ad97b85418ff76739febf2e128a7
Gerrit-Change-Number: 18022
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200504/36684add/attachment.htm>