<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10963">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">codec_pref: add AMR configuration bits to make_scl_config() in unit-test<br><br>The the function make_scl_config() is used to generate realistically<br>looking speech codec lists to perform the unit tests for codec_pref.c.<br>This function does not yet populate the S0-S15 bits for AMR codecs. Lets<br>make sure that at least the default configuration is populated here.<br><br>Change-Id: I534239416c038ea856c128659f314aa521f85c15<br>---<br>M tests/codec_pref/codec_pref_test.c<br>1 file changed, 6 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c</span><br><span>index b0b9f5e..efc77f6 100644</span><br><span>--- a/tests/codec_pref/codec_pref_test.c</span><br><span>+++ b/tests/codec_pref/codec_pref_test.c</span><br><span>@@ -78,11 +78,13 @@</span><br><span>     case 3:</span><br><span>              /* FR3 only */</span><br><span>               scl->codec[0].type = GSM0808_SCT_FR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR;</span><br><span>                scl->len = 1;</span><br><span>             break;</span><br><span>       case 4:</span><br><span>              /* HR3 only */</span><br><span>               scl->codec[0].type = GSM0808_SCT_HR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[0].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR;</span><br><span>                scl->len = 1;</span><br><span>             break;</span><br><span>       case 5:</span><br><span>@@ -102,7 +104,9 @@</span><br><span>                /* FR1, FR3 and HR3 */</span><br><span>               scl->codec[0].type = GSM0808_SCT_FR1;</span><br><span>             scl->codec[1].type = GSM0808_SCT_FR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[1].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR;</span><br><span>                scl->codec[2].type = GSM0808_SCT_HR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR;</span><br><span>                scl->len = 3;</span><br><span>             break;</span><br><span>       case 8:</span><br><span>@@ -110,8 +114,10 @@</span><br><span>               scl->codec[0].type = GSM0808_SCT_FR1;</span><br><span>             scl->codec[1].type = GSM0808_SCT_FR2;</span><br><span>             scl->codec[2].type = GSM0808_SCT_FR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[2].cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR;</span><br><span>                scl->codec[3].type = GSM0808_SCT_HR1;</span><br><span>             scl->codec[4].type = GSM0808_SCT_HR3;</span><br><span style="color: hsl(120, 100%, 40%);">+              scl->codec[4].cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR;</span><br><span>                scl->len = 5;</span><br><span>             break;</span><br><span>       }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10963">change 10963</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/10963"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I534239416c038ea856c128659f314aa521f85c15 </div>
<div style="display:none"> Gerrit-Change-Number: 10963 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>