Change in osmo-bts[master]: sched_lchan_tch_x: use ul_cmr and ul_ft when generating RTP bad frame

dexter gerrit-no-reply at lists.osmocom.org
Tue Aug 31 15:00:05 UTC 2021


dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25297 )


Change subject: sched_lchan_tch_x: use ul_cmr and ul_ft when generating RTP bad frame
......................................................................

sched_lchan_tch_x: use ul_cmr and ul_ft when generating RTP bad frame

All generated RTP that originates from the BTS relates to uplink. When
generating AMR BAD frame RTP packets, we must use ul_cmr/ul_ft and not
dl_cmr/dl_ft.

Change-Id: Ifa009819791cf7df2dd8201f442b0dae06f622a4
Related: SYS#5549
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 6 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25297/1

diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index c5d60e4..7058500 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -276,8 +276,8 @@
 				break;
 			case GSM48_CMODE_SPEECH_AMR: /* AMR */
 				rc = osmo_amr_rtp_enc(tch_data,
-					chan_state->codec[chan_state->dl_cmr],
-					chan_state->codec[chan_state->dl_ft],
+					chan_state->codec[chan_state->ul_cmr],
+					chan_state->codec[chan_state->ul_ft],
 					AMR_BAD);
 				if (rc < 2) {
 					LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi,
@@ -447,12 +447,14 @@
 					       &bfi, &sti);
 			cmr = -1;
 			ft = -1;
+
 			for (i = 0; i < chan_state->codecs; i++) {
 				if (chan_state->codec[i] == cmr_codec)
 					cmr = i;
 				if (chan_state->codec[i] == ft_codec)
 					ft = i;
 			}
+
 			if (cmr >= 0) { /* new request */
 				chan_state->dl_cmr = cmr;
 				/* disable AMR loop */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index 2106a67..a582f92 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -317,8 +317,8 @@
 				break;
 			case GSM48_CMODE_SPEECH_AMR: /* AMR */
 				rc = osmo_amr_rtp_enc(tch_data,
-					chan_state->codec[chan_state->dl_cmr],
-					chan_state->codec[chan_state->dl_ft],
+					chan_state->codec[chan_state->ul_cmr],
+					chan_state->codec[chan_state->ul_ft],
 					AMR_BAD);
 				if (rc < 2) {
 					LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi,

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ifa009819791cf7df2dd8201f442b0dae06f622a4
Gerrit-Change-Number: 25297
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210831/29e481e9/attachment.htm>


More information about the gerrit-log mailing list