2.0.0.2: auto-mode is optional.

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

diff --git a/core/producer/frame_muxer.cpp b/core/producer/frame_muxer.cpp
index 1948e2a4e7db33f6308bf0004ccec4064068252f..f2d1061a74dc62e54b228c2560545f8421ea8840 100644 (file)
--- a/core/producer/frame_muxer.cpp
+++ b/core/producer/frame_muxer.cpp
@@ -7,6 +7,8 @@
 #include "frame/pixel_format.h"\r
 #include "../mixer/write_frame.h"\r
 \r
+#include <common/env.h>\r
+\r
 namespace caspar { namespace core {\r
        \r
 struct display_mode\r
@@ -94,12 +96,14 @@ struct frame_muxer::implementation
        const double                                      in_fps_;\r
        const double                                      out_fps_;\r
        const video_mode::type                    out_mode_;\r
+       bool                                                      auto_mode_;\r
 \r
        implementation(double in_fps, const core::video_mode::type out_mode, double out_fps)\r
                : display_mode_(display_mode::invalid)\r
                , in_fps_(in_fps)\r
                , out_fps_(out_fps)\r
                , out_mode_(out_mode)\r
+               , auto_mode_(env::properties().get("configuration.auto-mode", false))\r
        {\r
        }\r
 \r
@@ -140,7 +144,7 @@ struct frame_muxer::implementation
                        return;\r
 \r
                if(display_mode_ == display_mode::invalid)\r
-                       display_mode_ = get_display_mode(video_frames_.front()->get_type(), in_fps_, out_mode_, out_fps_);\r
+                       display_mode_ = auto_mode_ ? get_display_mode(video_frames_.front()->get_type(), in_fps_, out_mode_, out_fps_) : display_mode::simple;\r
 \r
                switch(display_mode_)\r
                {\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 7ff31a7363f617afd474bc548964ac0f4f499a40..ea38dbdc4a43312802f669ed9ec795ee05a3197e 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -79,7 +79,6 @@ public:
                , video_decoder_(input_.context(), frame_factory, filter)\r
                , audio_decoder_(input_.context(), frame_factory->get_video_format_desc())\r
                , muxer_(video_decoder_.fps(), format_desc_.mode, format_desc_.fps)\r
-               //, adapt_(env::properties().get("configuration.ffmpeg.auto-mode", false))\r
        {\r
                graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 04252b8f1eafa5a5c1bcefc5df2dcb3a4d04a2fa..58252f97408b5797bbcdd66d7ae4fb1309388622 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -10,17 +10,16 @@
   <diagnostics>\r
     <graphs>true</graphs>\r
   </diagnostics>\r
-  <ffmpeg>\r
-    <auto-mode>false</auto-mode>\r
-  </ffmpeg>\r
+  <auto-mode>true</auto-mode>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>1080i5000</video-mode>\r
       <consumers>\r
         <decklink>\r
           <device>2</device>\r
           <embedded-audio>true</embedded-audio>\r
         </decklink>\r
+        <screen></screen>\r
       </consumers>\r
     </channel>\r
 </channels>\r