mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
voice_client: re-enable comment away settings Asterisk no longer need.
It should work now.
This reverts commit b15782bd07.
This commit is contained in:
Ronny Nilsson
parent
2f600a6b58
commit
6694e1975b
3 changed files with 48 additions and 38 deletions
|
|
@ -45,25 +45,25 @@ context=default
|
|||
context_direct=default-direct
|
||||
|
||||
; Echo Cancellation [off, on]
|
||||
echocancel=on
|
||||
;echocancel=on
|
||||
|
||||
; Voice Activity Detection
|
||||
; 0 = VAD off
|
||||
; 1 = Transparent VAD
|
||||
; 2 = Conservative VAD
|
||||
; 3 = Aggressive VAD
|
||||
silence=0
|
||||
;silence=0
|
||||
|
||||
; TX Gain value between -96 and 32 dB
|
||||
txgain=0
|
||||
;txgain=0
|
||||
|
||||
; RX Gain value between -96 and 32 dB
|
||||
rxgain=0
|
||||
;rxgain=0
|
||||
|
||||
; Codec settings, can be specified multiple times to allow more codecs
|
||||
; Available values are: alaw, ulaw, g723, g726, g729
|
||||
allow = ulaw
|
||||
allow = alaw
|
||||
;allow = ulaw
|
||||
;allow = alaw
|
||||
|
||||
; Enable/Disable ring signal [off, on]
|
||||
ringsignal=on
|
||||
|
|
@ -73,17 +73,17 @@ dialoutmsec=|DIALOUTMSEC|
|
|||
|
||||
; Specify packetization rate
|
||||
; Available values are: 5, 10, 20, 30, 40
|
||||
period=20
|
||||
;period=20
|
||||
|
||||
; Comfort Noise Generation
|
||||
; 0 = CNG off
|
||||
; 1 = White noise
|
||||
; 2 = Hot noise
|
||||
; 3 = Estimate
|
||||
comfortnoise=0
|
||||
;comfortnoise=0
|
||||
|
||||
; Maximum delay between on/off hook for detecting hook flash, milliseconds
|
||||
hfmaxdelay=500
|
||||
;hfmaxdelay=500
|
||||
|
||||
; Feature Access Codes
|
||||
; DTMF tone sequences to be treated as feature access codes
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@ dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
|
|||
;jitter_min=|JITTERMIN|
|
||||
;jitter_max=|JITTERMAX|
|
||||
;jitter_target=|JITTERTARGET|
|
||||
txgain=|TXGAIN|
|
||||
rxgain=|RXGAIN|
|
||||
comfortnoise=|COMFORTNOISE|
|
||||
echocancel=|ECHOCANCEL|
|
||||
silence=|SILENCE|
|
||||
;txgain=|TXGAIN|
|
||||
;rxgain=|RXGAIN|
|
||||
;comfortnoise=|COMFORTNOISE|
|
||||
;echocancel=|ECHOCANCEL|
|
||||
;silence=|SILENCE|
|
||||
context=|CONTEXT|
|
||||
context_direct=|CONTEXT|-direct
|
||||
dialtone_extension_hint_context=brcm_dialtone
|
||||
dialtone_extension_hint=|DIALTONE_EXTENSION_HINT|
|
||||
period=20
|
||||
;period=20
|
||||
callwaiting=|CALLWAITING|
|
||||
clir=|CLIR|
|
||||
dtmfrelay=|DTMFRELAY|
|
||||
|ALLOW|
|
||||
;|ALLOW|
|
||||
|
||||
|
|
|
|||
|
|
@ -793,11 +793,11 @@ configure_sip_provider()
|
|||
fi
|
||||
|
||||
# Force ulaw/alaw if fax, otherwise read selected codecs
|
||||
if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
|
||||
sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/sip_provider.tmp
|
||||
else
|
||||
sed -i "s/|ALLOW|/$(read_codecs_ptime $1)/" $WORKDIR/sip_provider.tmp
|
||||
fi
|
||||
# if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
|
||||
# sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/sip_provider.tmp
|
||||
# else
|
||||
# sed -i "s/|ALLOW|/$(read_codecs_ptime $1)/" $WORKDIR/sip_provider.tmp
|
||||
# fi
|
||||
|
||||
# Autoframing
|
||||
if [ -z "$autoframing" ] ; then
|
||||
|
|
@ -1899,16 +1899,26 @@ configure_brcm_line()
|
|||
|
||||
config_get extension $1 extension
|
||||
config_get sip_provider $1 sip_account
|
||||
config_get ptime $1 ptime
|
||||
config_get silence $1 vad
|
||||
config_get ecan $1 echo_cancel
|
||||
config_get noise $1 noise
|
||||
config_get jitter_fixed $1 jitter_fixed
|
||||
config_get jitter_min $1 jitter_min
|
||||
config_get jitter_max $1 jitter_max
|
||||
config_get jitter_target $1 jitter_target
|
||||
config_get txgain $1 txgain
|
||||
config_get rxgain $1 rxgain
|
||||
# config_get ptime $1 ptime
|
||||
ptime=0
|
||||
# config_get silence $1 vad
|
||||
vad=0
|
||||
# config_get ecan $1 echo_cancel
|
||||
echo_cancel=0
|
||||
# config_get noise $1 noise
|
||||
noise=0
|
||||
# config_get jitter_fixed $1 jitter_fixed
|
||||
jitter_fixed=0
|
||||
# config_get jitter_min $1 jitter_min
|
||||
jitter_min=0
|
||||
# config_get jitter_max $1 jitter_max
|
||||
jitter_max=0
|
||||
# config_get jitter_target $1 jitter_target
|
||||
jitter_target=0
|
||||
# config_get txgain $1 txgain
|
||||
txgain=0
|
||||
# config_get rxgain $1 rxgain
|
||||
rxgain=0
|
||||
config_get autodial $1 autodial
|
||||
config_get autodial_timeout $1 autodial_timeout
|
||||
config_get dialtone_timeout $1 dialtone_timeout
|
||||
|
|
@ -1964,13 +1974,13 @@ configure_brcm_line()
|
|||
|
||||
|
||||
#Configure BRCM line with codecs according to the SIP line settings
|
||||
local is_fax
|
||||
config_get is_fax $sip_provider is_fax
|
||||
if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
|
||||
sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/brcm_line.tmp
|
||||
else
|
||||
sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/" $WORKDIR/brcm_line.tmp
|
||||
fi
|
||||
# local is_fax
|
||||
# config_get is_fax $sip_provider is_fax
|
||||
# if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
|
||||
# sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/brcm_line.tmp
|
||||
# else
|
||||
# sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/" $WORKDIR/brcm_line.tmp
|
||||
# fi
|
||||
|
||||
cat $WORKDIR/brcm_line.tmp >> $WORKDIR/brcm.tmp
|
||||
rm -f $WORKDIR/brcm_line.tmp
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue