fixeria submitted this change.

View Change

osmo-bts-trx: do not run osmo_{fr,hr}_check_sid() on FACCH/U frames

It makes no sense to perform the SID codeword lookup in signalling
frames (FACCH), because it can be present only in speech frames.

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

diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index b100fab..1bf67a0 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -119,7 +119,7 @@
 								: tch_mode) {
 	case GSM48_CMODE_SPEECH_V1: /* FR */
 		rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0, &n_errors, &n_bits_total);
-		if (rc >= 0)
+		if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */
 			lchan_set_marker(osmo_fr_check_sid(tch_data, rc), lchan); /* DTXu */
 		break;
 	case GSM48_CMODE_SPEECH_EFR: /* EFR */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index 51a0b90..27880c1 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -147,8 +147,8 @@
 		 */
 		rc = gsm0503_tch_hr_decode(tch_data, *bursts_p,
 			fn_is_odd, &n_errors, &n_bits_total);
-		if (rc >= 0) /* DTXu */
-			lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan);
+		if (rc == (GSM_HR_BYTES + 1)) /* only for valid *speech* frames */
+			lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan); /* DTXu */
 		break;
 	case GSM48_CMODE_SPEECH_AMR: /* AMR */
 		/* the first FN 0,8,17 or 1,9,18 defines that CMI is included

To view, visit change 27429. To unsubscribe, or for help writing mail filters, visit settings.