Skip to content

F
freeswitch
提交 a5cecbfc authored 作者: Andrey Volk's avatar Andrey Volk
浏览文件
操作

FS-11604: [Configuration] Improve Vanilla config.

上级 42e3c96d
隐藏空白字符变更
内嵌 并排
正在显示 包含 154 行增加 和 21 行删除
conf/vanilla/autoload_configs/conference.conf.xml
浏览文件 @ a5cecbfc
...@@ -250,17 +250,123 @@ ...@@ -250,17 +250,123 @@
<param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-name" value="$${outbound_caller_name}"/>
<param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/>
<param name="comfort-noise" value="false"/> <param name="comfort-noise" value="false"/>
<param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding"/> <param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
<param name="video-auto-floor-msec" value="1000"/>
<param name="video-mode" value="mux"/> <param name="video-mode" value="mux"/>
<param name="video-layout-name" value="3x3"/> <param name="video-layout-name" value="3x3"/>
<param name="video-layout-name" value="group:grid"/> <param name="video-layout-name" value="group:grid"/>
<param name="video-canvas-size" value="1920x1080"/> <param name="video-canvas-size" value="1920x1080"/>
<param name="video-canvas-bgcolor" value="#333333"/> <param name="video-canvas-bgcolor" value="#333333"/>
<param name="video-layout-bgcolor" value="#000000"/> <param name="video-layout-bgcolor" value="#000000"/>
<param name="video-codec-bandwidth" value="1mb"/> <param name="video-codec-bandwidth" value="3mb"/>
<param name="video-fps" value="15"/> <param name="video-fps" value="30"/>
<!-- <param name="video-codec-config-profile-name" value="conference"/> -->
</profile> </profile>
<profile name="video-mcu-stereo-720">
<param name="domain" value="$${domain}"/>
<param name="rate" value="48000"/>
<param name="channels" value="2"/>
<param name="interval" value="20"/>
<param name="energy-level" value="200"/>
<!-- <param name="tts-engine" value="flite"/> -->
<!-- <param name="tts-voice" value="kal16"/> -->
<param name="muted-sound" value="conference/conf-muted.wav"/>
<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
<param name="alone-sound" value="conference/conf-alone.wav"/>
<param name="moh-sound" value="$${hold_music}"/>
<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
<param name="kicked-sound" value="conference/conf-kicked.wav"/>
<param name="locked-sound" value="conference/conf-locked.wav"/>
<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
<param name="pin-sound" value="conference/conf-pin.wav"/>
<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
<param name="caller-id-name" value="$${outbound_caller_name}"/>
<param name="caller-id-number" value="$${outbound_caller_id}"/>
<param name="comfort-noise" value="false"/>
<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
<param name="video-auto-floor-msec" value="1000"/>
<param name="video-mode" value="mux"/>
<param name="video-layout-name" value="3x3"/>
<param name="video-layout-name" value="group:grid"/>
<param name="video-canvas-size" value="1280x720"/>
<param name="video-canvas-bgcolor" value="#333333"/>
<param name="video-layout-bgcolor" value="#000000"/>
<param name="video-codec-bandwidth" value="3mb"/>
<param name="video-fps" value="30"/>
</profile>
<profile name="video-mcu-stereo-480">
<param name="domain" value="$${domain}"/>
<param name="rate" value="48000"/>
<param name="channels" value="2"/>
<param name="interval" value="20"/>
<param name="energy-level" value="200"/>
<!-- <param name="tts-engine" value="flite"/> -->
<!-- <param name="tts-voice" value="kal16"/> -->
<param name="muted-sound" value="conference/conf-muted.wav"/>
<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
<param name="alone-sound" value="conference/conf-alone.wav"/>
<param name="moh-sound" value="$${hold_music}"/>
<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
<param name="kicked-sound" value="conference/conf-kicked.wav"/>
<param name="locked-sound" value="conference/conf-locked.wav"/>
<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
<param name="pin-sound" value="conference/conf-pin.wav"/>
<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
<param name="caller-id-name" value="$${outbound_caller_name}"/>
<param name="caller-id-number" value="$${outbound_caller_id}"/>
<param name="comfort-noise" value="false"/>
<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
<param name="video-auto-floor-msec" value="1000"/>
<param name="video-mode" value="mux"/>
<param name="video-layout-name" value="3x3"/>
<param name="video-layout-name" value="group:grid"/>
<param name="video-canvas-size" value="640x480"/>
<param name="video-canvas-bgcolor" value="#333333"/>
<param name="video-layout-bgcolor" value="#000000"/>
<param name="video-codec-bandwidth" value="3mb"/>
<param name="video-fps" value="30"/>
</profile>
<profile name="video-mcu-stereo-320">
<param name="domain" value="$${domain}"/>
<param name="rate" value="48000"/>
<param name="channels" value="2"/>
<param name="interval" value="20"/>
<param name="energy-level" value="200"/>
<!-- <param name="tts-engine" value="flite"/> -->
<!-- <param name="tts-voice" value="kal16"/> -->
<param name="muted-sound" value="conference/conf-muted.wav"/>
<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
<param name="alone-sound" value="conference/conf-alone.wav"/>
<param name="moh-sound" value="$${hold_music}"/>
<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
<param name="kicked-sound" value="conference/conf-kicked.wav"/>
<param name="locked-sound" value="conference/conf-locked.wav"/>
<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
<param name="pin-sound" value="conference/conf-pin.wav"/>
<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
<param name="caller-id-name" value="$${outbound_caller_name}"/>
<param name="caller-id-number" value="$${outbound_caller_id}"/>
<param name="comfort-noise" value="false"/>
<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
<param name="video-auto-floor-msec" value="1000"/>
<param name="video-mode" value="mux"/>
<param name="video-layout-name" value="3x3"/>
<param name="video-layout-name" value="group:grid"/>
<param name="video-canvas-size" value="480x320"/>
<param name="video-canvas-bgcolor" value="#333333"/>
<param name="video-layout-bgcolor" value="#000000"/>
<param name="video-codec-bandwidth" value="3mb"/>
<param name="video-fps" value="30"/>
</profile>
<profile name="sla"> <profile name="sla">
<param name="domain" value="$${domain}"/> <param name="domain" value="$${domain}"/>
......
conf/vanilla/autoload_configs/modules.conf.xml
浏览文件 @ a5cecbfc
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<load module="mod_opus"/> <load module="mod_opus"/>
<!-- File Format Interfaces --> <!-- File Format Interfaces -->
<!--<load module="mod_av"/>--> <load module="mod_av"/>
<load module="mod_sndfile"/> <load module="mod_sndfile"/>
<load module="mod_native_file"/> <load module="mod_native_file"/>
<!--<load module="mod_opusfile"/>--> <!--<load module="mod_opusfile"/>-->
......
conf/vanilla/autoload_configs/verto.conf.xml
浏览文件 @ a5cecbfc
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
<param name="mcast-ip" value="224.1.1.1"/> <param name="mcast-ip" value="224.1.1.1"/>
<param name="mcast-port" value="1337"/> <param name="mcast-port" value="1337"/>
<param name="rtp-ip" value="$${local_ip_v4}"/> <param name="rtp-ip" value="$${local_ip_v4}"/>
<!-- <param name="ext-rtp-ip" value=""/> --> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="local-network" value="localnet.auto"/> <param name="local-network" value="localnet.auto"/>
<param name="outbound-codec-string" value="opus,vp8"/> <param name="outbound-codec-string" value="opus,h264,vp8"/>
<param name="inbound-codec-string" value="opus,vp8"/> <param name="inbound-codec-string" value="opus,h264,vp8"/>
<param name="apply-candidate-acl" value="localnet.auto"/> <param name="apply-candidate-acl" value="localnet.auto"/>
<param name="apply-candidate-acl" value="wan_v4.auto"/> <param name="apply-candidate-acl" value="wan_v4.auto"/>
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
<param name="blind-reg" value="false"/> <param name="blind-reg" value="false"/>
<param name="rtp-ip" value="$${local_ip_v6}"/> <param name="rtp-ip" value="$${local_ip_v6}"/>
<!-- <param name="ext-rtp-ip" value=""/> --> <!-- <param name="ext-rtp-ip" value=""/> -->
<param name="outbound-codec-string" value="opus,vp8"/> <param name="outbound-codec-string" value="opus,h264,vp8"/>
<param name="inbound-codec-string" value="opus,vp8"/> <param name="inbound-codec-string" value="opus,h264,vp8"/>
<param name="apply-candidate-acl" value="wan_v6.auto"/> <param name="apply-candidate-acl" value="wan_v6.auto"/>
<param name="apply-candidate-acl" value="rfc1918.auto"/> <param name="apply-candidate-acl" value="rfc1918.auto"/>
......
conf/vanilla/dialplan/default.xml
浏览文件 @ a5cecbfc
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
<action application="answer"/> <action application="answer"/>
<action application="send_display" data="FreeSWITCH Conference|$1"/> <action application="send_display" data="FreeSWITCH Conference|$1"/>
<action application="set" data="conference_member_flags=join-vid-floor"/> <action application="set" data="conference_member_flags=join-vid-floor"/>
<action application="conference" data="$1-${domain_name}@video-mcu-stereo"/> <action application="conference" data="$1@video-mcu-stereo"/>
</condition> </condition>
</extension> </extension>
...@@ -410,7 +410,28 @@ ...@@ -410,7 +410,28 @@
<extension name="cdquality_conferences"> <extension name="cdquality_conferences">
<condition field="destination_number" expression="^(35\d{2})$"> <condition field="destination_number" expression="^(35\d{2})$">
<action application="answer"/> <action application="answer"/>
<action application="conference" data="$1-${domain_name}@video-mcu-stereo"/> <action application="conference" data="$1@video-mcu-stereo"/>
</condition>
</extension>
<extension name="cdquality_conferences_720">
<condition field="destination_number" expression="^(36\d{2})$">
<action application="answer"/>
<action application="conference" data="$1@video-mcu-stereo-720"/>
</condition>
</extension>
<extension name="cdquality_conferences_480">
<condition field="destination_number" expression="^(37\d{2})$">
<action application="answer"/>
<action application="conference" data="$1@video-mcu-stereo-480"/>
</condition>
</extension>
<extension name="cdquality_conferences_320">
<condition field="destination_number" expression="^(38\d{2})$">
<action application="answer"/>
<action application="conference" data="$1@video-mcu-stereo-320"/>
</condition> </condition>
</extension> </extension>
......
conf/vanilla/dialplan/public.xml
浏览文件 @ a5cecbfc
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<action application="transfer" data="$1 XML default"/> <action application="transfer" data="$1 XML default"/>
</condition> </condition>
</extension> </extension>
<extension name="public_conference_extensions">
<condition field="destination_number" expression="^(3[5-8][01][0-9])$">
<action application="transfer" data="$1 XML default"/>
</condition>
</extension>
<!-- <!--
You can place files in the public directory to get included. You can place files in the public directory to get included.
......
conf/vanilla/sip_profiles/external.xml
浏览文件 @ a5cecbfc
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
--> -->
<param name="rtp-ip" value="$${local_ip_v4}"/> <param name="rtp-ip" value="$${local_ip_v4}"/>
<param name="sip-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="auto-nat"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="auto-nat"/> <param name="ext-sip-ip" value="$${external_rtp_ip}"/>
<param name="rtp-timeout-sec" value="300"/> <param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/> <param name="rtp-hold-timeout-sec" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>--> <!--<param name="enable-3pcc" value="true"/>-->
......
conf/vanilla/sip_profiles/internal.xml
浏览文件 @ a5cecbfc
...@@ -281,8 +281,8 @@ ...@@ -281,8 +281,8 @@
auto - Use guessed ip. auto - Use guessed ip.
auto-nat - Use ip learned from NAT-PMP or UPNP auto-nat - Use ip learned from NAT-PMP or UPNP
--> -->
<param name="ext-rtp-ip" value="auto-nat"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="auto-nat"/> <param name="ext-sip-ip" value="$${external_rtp_ip}"/>
<!-- rtp inactivity timeout --> <!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/> <param name="rtp-timeout-sec" value="300"/>
......
conf/vanilla/vars.xml
浏览文件 @ a5cecbfc
...@@ -256,8 +256,8 @@ ...@@ -256,8 +256,8 @@
127 - BV32 127 - BV32
--> -->
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8"/> <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,H264,VP8"/>
<X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,H264,VP8"/>
<!-- <!--
xmpp_client_profile and xmpp_server_profile xmpp_client_profile and xmpp_server_profile
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
If unspecified, the bind_server_ip value is used. If unspecified, the bind_server_ip value is used.
Used by: sofia.conf.xml dingaling.conf.xml Used by: sofia.conf.xml dingaling.conf.xml
--> -->
<X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/> <X-PRE-PROCESS cmd="stun-set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
<!-- external_sip_ip <!-- external_sip_ip
Used as the public IP address for SDP. Used as the public IP address for SDP.
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
If unspecified, the bind_server_ip value is used. If unspecified, the bind_server_ip value is used.
Used by: sofia.conf.xml dingaling.conf.xml Used by: sofia.conf.xml dingaling.conf.xml
--> -->
<X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/> <X-PRE-PROCESS cmd="stun-set" data="external_sip_ip=stun:stun.freeswitch.org"/>
<!-- unroll-loops <!-- unroll-loops
Used to turn on sip loopback unrolling. Used to turn on sip loopback unrolling.
...@@ -431,8 +431,8 @@ ...@@ -431,8 +431,8 @@
<!-- Video Settings --> <!-- Video Settings -->
<!-- Setting the max bandwdith --> <!-- Setting the max bandwdith -->
<X-PRE-PROCESS cmd="set" data="rtp_video_max_bandwidth_in=1mb"/> <X-PRE-PROCESS cmd="set" data="rtp_video_max_bandwidth_in=3mb"/>
<X-PRE-PROCESS cmd="set" data="rtp_video_max_bandwidth_out=1mb"/> <X-PRE-PROCESS cmd="set" data="rtp_video_max_bandwidth_out=3mb"/>
<!-- WebRTC Video --> <!-- WebRTC Video -->
<!-- Suppress CNG for WebRTC Audio --> <!-- Suppress CNG for WebRTC Audio -->
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论