paulmataruso/osmo-bsc
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc.git synced 2025-11-01 20:53:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source 
Change-Id: I42e7bfb4f56aa6cf104d7d40e6a917ae604b5f42
This commit is contained in:
Neels Hofmeyr
2024-05-28 03:39:50 +02:00
parent 2dc46a6ed6
commit 824ec4cad7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osmo-bsc/codec_pref.c
View File

@@ -271,8 +271,8 @@ static uint16_t sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg
int s_bit;
uint8_t cfg_modes = multi_rate_conf_to_amr_modes(cfg);
for (s_bit = 0; s_bit < 16; s_bit++) {
uint8_t sn_modes = gsm0808_amr_modes_from_cfg[fr ? 1 : 0][s_bit];
if ((cfg_modes & sn_modes) == sn_modes)
uint8_t s_bit_modes = gsm0808_amr_modes_from_cfg[fr ? 1 : 0][s_bit];
if (s_bit_modes && (cfg_modes & s_bit_modes) == s_bit_modes)
s15_s0 |= (1 << s_bit);
}
return s15_s0;

12
tests/codec_pref/codec_pref_test.ok
View File

@@ -54,7 +54,7 @@ Determining channel mode and rate:
codec->hr=0
codec->efr=0
codec->amr=1
* result: rc=0, full_rate=1, s15_s0=5702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (1 items):
@@ -68,7 +68,7 @@ Determining channel mode and rate:
codec->hr=0
codec->efr=0
codec->amr=1
* result: rc=0, full_rate=0, s15_s0=0702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (2 items):
@@ -241,7 +241,7 @@ Determining channel mode and rate:
codec->hr=1
codec->efr=1
codec->amr=1
* result: rc=0, full_rate=1, s15_s0=5702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (1 items):
@@ -263,7 +263,7 @@ Determining channel mode and rate:
codec->hr=1
codec->efr=1
codec->amr=1
* result: rc=0, full_rate=0, s15_s0=0702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (2 items):
@@ -450,7 +450,7 @@ Determining channel mode and rate:
codec->hr=1
codec->efr=1
codec->amr=1
* result: rc=0, full_rate=1, s15_s0=5702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=1, s15_s0=57ff, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (5 items):
@@ -472,7 +472,7 @@ Determining channel mode and rate:
codec->hr=1
codec->efr=1
codec->amr=1
* result: rc=0, full_rate=0, s15_s0=0702, chan_mode=SPEECH_AMR
* result: rc=0, full_rate=0, s15_s0=073f, chan_mode=SPEECH_AMR
Determining channel mode and rate:
* MS: speech codec list (5 items):