Change in osmo-bts[master]: osmo-bts-virtual: Avoid rejecting AMR in uplink

[laforge]

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

Change subject: osmo-bts-virtual: Avoid rejecting AMR in uplink
......................................................................

osmo-bts-virtual: Avoid rejecting AMR in uplink

Change-Id: Ib527a9fe02c49f6129c376424480aa1004f9ee8f
---
M src/osmo-bts-virtual/scheduler_virtbts.c
1 file changed, 2 insertions(+), 41 deletions(-)

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



diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c
index 72a6874..a60c9e0 100644
--- a/src/osmo-bts-virtual/scheduler_virtbts.c
+++ b/src/osmo-bts-virtual/scheduler_virtbts.c
@@ -386,47 +386,8 @@
 			}
 			break;
 		case GSM48_CMODE_SPEECH_AMR: /* AMR */
-#if 0
-			len = amr_decompose_payload(msg_tch->l2h,
-				msgb_l2len(msg_tch), &cmr_codec, &ft_codec,
-				&bfi);
-			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 */
-				trx_loop_amr_set(chan_state, 0);
-			} else {
-				/* enable AMR loop */
-				trx_loop_amr_set(chan_state, 1);
-			}
-			if (ft < 0) {
-				LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn,
-					"Codec (FT = %d) of RTP frame not in list. ", ft_codec);
-				goto free_bad_msg;
-			}
-			if (codec_mode_request && chan_state->dl_ft != ft) {
-				LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,
-					"Codec (FT = %d) of RTP cannot be changed now, but in "
-					"next frame\n", ft_codec);
-				goto free_bad_msg;
-			}
-			chan_state->dl_ft = ft;
-			if (bfi) {
-				LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,
-					"Transmitting 'bad AMR frame'\n");
-				goto free_bad_msg;
-			}
-#else
-			LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "AMR not supported!\n");
-			goto free_bad_msg;
-#endif
+			/* TODO: check length for consistency */
+			goto send_frame;
 			break;
 		default:
 inval_mode2:

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib527a9fe02c49f6129c376424480aa1004f9ee8f
Gerrit-Change-Number: 17453
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200421/a932c2ba/attachment.htm>