#55

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index a84f3dd82ac9094ecde0947c746d0df2364fe76b..471bd0bf0a14de3304f13e5afc2ac63a0cbd2300 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -10,12 +10,11 @@
   <channels>\r
     <channel>\r
         <video-mode>PAL</video-mode>\r
-        <channel-layout>stereo</channel-layout>\r
         <consumers>\r
           <screen>\r
             <device>1</device>\r
-            <windowed>true</windowed>\r
           </screen>\r
+          <system-audio />\r
         </consumers>\r
     </channel>\r
   </channels>\r
@@ -25,17 +24,16 @@
         <protocol>AMCP</protocol>\r
     </tcp>\r
   </controllers>\r
-  <osc>\r
-    <default-port>6250</default-port>\r
-    <predefined-clients>\r
-    </predefined-clients>\r
-  </osc>\r
 </configuration>\r
 \r
 <!--\r
 <log-level>       trace [trace|debug|info|warning|error]</log-level>\r
 <channel-grid>    false [true|false]</channel-grid>\r
-<blend-modes>     false [true|false]</blend-modes>\r
+<mixer>\r
+    <blend-modes>   false [true|false]</blend-modes>\r
+    <straight-alpha>false [true|false]</straight-alpha>\r
+    <chroma-key>    false [true|false]</chroma-key>\r
+</mixer>\r
 <auto-deinterlace>true  [true|false]</auto-deinterlace>\r
 <auto-transcode>  true  [true|false]</auto-transcode>\r
 <pipeline-tokens> 2     [1..]       </pipeline-tokens>\r
@@ -58,22 +56,25 @@
     <scan-interval-millis>5000</scan-interval-millis>\r
     <generate-delay-millis>2000</generate-delay-millis>\r
     <video-mode>720p2500</video-mode>\r
+    <mipmap>true</mipmap>\r
 </thumbnails>\r
 <channels>\r
     <channel>\r
-        <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|2k2398|2k2400|2k2500|4k2398|4k2400|4k2500|4k2997|4k3000] </video-mode>\r
+        <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|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000] </video-mode>\r
         <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>\r
         <straight-alpha-output>false [true|false]</straight-alpha-output>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r
+                <key-device>device + 1 [1..]</key-device>\r
                 <embedded-audio>false [true|false]</embedded-audio>\r
                 <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>\r
                 <latency>normal [normal|low|default]</latency>\r
-                <keyer>external [external|internal|default]</keyer>\r
+                <keyer>external [external|external_separate_device|internal|default]</keyer>\r
                 <key-only>false [true|false]</key-only>\r
                 <buffer-depth>3 [1..]</buffer-depth>\r
-            </decklink> \r
+                <custom-allocator>true [true|false]</custom-allocator>\r
+            </decklink>\r
             <bluefish>\r
                 <device>[1..]</device>\r
                 <embedded-audio>false [true|false]</embedded-audio>\r
@@ -81,10 +82,6 @@
                 <key-only>false [true|false]</key-only>\r
             </bluefish>\r
             <system-audio></system-audio>\r
-            <synchronizing>\r
-                ... consumer1\r
-                ... consumer2\r
-            </synchronizing>\r
             <screen>\r
                 <device>[0..]</device>\r
                 <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>\r
@@ -93,12 +90,22 @@
                 <key-only>false [true|false]</key-only>\r
                 <auto-deinterlace>true [true|false]</auto-deinterlace>\r
                 <vsync>false [true|false]</vsync>\r
+                <name>[Screen Consumer]</name>\r
+                <borderless>false [true|false]</borderless>\r
             </screen>\r
+            <newtek-ivga>\r
+              <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>\r
+              <provide-sync>true [true|false]</provide-sync>\r
+            </newtek-ivga>\r
             <file>\r
                 <path></path>\r
                 <vcodec>libx264 [libx264|qtrle]</vcodec>\r
                 <separate-key>false [true|false]</separate-key>\r
             </file>\r
+            <stream>\r
+                <path></path>\r
+                <args></args>\r
+            </stream>\r
         </consumers>\r
     </channel>\r
 </channels>\r