flash_producer: Buffer-depth is configurable.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2085 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 5e92b710a6f69a70519c7f72e125e93ef0e82235..b1d516070f8018bbed2126be9d901acbfbb5b662 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -318,7 +318,8 @@ public:
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
                \r
-               frame_buffer_.set_capacity(frame_factory_->get_video_format_desc().fps > 30.0 ? 2 : 1);\r
+               auto flash_buffer = env::properties().get(L"configuration.flash.buffer-depth", frame_factory_->get_video_format_desc().fps > 30.0 ? 2 : 1);\r
+               frame_buffer_.set_capacity(flash_buffer);\r
 \r
                executor_.begin_invoke([]\r
                {\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index f90e6480f9c5c5c0d67b0de1b60aff5919dee112..189b5aae9c4cea6bf1307a37363ad8a36b3237e7 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
     <paths>\r
-        <media-path>media\</media-path>\r
-        <log-path>log\</log-path>\r
-        <data-path>data\</data-path>\r
-        <template-path>templates\</template-path>\r
+      <media-path>media\</media-path>\r
+      <log-path>log\</log-path>\r
+      <data-path>data\</data-path>\r
+      <template-path>templates\</template-path>\r
     </paths>\r
     <channels>\r
         <channel>\r
@@ -38,6 +38,9 @@
         <height/>\r
     </template-host>\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