Change in osmo-bts[master]: sched_lchan_tch_x: do not use cmr as ft

[dexter]

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


Change subject: sched_lchan_tch_x: do not use cmr as ft
......................................................................

sched_lchan_tch_x: do not use cmr as ft

When the AMR voice frame that is received from the MS via the radio
interface then CMR and FT are updated, depending on the transmission
phase. When the AMR frame is converted to RTP it gets a header that
contains the CMF and the FT at the time. When generating the RTP
payloed, The present implementation uses the CMR in the position
where the FT should be and the FT is ignored. This is not correct.

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



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

diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 8e6298c..00efcf8 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -186,7 +186,7 @@
 		/* only good speech frames get rtp header */
 		if (rc != GSM_MACBLOCK_LEN && rc >= 4) {
 			if (chan_state->amr_last_dtx == AMR_OTHER) {
-				ft = chan_state->codec[chan_state->ul_cmr];
+				ft = chan_state->codec[chan_state->ul_ft];
 			} else {
 				/* SID frames will always get Frame Type Index 8 (AMR_SID) */
 				ft = AMR_SID;
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index bfebb66..9402204 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -210,7 +210,7 @@
 		/* only good speech frames get rtp header */
 		if (rc != GSM_MACBLOCK_LEN && rc >= 4) {
 			if (chan_state->amr_last_dtx == AMR_OTHER) {
-				ft = chan_state->codec[chan_state->ul_cmr];
+				ft = chan_state->codec[chan_state->ul_ft];
 			} else {
 				/* SID frames will always get Frame Type Index 8 (AMR_SID) */
 				ft = AMR_SID;

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6bb10ff3c76f67b9830787497653b546cf27fe8e
Gerrit-Change-Number: 25295
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/c2a9028b/attachment.htm>