2.1.0: Send ffmpeg_consumer frame-number through OSC.

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 5a136818e493b838bc991017670d3d9bfb350e1d..efbe19a308709d0e399d0df16f0f6b31bd1e89a7 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\media\</media-path>\r
-    <log-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\log\</log-path>\r
-    <data-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\data\</data-path>\r
-    <template-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\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>true</blend-modes>\r
-  </mixers>\r
-  <producers>\r
-    <auto-transcode>true</auto-transcode>\r
-  </producers>\r
+  <log-level>trace</log-level>\r
+  <accelerator>auto</accelerator>\r
+  <flash>\r
+    <buffer-depth>4</buffer-depth>\r
+  </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>720p5000</video-mode>\r
+      <video-mode>PAL</video-mode>\r
       <consumers>\r
-        <screen></screen>\r
+        <screen>\r
+          <device>1</device>\r
+        </screen>\r
       </consumers>\r
     </channel>\r
   </channels>\r
@@ -32,56 +30,52 @@
 </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
+<log-level>           trace [trace|debug|info|warning|error]</log-level>\r
+<force-deinterlacing> true  [true|false]</force-deinterlacing>\r
+<channel-grid>        false [true|false]</channel-grid>\r
+<blend-modes>         true  [true|false]</blend-modes>\r
+<auto-deinterlace>    true  [true|false]</auto-deinterlace>\r
+<auto-transcode>      true  [true|false]</auto-transcode>\r
+<accelerator>auto [cpu|gpu|auto]</accelerator>\r
+<template-hosts>\r
     <template-host>\r
-      <video-mode/>\r
-      <filename/>\r
-      <width/>\r
-      <height/>\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
-    <consumers>\r
-      <decklink>\r
-        <device>[1..]</device>\r
-        <embedded-audio>false [true|false]</embedded-audio>\r
-        <low-latency>false [true|false]</low-latency>\r
-        <internal-key>false [true|false]</internal-key>\r
-        <key-only>false [true|false]</key-only>\r
-      </decklink>\r
-      <bluefish>\r
-        <device>[1..]</device>\r
-        <embedded-audio>false [true|false]</embedded-audio>\r
-        <key-only>false [true|false]</key-only>\r
-      </bluefish>\r
-      <audio></audio>\r
-      <screen>\r
-        <device>[0..]</device>\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
-      </screen>\r
-    </consumers>\r
-</channel>  \r
+</template-hosts>\r
+<flash>\r
+    <buffer-depth>auto [auto|1..]</buffer-depth>\r
+</flash>\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
+                <embedded-audio>false [true|false]</embedded-audio>\r
+                <latency>normal [normal|low|default]</latency>\r
+                <keyer>external [external|internal|default]</keyer>\r
+                <key-only>false [true|false]</key-only>\r
+                <buffer-depth>3 [1..]</buffer-depth>\r
+            </decklink>\r
+            <bluefish>\r
+                <device>[1..]</device>\r
+                <embedded-audio>false [true|false]</embedded-audio>\r
+                <key-only>false [true|false]</key-only>\r
+            </bluefish>\r
+            <system-audio></system-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
+                <vsync>fasle [true|false]</vsync>\r
+            </screen>\r
+        </consumers>\r
+    </channel>\r
+</channels>\r
 -->\r
-\r
-\r