fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33703 )
Change subject: osmo-bts-trx: pull the AMR header in tch_dl_dequeue()
......................................................................
osmo-bts-trx: pull the AMR header in tch_dl_dequeue()
The goal is to unify encoding functions in tx_tch[fh]_fn(), so that
in a follow-up change adding CSD we could use a switch statement.
Change-Id: I15318e497b236128f779769e4fa99f307ea431ea
Related: OS#1572
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 30 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index b8f8322..444cda2 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -402,6 +402,9 @@
LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n");
goto free_bad_msg;
}
+ /* pull the AMR header, it's not being sent over Um */
+ msg_tch->l2h += sizeof(struct amr_hdr);
+ len -= sizeof(struct amr_hdr);
break;
default:
inval_mode2:
@@ -490,12 +493,13 @@
/* the first FN 4,13,21 defines that CMI is included in frame,
* the first FN 0,8,17 defines that CMR is included in frame.
*/
- gsm0503_tch_afs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr),
- msgb_l2len(msg) - sizeof(struct amr_hdr),
- !sched_tchf_dl_amr_cmi_map[br->fn % 26],
- chan_state->codec, chan_state->codecs,
- chan_state->dl_ft,
- chan_state->dl_cmr);
+ gsm0503_tch_afs_encode(bursts_p,
+ msgb_l2(msg), msgb_l2len(msg),
+ !sched_tchf_dl_amr_cmi_map[br->fn % 26],
+ chan_state->codec,
+ chan_state->codecs,
+ chan_state->dl_ft,
+ chan_state->dl_cmr);
} else {
gsm0503_tch_fr_encode(bursts_p, msg->l2h, msgb_l2len(msg), 1);
}
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index 97b8582..541feab 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -412,12 +412,13 @@
/* the first FN 4,13,21 or 5,14,22 defines that CMI is included
* in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is
* included in frame. */
- gsm0503_tch_ahs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr),
- msgb_l2len(msg) - sizeof(struct amr_hdr),
- !sched_tchh_dl_amr_cmi_map[br->fn % 26],
- chan_state->codec, chan_state->codecs,
- chan_state->dl_ft,
- chan_state->dl_cmr);
+ gsm0503_tch_ahs_encode(bursts_p,
+ msgb_l2(msg), msgb_l2len(msg),
+ !sched_tchh_dl_amr_cmi_map[br->fn % 26],
+ chan_state->codec,
+ chan_state->codecs,
+ chan_state->dl_ft,
+ chan_state->dl_cmr);
} else {
gsm0503_tch_hr_encode(bursts_p, msg->l2h, msgb_l2len(msg));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33703
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I15318e497b236128f779769e4fa99f307ea431ea
Gerrit-Change-Number: 33703
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33726 )
Change subject: osmo-bts-trx: document/clarify the meaning of BUFMAX=24
......................................................................
Patch Set 1:
(1 comment)
File include/osmo-bts/scheduler.h:
https://gerrit.osmocom.org/c/osmo-bts/+/33726/comment/3281761c_3ddf781f
PS1, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */
> why not use BUFMAX instead of 24 then?
Because `BUFMAX` is defined in a local header of osmo-bts-trx, while this header is in the common directory. Don't ask me why, I don't know, but I guess it's because osmo-bts-virtual is reusing some parts of the scheduler. I could have defined `BUFMAX` here, but IMO `sched_utils.h` is a better place.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33726
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed
Gerrit-Change-Number: 33726
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 21:51:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33726 )
Change subject: osmo-bts-trx: document/clarify the meaning of BUFMAX=24
......................................................................
Patch Set 1:
(1 comment)
File include/osmo-bts/scheduler.h:
https://gerrit.osmocom.org/c/osmo-bts/+/33726/comment/85e0890c_e298bf2f
PS1, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */
why not use BUFMAX instead of 24 then?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33726
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed
Gerrit-Change-Number: 33726
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Jul 2023 21:48:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725 )
Change subject: BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
......................................................................
Patch Set 3:
(1 comment)
This change is ready for review.
Patchset:
PS2:
> Marking as WIP, somehow this causes a DTE in `BTS_Tests.TC_speech_no_rtp_tchf`.
Fixed in https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Gerrit-Change-Number: 33725
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 12 Jul 2023 21:23:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33727 )
Change subject: BTS_Tests: properly release TCH in f_TC_speech_no_rtp()
......................................................................
BTS_Tests: properly release TCH in f_TC_speech_no_rtp()
Otherwise we're getting a DTE when trying to run this function more
than once in a single testcase (e.g. when testing different channel
modes). This is already done properly in f_TC_speech_rtp().
Change-Id: I290789153bea4b128af29dcf7c52da16b64c4108
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/33727/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 5a34a8c..9482561 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8278,6 +8278,8 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ f_rsl_chan_deact();
+ f_rslem_unregister(0, g_chan_nr);
}
testcase TC_speech_no_rtp_tchf() runs on test_CT {
var ConnHdlr vc_conn;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33727
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I290789153bea4b128af29dcf7c52da16b64c4108
Gerrit-Change-Number: 33727
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange