2.0.0.2: Some flash optimizations.

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

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 09217a82376d0f5f23f2ae0ccfa9211a636bd480..20c8ea051af57ace0c2f3a6299165def20be2c18 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -47,6 +47,7 @@ const video_format_desc format_descs[video_format::count] =
        DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,             25,                     TEXT("1080p2500"),      video_format::x1080p2500),\r
        DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,             30/1.001,       TEXT("1080p2997"),      video_format::x1080p2997),\r
        DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,             30,                     TEXT("1080p3000"),      video_format::x1080p3000),\r
+       DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,             50,                     TEXT("1080p5000"),      video_format::x1080p5000),\r
        DEFINE_VIDEOFORMATDESC(0,               0, video_mode::invalid,                 -1,                     TEXT("invalid"),        video_format::invalid   )\r
 };\r
 \r

diff --git a/core/video_format.h b/core/video_format.h
index 54409a00f7fe2faf0fcbd5cd5dd28a8c576f0371..32877919b8017a92059b487a5ac7da9b512d9613 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -45,6 +45,7 @@ struct video_format
                x1080p2500,\r
                x1080p2997,\r
                x1080p3000,\r
+               x1080p5000,\r
                invalid,\r
                count\r
        };\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index b54b942994e7d8b922e50ff7f8d23c1e8b1aa3c2..c17c0345dd3d66b176b75c70c180223e80e3e37e 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -153,24 +153,26 @@ public:
                        return core::basic_frame::empty();\r
 \r
                double frame_time = 1.0/ax_->GetFPS();\r
-\r
+               \r
+               perf_timer_.restart();\r
+               ax_->Tick();\r
                if(has_underflow)\r
+               {\r
                        graph_->add_tag("underflow");\r
+               }\r
                else\r
-                       timer_.tick(frame_time);\r
-\r
-               perf_timer_.restart();\r
-               ax_->Tick();\r
-\r
-               if(ax_->InvalidRect())\r
-               {                       \r
-                       fast_memclr(bmp_data_,  format_desc_.size);\r
-                       ax_->DrawControl(static_cast<HDC>(hdc_.get()));\r
+               {\r
+                       timer_.tick(frame_time);                \r
+                       if(ax_->InvalidRect())\r
+                       {                       \r
+                               fast_memclr(bmp_data_,  format_desc_.size);\r
+                               ax_->DrawControl(static_cast<HDC>(hdc_.get()));\r
                \r
-                       auto frame = frame_factory_->create_frame(this);\r
-                       fast_memcpy(frame->image_data().begin(), bmp_data_, format_desc_.size);\r
-                       head_ = frame;\r
-               }               \r
+                               auto frame = frame_factory_->create_frame(this);\r
+                               fast_memcpy(frame->image_data().begin(), bmp_data_, format_desc_.size);\r
+                               head_ = frame;\r
+                       }               \r
+               }\r
                \r
                graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()/frame_time));\r
                return head_;\r

diff --git a/shell/caspar.config b/shell/caspar.config
index 9cccf95d3f09b2b11e9860a906867255cb2bea42..01e401f4b876403f8d11210907433cbdc9af590a 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -12,13 +12,13 @@
   </diagnostics>\r
   <channels>\r
     <channel>\r
-      <videomode>PAL</videomode>\r
+      <videomode>1080p5000</videomode>\r
       <consumers>\r
-        <decklink>\r
+        <!--<decklink>\r
           <device>1</device>\r
           <embedded-audio>false</embedded-audio>\r
           <internal-key>false</internal-key>\r
-        </decklink>\r
+        </decklink>-->\r
         <ogl>\r
           <device>0</device>\r
           <stretch>uniform</stretch>\r