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

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25572 )

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, 4 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  daniel: Looks good to me, approved
  dexter: Looks good to me, but someone else must approve



diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index b3649cd..267ca08 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -280,8 +280,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) {
 					LOGL1S(DL1P, LOGL_ERROR, l1t, bi->tn, chan, bi->fn,
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index 0692f9d..8bde7d4 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -311,8 +311,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) {
 					LOGL1S(DL1P, LOGL_ERROR, l1t, bi->tn, chan, bi->fn,

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

Gerrit-Project: osmo-bts
Gerrit-Branch: 2021q1
Gerrit-Change-Id: Ifa009819791cf7df2dd8201f442b0dae06f622a4
Gerrit-Change-Number: 25572
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210924/541aa074/attachment.htm>