<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17453">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-virtual: Avoid rejecting AMR in uplink<br><br>Change-Id: Ib527a9fe02c49f6129c376424480aa1004f9ee8f<br>---<br>M src/osmo-bts-virtual/scheduler_virtbts.c<br>1 file changed, 2 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>index 72a6874..a60c9e0 100644</span><br><span>--- a/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>+++ b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>@@ -386,47 +386,8 @@</span><br><span> }</span><br><span> break;</span><br><span> case GSM48_CMODE_SPEECH_AMR: /* AMR */</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- len = amr_decompose_payload(msg_tch->l2h,</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_l2len(msg_tch), &cmr_codec, &ft_codec,</span><br><span style="color: hsl(0, 100%, 40%);">- &bfi);</span><br><span style="color: hsl(0, 100%, 40%);">- cmr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- ft = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < chan_state->codecs; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->codec[i] == cmr_codec)</span><br><span style="color: hsl(0, 100%, 40%);">- cmr = i;</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->codec[i] == ft_codec)</span><br><span style="color: hsl(0, 100%, 40%);">- ft = i;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (cmr >= 0) { /* new request */</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->dl_cmr = cmr;</span><br><span style="color: hsl(0, 100%, 40%);">- /* disable AMR loop */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_loop_amr_set(chan_state, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* enable AMR loop */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_loop_amr_set(chan_state, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (ft < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "Codec (FT = %d) of RTP frame not in list. ", ft_codec);</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_bad_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (codec_mode_request && chan_state->dl_ft != ft) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "Codec (FT = %d) of RTP cannot be changed now, but in "</span><br><span style="color: hsl(0, 100%, 40%);">- "next frame\n", ft_codec);</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_bad_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->dl_ft = ft;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfi) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "Transmitting 'bad AMR frame'\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_bad_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "AMR not supported!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_bad_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: check length for consistency */</span><br><span style="color: hsl(120, 100%, 40%);">+ goto send_frame;</span><br><span> break;</span><br><span> default:</span><br><span> inval_mode2:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17453">change 17453</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/17453"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib527a9fe02c49f6129c376424480aa1004f9ee8f </div>
<div style="display:none"> Gerrit-Change-Number: 17453 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>