2.0.0.2:

 - flash_producer: Reduced buffer-size.

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

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 82e62b69b6727f037ad5654dab5020ea824f7750..7891c8f68937d27f77e63cad8fb670a424d813fc 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -154,15 +154,17 @@ public:
 \r
                double frame_time = 1.0/ax_->GetFPS();\r
                \r
-               perf_timer_.restart();\r
-               ax_->Tick();\r
                if(has_underflow)\r
                {\r
+                       ax_->Tick();\r
                        graph_->add_tag("underflow");\r
                }\r
                else\r
                {\r
-                       timer_.tick(frame_time);                \r
+                       timer_.tick(frame_time);                                \r
+                       perf_timer_.restart();\r
+\r
+                       ax_->Tick();\r
                        if(ax_->InvalidRect())\r
                        {                       \r
                                fast_memclr(bmp_data_,  format_desc_.size);\r
@@ -174,7 +176,7 @@ public:
                        }               \r
                }\r
                \r
-               graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()/frame_time));\r
+               graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()/frame_time)*0.5f);\r
                return head_;\r
        }\r
 \r
@@ -216,7 +218,7 @@ public:
                if(!boost::filesystem::exists(filename))\r
                        BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r
                 \r
-               frame_buffer_.set_capacity(5);\r
+               frame_buffer_.set_capacity(3);\r
                graph_ = diagnostics::create_graph([this]{return print();});\r
                graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f));\r
                \r
@@ -236,7 +238,6 @@ public:
        ~flash_producer()\r
        {\r
                executor_.clear();\r
-               CASPAR_ASSERT(executor_.is_running());\r
                frame_buffer_.clear();\r
                executor_.invoke([=]\r
                {\r