This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( 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, 23 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 4aae8aa..c379265 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> @@ -43,11 +45,14 @@ msgb_push(msg, sizeof(struct gsm_data_frame)); mncc->callref = ms->mncc_entity.ref; - /* FIXME: FR only! */ + /* FIXME: FR, EFR only! */ switch (ms->rrlayer.cd_now.mode) { case GSM48_CMODE_SPEECH_V1: mncc->msg_type = GSM_TCHF_FRAME; break; + case GSM48_CMODE_SPEECH_EFR: + mncc->msg_type = GSM_TCHF_FRAME_EFR; + break; default: /* TODO: print error message here */ goto exit_free; @@ -73,12 +78,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=0x%02x: 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: 3 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-CC: fixeria <axilirator at gmail.com> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200506/96cc239a/attachment.htm>