cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

osmo-bts-virtual: Avoid rejecting AMR in uplink 

Change-Id: Ib527a9fe02c49f6129c376424480aa1004f9ee8f
This commit is contained in:
Harald Welte 2020-03-10 22:44:01 +01:00 committed by laforge
parent 187f7c8713
commit 7b0da0650d
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/osmo-bts-virtual/scheduler_virtbts.c
View File

@ -386,47 +386,8 @@ inval_mode1:
}
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: