<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25297">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sched_lchan_tch_x: use ul_cmr and ul_ft when generating RTP bad frame<br><br>All generated RTP that originates from the BTS relates to uplink. When<br>generating AMR BAD frame RTP packets, we must use ul_cmr/ul_ft and not<br>dl_cmr/dl_ft.<br><br>Change-Id: Ifa009819791cf7df2dd8201f442b0dae06f622a4<br>Related: SYS#5549<br>---<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>2 files changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25297/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index c5d60e4..7058500 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -276,8 +276,8 @@</span><br><span>                              break;</span><br><span>                       case GSM48_CMODE_SPEECH_AMR: /* AMR */</span><br><span>                               rc = osmo_amr_rtp_enc(tch_data,</span><br><span style="color: hsl(0, 100%, 40%);">-                                 chan_state->codec[chan_state->dl_cmr],</span><br><span style="color: hsl(0, 100%, 40%);">-                                    chan_state->codec[chan_state->dl_ft],</span><br><span style="color: hsl(120, 100%, 40%);">+                                   chan_state->codec[chan_state->ul_cmr],</span><br><span style="color: hsl(120, 100%, 40%);">+                                  chan_state->codec[chan_state->ul_ft],</span><br><span>                                  AMR_BAD);</span><br><span>                            if (rc < 2) {</span><br><span>                                     LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi,</span><br><span>@@ -447,12 +447,14 @@</span><br><span>                                         &bfi, &sti);</span><br><span>                  cmr = -1;</span><br><span>                    ft = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                   for (i = 0; i < chan_state->codecs; i++) {</span><br><span>                             if (chan_state->codec[i] == cmr_codec)</span><br><span>                                    cmr = i;</span><br><span>                             if (chan_state->codec[i] == ft_codec)</span><br><span>                                     ft = i;</span><br><span>                      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                  if (cmr >= 0) { /* new request */</span><br><span>                                 chan_state->dl_cmr = cmr;</span><br><span>                                 /* disable AMR loop */</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index 2106a67..a582f92 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -317,8 +317,8 @@</span><br><span>                                break;</span><br><span>                       case GSM48_CMODE_SPEECH_AMR: /* AMR */</span><br><span>                               rc = osmo_amr_rtp_enc(tch_data,</span><br><span style="color: hsl(0, 100%, 40%);">-                                 chan_state->codec[chan_state->dl_cmr],</span><br><span style="color: hsl(0, 100%, 40%);">-                                    chan_state->codec[chan_state->dl_ft],</span><br><span style="color: hsl(120, 100%, 40%);">+                                   chan_state->codec[chan_state->ul_cmr],</span><br><span style="color: hsl(120, 100%, 40%);">+                                  chan_state->codec[chan_state->ul_ft],</span><br><span>                                  AMR_BAD);</span><br><span>                            if (rc < 2) {</span><br><span>                                     LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25297">change 25297</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/+/25297"/><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: Ifa009819791cf7df2dd8201f442b0dae06f622a4 </div>
<div style="display:none"> Gerrit-Change-Number: 25297 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>