git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 49a79802b92ab0e89823cc759599276381e73c1d..5c2269ab0909b299dec687401145e7fc21dfc6fd 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,56 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>L:\casparcg\_media\</media-path>\r
-    <log-path>L:\casparcg\_log\</log-path>\r
-    <data-path>L:\casparcg\_data\</data-path>\r
-    <template-path>L:\casparcg\_templates\</template-path>\r
+    <media-path>D:\casparcg\_media\</media-path>\r
+    <log-path>D:\casparcg\_log\</log-path>\r
+    <data-path>D:\casparcg\_data\</data-path>\r
+    <template-path>D:\casparcg\_templates\</template-path>\r
   </paths>\r
-  <diagnostics>\r
-    <graphs>true</graphs>\r
-  </diagnostics>\r
-  <mixers>\r
-    <blend-modes>false</blend-modes>\r
-  </mixers>\r
-  <producers>\r
-    <auto-transcode>true</auto-transcode>\r
-    <template-hosts>\r
-      <template-host>\r
-        <video-mode>PAL</video-mode>\r
-        <filename>cg.fth.18.pal</filename>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>1080i5994</video-mode>\r
-        <filename>cg.fth.18.6000</filename>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>1080p5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>1080i5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
-      </template-host>\r
-    </template-hosts>\r
-    </producers>\r
-    <channels>\r
-      <channel>\r
-        <video-mode>1080p5000</video-mode>\r
-        <consumers>\r
-          <decklink>\r
-            <device>1</device>\r
-            <embedded-audio>true</embedded-audio>\r
-          </decklink>\r
-          <screen>\r
-            <device>1</device>\r
-          </screen>\r
-        </consumers>\r
-      </channel>\r
-    </channels>\r
+  <accelerator>auto</accelerator>\r
+  <log-level>trace</log-level>\r
+  <channels>\r
+    <channel>\r
+      <video-mode>720p5000</video-mode>\r
+      <consumers>\r
+        <screen>\r
+          <auto-deinterlace>false</auto-deinterlace>\r
+        </screen>\r
+      </consumers>\r
+    </channel>\r
+  </channels>\r
   <controllers>\r
     <tcp>\r
       <port>5250</port>\r
@@ -60,34 +27,22 @@
 </configuration>\r
 \r
 <!--\r
-<auto-mode-convert>true [true|false]]</auto-mode-convert>\r
-<consumers>\r
-  <buffer-depth>5 [1..]</buffer-depth> \r
-  NOTE:\r
-    recommended: 5-6\r
-    decklink_consumer: Min 3 depth\r
-    decklink_consumer + embedded-audio: Min 4 depth\r
-    oal_consumer: Min 3 depth\r
-    bluefish_consumer: Min 1-2 depth\r
-    ogl_consumer: Min 1-2 depth\r
-</consumers>\r
-<mixers>\r
-   <blend-modes>false [true/false]</blend-modes>\r
-</mixers>\r
-<producers>\r
-  <buffer-depth>1 [0..]</buffer-depth>\r
-  <auto-transcode>true</auto-transcode>\r
-  <template-hosts>\r
-    <template-host>\r
-      <video-mode/>\r
-      <filename/>\r
-      <width/>\r
-      <height/>\r
-    </template-host>\r
-  </template-hosts>\r
-</producers>\r
-<channel>\r
-  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
+<log-level>trace [trace|debug|info|warning|error]</log-level>\r
+<blend-modes>false [true|false]</blend-modes>\r
+<auto-transcode>true [true|false]</auto-transcode>\r
+<pipeline-tokens>2 [1..]</pipeline-tokens>\r
+<accelerator>auto [cpu|gpu|auto]</accelerator>\r
+<template-hosts>\r
+  <template-host>\r
+    <video-mode/>\r
+    <filename/>\r
+    <width/>\r
+    <height/>\r
+  </template-host>\r
+</template-hosts>\r
+<channels>\r
+  <channel>\r
+    <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
     <consumers>\r
       <decklink>\r
         <device>[1..]</device>\r
@@ -95,6 +50,7 @@
         <low-latency>false [true|false]</low-latency>\r
         <internal-key>false [true|false]</internal-key>\r
         <key-only>false [true|false]</key-only>\r
+        <buffer-depth>3 [1..]</buffer-depth>\r
       </decklink>\r
       <bluefish>\r
         <device>[1..]</device>\r
@@ -104,12 +60,15 @@
       <audio></audio>\r
       <screen>\r
         <device>[0..]</device>\r
+        <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>\r
         <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
         <windowed>false [true|false]</windowed>\r
         <key-only>false [true|false]</key-only>\r
+        <auto-deinterlace>true [true|false]</auto-deinterlace>\r
       </screen>\r
     </consumers>\r
-</channel>  \r
--->  \r
-  \r
+  </channel>\r
+</channels>  \r
+-->\r
+\r
 \r