November 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-abis[master]: trau_sync: Fix typo tray_sync_pat_id -> trau_sync_pat_id

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30396 ) Change subject: trau_sync: Fix typo tray_sync_pat_id -> trau_sync_pat_id ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I472107bfbed10a8cadd4736ce84120b24a5579f8 Gerrit-Change-Number: 30396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 30 Nov 2022 18:07:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: trau_sync: Add the V.110 sync pattern

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30375 ) Change subject: trau_sync: Add the V.110 sync pattern ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File include/osmocom/trau/trau_sync.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30375/comment/661a5fb9_94e6d78f PS2, Line 5: enum osmo_tray_sync_pat_id { > I'd do #define osmo_tray_sync_pat_id osmo_trau_sync_pat_id for backward compat and change the name. […] https://gerrit.osmocom.org/c/libosmo-abis/+/30396 File src/trau/trau_sync.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30375/comment/939e1091_fe4304e7 PS1, Line 150: .na > I'm not sure where we end up using that name. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3aab5c3f494f6ea2b11f3cf69fb09bc77ea941d8 Gerrit-Change-Number: 30375 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 18:07:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add missing TCH MNCC messages and handle them

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30397 to look at the new patch set (#2). Change subject: mobile: add missing TCH MNCC messages and handle them ...................................................................... mobile: add missing TCH MNCC messages and handle them Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Related: OS#5599 --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/mncc_sock.c M src/host/layer23/src/mobile/voice.c 4 files changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/97/30397/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Gerrit-Change-Number: 30397 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: improve function comments in voice.c

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30398 ) Change subject: mobile: improve function comments in voice.c ...................................................................... mobile: improve function comments in voice.c Change-Id: I0285a07841bdc2568374f9e9cd0214eef1415186 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/30398/1 diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 1159fbb..1e664dc 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -25,11 +25,7 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> - -/* - * receive voice - */ - +/* Receive a Downlink voice frame from the lower layers */ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *mncc; @@ -68,15 +64,14 @@ return 0; } -/* - * send voice - */ +/* Send an Uplink voice frame to the lower layers */ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { /* Forward to RR */ return gsm48_rr_tx_voice(ms, msg); } +/* gsm_send_voice_msg() wrapper accepting an MNCC structure */ int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame) { struct msgb *nmsg; @@ -109,10 +104,7 @@ return gsm_send_voice_msg(ms, nmsg); } -/* - * init - */ - +/* Initialize voice router */ int gsm_voice_init(struct osmocom_ms *ms) { ms->l1_entity.l1_traffic_ind = gsm_recv_voice; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0285a07841bdc2568374f9e9cd0214eef1415186 Gerrit-Change-Number: 30398 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add missing TCH MNCC messages and handle them

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30397 ) Change subject: mobile: add missing TCH MNCC messages and handle them ...................................................................... mobile: add missing TCH MNCC messages and handle them Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Related: OS#5599 --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/mncc_sock.c M src/host/layer23/src/mobile/voice.c 4 files changed, 24 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/97/30397/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index c373412..ebc58a5 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -104,6 +104,9 @@ #define GSM_TCHF_FRAME 0x0300 #define GSM_TCHF_FRAME_EFR 0x0301 +#define GSM_TCHH_FRAME 0x0302 +#define GSM_TCH_FRAME_AMR 0x0303 +#define GSM_BAD_FRAME 0x03ff #define GSM_MAX_FACILITY 128 #define GSM_MAX_SSVERSION 128 diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index 503c9fd..1be53ba 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -1966,6 +1966,10 @@ switch (msg_type) { case GSM_TCHF_FRAME: + case GSM_TCHF_FRAME_EFR: + case GSM_TCHH_FRAME: + case GSM_TCH_FRAME_AMR: + case GSM_BAD_FRAME: return gsm_send_voice_frame(ms, arg); case MNCC_LCHAN_MODIFY: return 0; diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 856b2c5..9f9858a 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -48,9 +48,15 @@ if (state->conn_bfd.fd < 0) { LOGP(DMNCC, LOGL_ERROR, "mncc_sock receives %s for external CC app " "but socket is gone\n", get_mncc_name(msg_type)); - if (msg_type != GSM_TCHF_FRAME - && msg_type != GSM_TCHF_FRAME_EFR - && msg_type != MNCC_REL_IND) { + switch (msg_type) { + case MNCC_REL_IND: + case GSM_TCHF_FRAME: + case GSM_TCHF_FRAME_EFR: + case GSM_TCHH_FRAME: + case GSM_TCH_FRAME_AMR: + case GSM_BAD_FRAME: + break; + default: /* release the request */ struct gsm_mncc mncc_out; memset(&mncc_out, 0, sizeof(mncc_out)); diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 4b5f792..1159fbb 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -82,14 +82,18 @@ struct msgb *nmsg; int len; - switch (ms->rrlayer.cd_now.mode) { - case GSM48_CMODE_SPEECH_V1: - /* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */ + switch (frame->msg_type) { + case GSM_TCHF_FRAME: len = GSM_FR_BYTES; break; - case GSM48_CMODE_SPEECH_EFR: + case GSM_TCHF_FRAME_EFR: len = GSM_EFR_BYTES; break; + case GSM_TCHH_FRAME: + len = GSM_HR_BYTES; + break; + /* TODO: case GSM_TCH_FRAME_AMR (variable length) */ + /* TODO: case GSM_BAD_FRAME (empty?) */ default: LOGP(DL1C, LOGL_ERROR, "%s(): msg_type=0x%02x: not implemented\n", __func__, frame->msg_type); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Gerrit-Change-Number: 30397 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: integrate GAPK based audio (voice) I/O support

