FS-7513: add flag to choose between encoding each frame and using central encoder per codec, add parsing for floor fields and reservation fields in layouts, add param to control bandwidth for consolidated codecs, add audio-position attr to images in layout to sync with virtual HRTF

This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:46:58 -05:00
1 parent fa5d6af2cd
commit a56e65bace
6 files changed
+261 -119

No files matched your search

@@ -175,9 +175,12 @@
<param name="caller-id-number" value="$${outbound_caller_id}"/>
<param name="comfort-noise" value="true"/>
<!--<param name="conference-flags" value="video-floor-only|rfc-4579|livearray-sync|auto-3d-position|transcode-video|minimize-video-encoding"/> -->
<!-- <param name="video-layout-name" value="3x3"/> -->
<!-- <param name="video-canvas-size" value="1280x720"/> -->
<!-- <param name="video-canvas-bgcolor" value="#0000FF"/> -->
<!-- <param name="video-codec-bandwidth" value="2mb"/> -->
<!--<param name="tts-engine" value="flite"/>-->
<!--<param name="tts-voice" value="kal16"/>-->
@@ -105,7 +105,7 @@
<image x="300" y="300" scale="60"/>
</layout>
<layout name="1up_top_left+5">
<image x="0" y="0" scale="240" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="240" floor="true"/>
<image x="240" y="0" scale="120"/>
<image x="240" y="120" scale="120"/>
<image x="0" y="240" scale="120"/>
@@ -113,7 +113,7 @@
<image x="240" y="240" scale="120"/>
</layout>
<layout name="1up_top_left+7">
<image x="0" y="0" scale="270" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="270" floor="true"/>
<image x="270" y="0" scale="90"/>
<image x="270" y="90" scale="90"/>
<image x="270" y="180" scale="90"/>
@@ -123,7 +123,7 @@
<image x="270" y="270" scale="90"/>
</layout>
<layout name="1up_top_left+9">
<image x="0" y="0" scale="288" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="288" floor="true"/>
<image x="288" y="0" scale="72"/>
<image x="288" y="72" scale="72"/>
<image x="288" y="144" scale="72"/>
@@ -135,7 +135,7 @@
<image x="288" y="288" scale="72"/>
</layout>
<layout name="2up_top+8">
<image x="0" y="0" scale="180" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="180" floor="true"/>
<image x="180" y="0" scale="180" reservation_id="secondary"/>
<image x="0" y="180" scale="90"/>
<image x="90" y="180" scale="90"/>
@@ -147,7 +147,7 @@
<image x="270" y="270" scale="90"/>
</layout>
<layout name="2up_middle+8">
<image x="0" y="90" scale="180" floor="true" reservation_id="primary"/>
<image x="0" y="90" scale="180" floor="true"/>
<image x="180" y="90" scale="180" reservation_id="secondary"/>
<image x="0" y="0" scale="90"/>
<image x="90" y="0" scale="90"/>
@@ -159,7 +159,7 @@
<image x="270" y="270" scale="90"/>
</layout>
<layout name="2up_bottom+8">
<image x="0" y="180" scale="180" floor="true" reservation_id="primary"/>
<image x="0" y="180" scale="180" floor="true"/>
<image x="180" y="180" scale="180" reservation_id="secondary"/>
<image x="0" y="0" scale="90"/>
<image x="90" y="0" scale="90"/>
@@ -171,7 +171,7 @@
<image x="270" y="90" scale="90"/>
</layout>
<layout name="3up+4">
<image x="0" y="0" scale="180" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="180" floor="true"/>
<image x="180" y="0" scale="180" reservation_id="secondary"/>
<image x="0" y="180" scale="180" reservation_id="third"/>
<image x="180" y="180" scale="90"/>
@@ -180,7 +180,7 @@
<image x="270" y="270" scale="90"/>
</layout>
<layout name="3up+9">
<image x="0" y="0" scale="180" floor="true" reservation_id="primary"/>
<image x="0" y="0" scale="180" floor="true"/>
<image x="180" y="0" scale="180" reservation_id="secondary"/>
<image x="0" y="180" scale="180" reservation_id="third"/>
<image x="180" y="180" scale="60"/>