ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7861, FS-7862: [mod_conference] fix crash and other issues caused by multi canvas feature

Browse Source
This commit is contained in:
Brian West
2015-07-21 15:43:06 -05:00
parent 8b10cd3d00
commit 02539c6c4f
6 changed files with 110 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/testing/autoload_configs/conference.conf.xml
+31
View File
@@ -261,6 +261,37 @@
<param name="video-fps" value="15"/>
</profile>
<profile name="test_res_id">
<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="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="local_stream://video"/> -->
<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="video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding"/>
<param name="video-mode" value="mux"/>
<param name="video-layout-name" value="test_res_id"/>
<param name="video-canvas-size" value="1920x1080"/>
<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="15"/>
</profile>
<profile name="video-mcu-stereo-multi-canvas">
<param name="domain" value="$${domain}"/>
<param name="rate" value="48000"/>
conf/testing/autoload_configs/conference_layouts.conf.xml
+4
View File
@@ -12,6 +12,10 @@
<image x="0" y="90" scale="180"/>
<image x="180" y="90" scale="180"/>
</layout>
<layout name="test_res_id" auto-3d-position="true">
<image x="0" y="90" scale="180" reservation_id="left"/>
<image x="180" y="90" scale="180" reservation_id="right"/>
</layout>
<layout name="2x2" auto-3d-position="true">
<image x="0" y="0" scale="180"/>
<image x="180" y="0" scale="180"/>
conf/testing/dialplan/default/0019_conf.xml
+6
View File
@@ -88,4 +88,10 @@
</condition>
</extension>
<extension name="conf">
<condition field="destination_number" expression="^6079$">
<action application="conference" data="6079@test_res_id"/>
</condition>
</extension>