by fixeria

Attention is currently required from: Hoernchen, laforge, pespin. Hello Jenkins Builder, Hoernchen, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30337 to look at the new patch set (#7). Change subject: mobile: integrate GAPK based audio (voice) I/O support ...................................................................... mobile: integrate GAPK based audio (voice) I/O support This change introduces a new feature to the mobile application - audio I/O support, which allows the user to speak right from the host side running mobile through its ordinary mic and speakers. The audio I/O is based on libosmogapk [1][2], which in its turn uses the ALSA sound system for the playback and capture. This is a new optional dependency of mobile, which is automatically picked up if available during the build configuration. Whether to depend on it or not can be controlled using '--with-gapk-io'. The API offered by libosmogapk implies to use the processing chains, which generally consist of a source block, several processing blocks, and a sink block. The mobile app implements the following chains: - 'pq_audio_source' (voice capture -> frame encoding), - 'pq_audio_sink' (frame decoding -> voice playback). both taking/storing TCH frames from/to the following two buffers: - 'tch_fb_ul' - a buffer for to be played DL TCH frames, - 'tch_fb_dl' - a buffer for encoded UL TCH frames. The buffers are served by a new function gapk_io_dequeue(). [1] https://gitea.osmocom.org/osmocom/gapk/ [1] https://osmocom.org/projects/gapk Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Related: OS#5599 --- M contrib/jenkins.sh M doc/examples/mobile/default.cfg M doc/examples/mobile/multi_ms.cfg M src/host/layer23/configure.ac M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/gapk_io.h M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/app_mobile.c A src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c 18 files changed, 761 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/30337/7 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Gerrit-Change-Number: 30337 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30400 ) Change subject: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly ...................................................................... mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly This way we can avoid allocating another msgb and enqueue the given msgb directly to the write queue of the MNCC socket. Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/30400/1 diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 5833cad..58c62d6 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -51,9 +51,8 @@ } /* distribute and then free */ - if (ms->mncc_entity.mncc_recv && ms->mncc_entity.ref) { - ms->mncc_entity.mncc_recv(ms, mncc->msg_type, mncc); - } + if (ms->mncc_entity.sock_state && ms->mncc_entity.ref) + return mncc_sock_from_cc(ms->mncc_entity.sock_state, msg); exit_free: msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Gerrit-Change-Number: 30400 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): properly mark TCH/H frames

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30401 ) Change subject: mobile: gsm_forward_mncc(): properly mark TCH/H frames ...................................................................... mobile: gsm_forward_mncc(): properly mark TCH/H frames Change-Id: Id3f459bc767ebf31469287fa672893239c5977d9 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/30401/1 diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 58c62d6..cb1718f 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -20,6 +20,8 @@ #include <osmocom/core/msgb.h> #include <osmocom/codec/codec.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> + #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/mncc.h> @@ -37,14 +39,20 @@ msgb_push(msg, sizeof(struct gsm_data_frame)); mncc->callref = ms->mncc_entity.ref; - /* FIXME: FR, EFR only! */ switch (ms->rrlayer.cd_now.mode) { case GSM48_CMODE_SPEECH_V1: - mncc->msg_type = GSM_TCHF_FRAME; + { + const uint8_t cbits = ms->rrlayer.cd_now.chan_nr >> 3; + if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs) + mncc->msg_type = GSM_TCHF_FRAME; + else + mncc->msg_type = GSM_TCHH_FRAME; break; + } case GSM48_CMODE_SPEECH_EFR: mncc->msg_type = GSM_TCHF_FRAME_EFR; break; + case GSM48_CMODE_SPEECH_AMR: /* TODO: no AMR support yet */ default: /* TODO: print error message here */ goto exit_free; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id3f459bc767ebf31469287fa672893239c5977d9 Gerrit-Change-Number: 30401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30399 ) Change subject: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK ...................................................................... mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK Do not send voice frames to the external MNCC unconditionally. Add a new I/O handler type for the external MNCC application. Change-Id: I406b169963e6654110329d741728fa12c8c8eeec Related: OS#5599 --- M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 36 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/99/30399/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 8edde53..27b9f5a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -19,6 +19,8 @@ AUDIO_IOH_NONE = 0, /* L1 PHY (e.g. Calypso DSP) */ AUDIO_IOH_L1PHY, + /* External MNCC app (via MNCC socket) */ + AUDIO_IOH_MNCC_SOCK, /* Return to sender */ AUDIO_IOH_LOOPBACK, }; diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 08242ee..65b021a 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -5620,6 +5620,7 @@ case AUDIO_IOH_L1PHY: rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; break; + case AUDIO_IOH_MNCC_SOCK: case AUDIO_IOH_LOOPBACK: rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 10e9984..7627c11 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -204,6 +204,7 @@ const struct value_string audio_io_handler_names[] = { { AUDIO_IOH_NONE, "none" }, { AUDIO_IOH_L1PHY, "l1phy" }, + { AUDIO_IOH_MNCC_SOCK, "mncc-sock" }, { AUDIO_IOH_LOOPBACK, "loopback" }, { 0x00, NULL} }; diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 1e664dc..5833cad 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -25,8 +25,8 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> -/* Receive a Downlink voice frame from the lower layers */ -static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) +/* Forward a Downlink voice frame to the external MNCC handler */ +static int gsm_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *mncc; @@ -50,10 +50,6 @@ goto exit_free; } - /* send voice frame back, if appropriate */ - if (ms->settings.audio.io_handler == AUDIO_IOH_LOOPBACK) - gsm_send_voice_frame(ms, mncc); - /* distribute and then free */ if (ms->mncc_entity.mncc_recv && ms->mncc_entity.ref) { ms->mncc_entity.mncc_recv(ms, mncc->msg_type, mncc); @@ -64,6 +60,24 @@ return 0; } +/* Receive a Downlink voice frame from the lower layers */ +static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) +{ + switch (ms->settings.audio.io_handler) { + case AUDIO_IOH_LOOPBACK: + /* Send voice frame back */ + return gsm_send_voice_msg(ms, msg); + case AUDIO_IOH_MNCC_SOCK: + return gsm_forward_mncc(ms, msg); + case AUDIO_IOH_L1PHY: + case AUDIO_IOH_NONE: + /* Drop voice frame */ + msgb_free(msg); + } + + return 0; +} + /* Send an Uplink voice frame to the lower layers */ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e3005ca..a94f96b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2831,13 +2831,24 @@ } DEFUN(cfg_ms_audio_io_handler, cfg_ms_audio_io_handler_cmd, - "io-handler (none|l1phy|loopback)", + "io-handler (none|l1phy|mncc-sock|loopback)", "Set TCH frame I/O handler\n" "No handler, drop TCH frames (default)\n" "L1 PHY (e.g. Calypso DSP in Motorola C1xx phones)\n" + "External MNCC application (e.g. LCR) via MNCC socket\n" "Return TCH frame payload back to sender\n") { + struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; int val = get_string_value(audio_io_handler_names, argv[0]); + + if (val == AUDIO_IOH_MNCC_SOCK) { + if (ms->settings.mncc_handler != MNCC_HANDLER_INTERNAL) { + vty_out(vty, "Audio I/O handler 'mncc-sock' can only be used " + "with MNCC handler 'external'%s", VTY_NEWLINE); + return CMD_WARNING; + } + } + return set_audio_io_handler(vty, val); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I406b169963e6654110329d741728fa12c8c8eeec Gerrit-Change-Number: 30399 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmocom-bb[master]: mobile: integrate GAPK based audio (voice) I/O support

by fixeria

Attention is currently required from: Hoernchen, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30337 ) Change subject: mobile: integrate GAPK based audio (voice) I/O support ...................................................................... Patch Set 6: (4 comments) File src/host/layer23/src/mobile/gapk_io.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30337/comment/7f7237bc_88bfc95c PS6, Line 52: tch > Ack Good to know, thanks! https://gerrit.osmocom.org/c/osmocom-bb/+/30337/comment/6ebb65eb_e9e4aa2f PS6, Line 90: ms > Ack Done https://gerrit.osmocom.org/c/osmocom-bb/+/30337/comment/05b2cf82_d934e8c8 PS6, Line 525: ms > Ack Done https://gerrit.osmocom.org/c/osmocom-bb/+/30337/comment/e0f201f4_1401c934 PS6, Line 561: tch > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Gerrit-Change-Number: 30337 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 17:59:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022