library/RSL_Types: s/amr_codec_modes/codec_modes/ in RSL_IE_MultirateCfg
The RSL MultiRate configuration IE is all about AMR (Adaptive Multi Rate) codec, so there is no need for 'amr_' prefix in field names. Change-Id: If63ee50e8681ad4e0a202f142f2fca2268d55079
This commit is contained in:
parent
fcce70596a
commit
f14e696656
|
@ -2540,7 +2540,7 @@ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies
|
|||
case (RSL_CMOD_SP_GSM1) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V1; }
|
||||
case (RSL_CMOD_SP_GSM2) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V2; }
|
||||
case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3;
|
||||
amr_codecs_bitmask := g_pars.mr_conf.amr_codec_modes;
|
||||
amr_codecs_bitmask := g_pars.mr_conf.codec_modes;
|
||||
}
|
||||
case else {
|
||||
log("RSL channel mode := ", g_pars.chan_mode.coding_alg_rate,
|
||||
|
@ -2568,7 +2568,7 @@ private function get_start_amr_ft() runs on ConnHdlr return integer {
|
|||
|
||||
var integer n := 0;
|
||||
for (var integer i:= 7; i >= 0; i := i - 1) {
|
||||
if (g_pars.mr_conf.amr_codec_modes[i] == '1'B) {
|
||||
if (g_pars.mr_conf.codec_modes[i] == '1'B) {
|
||||
if (n == start_nth) {
|
||||
return 7 - i;
|
||||
}
|
||||
|
|
|
@ -824,20 +824,20 @@ module RSL_Types {
|
|||
boolean icmi,
|
||||
BIT1 spare,
|
||||
uint2_t start_mode,
|
||||
BIT8 amr_codec_modes,
|
||||
BIT8 codec_modes,
|
||||
octetstring parameters
|
||||
} with {
|
||||
variant (len) "LENGTHTO(mr_speech_ver,nscb,icmi,spare,start_mode,amr_codec_modes,parameters)"
|
||||
variant (len) "LENGTHTO(mr_speech_ver,nscb,icmi,spare,start_mode,codec_modes,parameters)"
|
||||
};
|
||||
template (value) RSL_IE_MultirateCfg ts_RSL_MultirateCfg(boolean icmi := true, uint2_t start_mode := 0,
|
||||
BIT8 amr_codec_modes := '00000100'B /* 5,90k */) := {
|
||||
BIT8 codec_modes := '00000100'B /* 5,90k */) := {
|
||||
len := 2,
|
||||
mr_speech_ver := 1,
|
||||
nscb := false,
|
||||
icmi := icmi,
|
||||
spare := '0'B,
|
||||
start_mode := start_mode,
|
||||
amr_codec_modes := amr_codec_modes,
|
||||
codec_modes := codec_modes,
|
||||
parameters := ''O
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue