X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fcasparcg.config;h=5c4b33db330df0db81adf45af5aad42c26e89e9d;hb=b899e015d74d993cbd4785242c9c135e68b0fc3a;hp=ffceab1df2b0687ba083057a8ec0b97c083bde6d;hpb=78ead9a387867df98c853befd1ee48ccdf89a546;p=casparcg

diff --git a/shell/casparcg.config b/shell/casparcg.config
index ffceab1df..5c4b33db3 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -4,17 +4,15 @@
     <media-path>media/</media-path>
     <log-path>log/</log-path>
     <data-path>data/</data-path>
-    <template-path>templates/</template-path>
-    <thumbnails-path>thumbnails/</thumbnails-path>
-    <fonts-path>fonts/</fonts-path>
+    <template-path>template/</template-path>
+    <thumbnail-path>thumbnail/</thumbnail-path>
+    <font-path>font/</font-path>
   </paths>
-  <flash>
-    <buffer-depth>4</buffer-depth>
-  </flash>
   <lock-clear-phrase>secret</lock-clear-phrase>
   <channels>
     <channel>
       <video-mode>PAL</video-mode>
+      <channel-layout>stereo</channel-layout>
       <consumers>
         <screen>
           <device>1</device>
@@ -29,30 +27,38 @@
       <port>5250</port>
       <protocol>AMCP</protocol>
     </tcp>
+    <tcp>
+      <port>3250</port>
+      <protocol>LOG</protocol>
+    </tcp>
   </controllers>
 </configuration>
 
 <!--
-<log-level>           trace [trace|debug|info|warning|error]</log-level>
-<force-deinterlace>   true  [true|false]</force-deinterlacing>
+<log-level>           info  [trace|debug|info|warning|error|fatal]</log-level>
+<log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>
+<force-deinterlace>   false  [true|false]</force-deinterlace>
 <channel-grid>        false [true|false]</channel-grid>
 <mixer>
     <blend-modes>          false [true|false]</blend-modes>
     <mipmapping_default_on>false [true|false]</mipmapping_default_on>
+    <straight-alpha>       false [true|false]</straight-alpha>
 </mixer>
-<auto-transcode>      true  [true|false]</auto-transcode>
 <accelerator>auto [cpu|gpu|auto]</accelerator>
 <template-hosts>
     <template-host>
-        <video-mode/>
-        <filename/>
-        <width/>
-        <height/>
+        <video-mode />
+        <filename />
+        <width />
+        <height />
     </template-host>
 </template-hosts>
 <flash>
     <buffer-depth>auto [auto|1..]</buffer-depth>
 </flash>
+<html>
+    <remote-debugging-port>0 [0|1024-65535]</remote-debugging-port>
+</html>
 <thumbnails>
     <generate-thumbnails>true [true|false]</generate-thumbnails>
     <width>256</width>
@@ -65,12 +71,15 @@
 </thumbnails>
 <channels>
     <channel>
-        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>
+        <video-mode>PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>
+        <straight-alpha-output>false [true|false]</straight-alpha-output>
+        <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
         <consumers>
             <decklink>
                 <device>[1..]</device>
                 <key-device>device + 1 [1..]</key-device>
                 <embedded-audio>false [true|false]</embedded-audio>
+                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
                 <latency>normal [normal|low|default]</latency>
                 <keyer>external [external|external_separate_device|internal|default]</keyer>
                 <key-only>false [true|false]</key-only>
@@ -79,9 +88,13 @@
             <bluefish>
                 <device>[1..]</device>
                 <embedded-audio>false [true|false]</embedded-audio>
+                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
                 <key-only>false [true|false]</key-only>
             </bluefish>
-            <system-audio></system-audio>
+            <system-audio>
+                <channel-layout>stereo [mono|stereo|matrix]</channel-layout>
+                <latency>200 [0..]</latency>
+            </system-audio>
             <screen>
                 <device>[0..]</device>
                 <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>
@@ -115,4 +128,34 @@
     </predefined-client>
   </predefined-clients>
 </osc>
+<audio>
+	<channel-layouts>
+		<channel-layout name="mono"        type="mono"        num-channels="1" channel-order="FC" />
+		<channel-layout name="stereo"      type="stereo"      num-channels="2" channel-order="FL FR" />
+		<channel-layout name="matrix"      type="matrix"      num-channels="2" channel-order="ML MR" />
+		<channel-layout name="film"        type="5.1"         num-channels="6" channel-order="FL FC FR BL BR LFE" />
+		<channel-layout name="smpte"       type="5.1"         num-channels="6" channel-order="FL FR FC LFE BL BR" />
+		<channel-layout name="ebu_r123_8a" type="5.1+downmix" num-channels="8" channel-order="DL DR FL FR FC LFE BL BR" />
+		<channel-layout name="ebu_r123_8b" type="5.1+downmix" num-channels="8" channel-order="FL FR FC LFE BL BR DL DR" />
+		<channel-layout name="8ch"         type="8ch"         num-channels="8" />
+		<channel-layout name="16ch"        type="16ch"        num-channels="16" />
+	</channel-layouts>
+	<mix-configs>
+		<mix-config from-type="mono"          to-types="stereo, 5.1"  mix="FL = FC                                           | FR = FC" />
+		<mix-config from-type="mono"          to-types="5.1+downmix"  mix="FL = FC                                           | FR = FC                                         | DL = FC | DR = FC" />
+		<mix-config from-type="mono"          to-types="matrix"       mix="ML = FC                                           | MR = FC" />
+		<mix-config from-type="stereo"        to-types="mono"         mix="FC &lt; FL + FR" />
+		<mix-config from-type="stereo"        to-types="matrix"       mix="ML = FL                                           | MR = FR" />
+		<mix-config from-type="stereo"        to-types="5.1"          mix="FL = FL                                           | FR = FR" />
+		<mix-config from-type="stereo"        to-types="5.1+downmix"  mix="FL = FL                                           | FR = FR                                         | DL = FL | DR = FR" />
+		<mix-config from-type="5.1"           to-types="mono"         mix="FC &lt; FL + FR + 0.707*FC + 0.707*BL + 0.707*BR" />
+		<mix-config from-type="5.1"           to-types="stereo"       mix="FL &lt; FL + 0.707*FC + 0.707*BL                  | FR &lt; FR + 0.707*FC + 0.707*BR" />
+		<mix-config from-type="5.1"           to-types="5.1+downmix"  mix="FL = FL                                           | FR = FR                                         | FC = FC | BL = BL | BR = BR | LFE = LFE | DL &lt; FL + 0.707*FC + 0.707*BL | DR &lt; FR + 0.707*FC + 0.707*BR" />
+		<mix-config from-type="5.1"           to-types="matrix"       mix="ML = 0.3204*FL + 0.293*FC + -0.293*BL + -0.293*BR | MR = 0.3204*FR + 0.293*FC + 0.293*BL + 0.293*BR" />
+		<mix-config from-type="5.1+stereomix" to-types="mono"         mix="FC &lt; DL + DR" />
+		<mix-config from-type="5.1+stereomix" to-types="stereo"       mix="FL = DL                                           | FR = DR" />
+		<mix-config from-type="5.1+stereomix" to-types="5.1"          mix="FL = FL                                           | FR = FR                                         | FC = FC | BL = BL | BR = BR | LFE = LFE" />
+		<mix-config from-type="5.1+stereomix" to-types="matrix"       mix="ML = 0.3204*FL + 0.293*FC + -0.293*BL + -0.293*BR | MR = 0.3204*FR + 0.293*FC + 0.293*BL + 0.293*BR" />
+	</mix-configs>
+</audio>
 -->
