2.0. image_mixer: Refactored, draw fields in separate draw calls. This way we don...

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

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 941e28d6c58fbbe18dd1c16af9671678bc07b915..ec167ce39cbc1bf4b68666df026eb9e25496b090 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -39,6 +39,7 @@
 #include <gl/glew.h>\r
 \r
 #include <boost/foreach.hpp>\r
+#include <boost/range/algorithm_ext/erase.hpp>\r
 \r
 #include <algorithm>\r
 #include <deque>\r
@@ -80,13 +81,35 @@ public:
 private:\r
        safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)\r
        {\r
-               std::shared_ptr<device_buffer> layer_key_buffer;\r
-\r
                auto draw_buffer = create_device_buffer(4);\r
-                               \r
-               BOOST_FOREACH(auto& layer, layers)\r
-                       draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
-               \r
+\r
+               if(channel_.get_format_desc().field_mode != field_mode::progressive)\r
+               {\r
+                       auto upper = layers;\r
+                       auto lower = std::move(layers);\r
+\r
+                       BOOST_FOREACH(auto& layer, upper)\r
+                       {\r
+                               boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+                               BOOST_FOREACH(auto& item, layer.items)\r
+                                       item.transform.field_mode = field_mode::upper;\r
+                       }\r
+\r
+                       BOOST_FOREACH(auto& layer, lower)\r
+                       {\r
+                               boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+                               BOOST_FOREACH(auto& item, layer.items)\r
+                                       item.transform.field_mode = field_mode::lower;\r
+                       }\r
+\r
+                       draw(std::move(upper), *draw_buffer);\r
+                       draw(std::move(lower), *draw_buffer);\r
+               }\r
+               else\r
+               {\r
+                       draw(std::move(layers), *draw_buffer);\r
+               }\r
+\r
                auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
                channel_.ogl().attach(*draw_buffer);\r
                host_buffer->begin_read(draw_buffer->width(), draw_buffer->height(), format(draw_buffer->stride()));\r
@@ -98,16 +121,27 @@ private:
                return host_buffer;\r
        }\r
 \r
-       void draw_layer(layer&& layer, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+       void draw(std::vector<layer>&&  layers, \r
+                         device_buffer&                draw_buffer)\r
+       {\r
+               std::shared_ptr<device_buffer> layer_key_buffer;\r
+\r
+               BOOST_FOREACH(auto& layer, layers)\r
+                       draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
+       }\r
+\r
+       void draw_layer(layer&&                                                 layer, \r
+                                       device_buffer&                                  draw_buffer,\r
+                                       std::shared_ptr<device_buffer>& layer_key_buffer)\r
        {                               \r
                if(layer.items.empty())\r
                        return;\r
 \r
-               std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer = std::make_pair(0, nullptr); // int is fields flag\r
+               std::shared_ptr<device_buffer> local_key_buffer;\r
                                \r
-               if(layer.blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
+               if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
                {\r
-                       auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
+                       auto layer_draw_buffer = create_device_buffer(4);\r
 \r
                        BOOST_FOREACH(auto& item, layer.items)\r
                                draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer);             \r
@@ -119,63 +153,34 @@ private:
                        item.transform                  = frame_transform();\r
                        item.blend_mode                 = layer.blend_mode;\r
 \r
-                       kernel_.draw(channel_.ogl(), std::move(item), *draw_buffer, nullptr, nullptr);\r
+                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, nullptr, nullptr);\r
                }\r
                else // fast path\r
                {\r
                        BOOST_FOREACH(auto& item, layer.items)          \r
-                               draw_item(std::move(item), *draw_buffer, local_key_buffer, layer_key_buffer);           \r
+                               draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);            \r
                }                                       \r
-\r
-               CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::field_mode::progressive);\r
-\r
-               std::swap(local_key_buffer.second, layer_key_buffer);\r
+               \r
+               std::swap(local_key_buffer, layer_key_buffer);\r
        }\r
 \r
-       void draw_item(render_item&&                                                                    item, \r
-                                  device_buffer&                                                                       draw_buffer, \r
-                                  std::pair<int, std::shared_ptr<device_buffer>>&      local_key_buffer, \r
-                                  std::shared_ptr<device_buffer>&                                      layer_key_buffer)\r
-       {                                                                                       \r
+       void draw_item(render_item&&                                    item, \r
+                                  device_buffer&                                       draw_buffer, \r
+                                  std::shared_ptr<device_buffer>&      local_key_buffer, \r
+                                  std::shared_ptr<device_buffer>&      layer_key_buffer)\r
+       {                                       \r
                if(item.transform.is_key)\r
                {\r
-                       if(!local_key_buffer.second)\r
-                       {\r
-                               local_key_buffer.first = 0;\r
-                               local_key_buffer.second = create_device_buffer(1);\r
-                       }\r
-                       \r
-                       local_key_buffer.first |= item.transform.field_mode; // Add field to flag.\r
-                       kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer.second, nullptr, nullptr);\r
+                       local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);\r
+                       kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer, nullptr, nullptr);\r
                }\r
                else\r
                {\r
-                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);\r
-                       local_key_buffer.first ^= item.transform.field_mode; // Remove field from flag.\r
-                       \r
-                       if(local_key_buffer.first == 0) // If all fields from key has been used, reset it\r
-                       {\r
-                               local_key_buffer.first = 0;\r
-                               local_key_buffer.second.reset();\r
-                       }\r
-               }\r
+                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);\r
+                       local_key_buffer = nullptr;\r
+               }       \r
        }\r
-\r
-       bool has_overlapping_items(const layer& layer)\r
-       {               \r
-               auto upper_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
-               {\r
-                       return !item.transform.is_key && (item.transform.field_mode & field_mode::upper);\r
-               });\r
-\r
-               auto lower_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
-               {\r
-                       return  !item.transform.is_key && (item.transform.field_mode & field_mode::lower);\r
-               });\r
-\r
-               return upper_count > 1 || lower_count > 1;\r
-       }                       \r
-               \r
+                       \r
        safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r
                auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);\r
@@ -183,7 +188,6 @@ private:
                return buffer;\r
        }\r
 };\r
-\r
                \r
 struct image_mixer::implementation : boost::noncopyable\r
 {      \r
@@ -210,10 +214,10 @@ public:
        }\r
                \r
        void visit(core::write_frame& frame)\r
-       {       \r
-               if(transform_stack_.back().field_mode == field_mode::empty)\r
+       {                       \r
+               if(frame.get_frame_transform().field_mode == field_mode::empty)\r
                        return;\r
-               \r
+\r
                core::render_item item;\r
                item.pix_desc   = frame.get_pixel_format_desc();\r
                item.textures   = frame.get_textures();\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index f539fba1d25657ba5b925ecad74f209ac7bba133..4fbf8d8a5a451cde9df712d57f920aaebbd25729 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -126,9 +126,7 @@ public:
                                {                               \r
                                        auto frame2 = make_safe<core::basic_frame>(frame.second);\r
                                        frame2->get_frame_transform() = transforms_[frame.first].fetch_and_tick(1);\r
-                                               \r
-                                       if(frame1->get_frame_transform() != frame2->get_frame_transform())\r
-                                               frame1 = core::basic_frame::interlace(frame1, frame2, channel_.get_format_desc().field_mode);\r
+                                       frame1 = core::basic_frame::interlace(frame1, frame2, channel_.get_format_desc().field_mode);\r
                                }\r
                                                                        \r
                                frame1->accept(audio_mixer_);                                   \r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index a17fa10ba673003985e0392b23a8eafe211abfbf..cae3c0bcf2c56c5578e7a00492a562acab5d4d87 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -55,10 +55,10 @@ public:
                auto empty_producer = frame_producer::empty();\r
                destroy_context_.begin_invoke([=]\r
                {                       \r
-                       if(!mov_producer.value.unique())\r
-                               CASPAR_LOG(debug) << mov_producer.value->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
-                       else\r
-                               CASPAR_LOG(debug) << mov_producer.value->print() << L" Destroying on safe asynchronous destruction thread.";\r
+                       //if(!mov_producer.value.unique())\r
+                       //      CASPAR_LOG(debug) << mov_producer.value->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
+                       //else\r
+                       //      CASPAR_LOG(debug) << mov_producer.value->print() << L" Destroying on safe asynchronous destruction thread.";\r
        \r
                        mov_producer.value = empty_producer;\r
                });\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index ed235ac3cfb90aca97dee76b4477219c2f37a4b0..36a38ca7a9272755b5d4e3f581ee49a9edaf9ee4 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\_media\</media-path>\r
+    <media-path>L:\casparcg\_media\</media-path>\r
     <log-path>L:\casparcg\_log\</log-path>\r
     <data-path>L:\casparcg\_data\</data-path>\r
     <template-path>L:\casparcg\_templates\</template-path>\r
@@ -13,45 +13,35 @@
     <buffer-depth>3</buffer-depth>\r
   </consumers>\r
   <mixers>\r
-    <blend-modes>true</blend-modes>\r
+    <blend-modes>false</blend-modes>\r
   </mixers>\r
   <producers>\r
     <buffer-depth>1</buffer-depth>\r
     <auto-transcode>true</auto-transcode>\r
     <template-hosts>\r
       <template-host>\r
-        <video-mode>1080p5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>720p5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
+        <video-mode>1080i5994</video-mode>\r
+        <filename>cg.fth.18.6000</filename>\r
       </template-host>\r
       <template-host>\r
-        <video-mode>1080i5000</video-mode>\r
+        <video-mode>1080p5000</video-mode>\r
         <filename>cg.fth.18</filename>\r
         <width>1280</width>\r
         <height>720</height>\r
       </template-host>\r
-      <template-host>\r
-        <video-mode>PAL</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>NTSC</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-      </template-host>\r
     </template-hosts>\r
-  </producers>\r
-  <channels>\r
+    </producers>\r
+    <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>1080i5000</video-mode>\r
       <consumers>\r
+        <decklink>\r
+          <device>1</device>\r
+          <embedded-audio>true</embedded-audio>\r
+          <external-key>true</external-key>\r
+        </decklink>\r
         <screen>\r
+          <device>1</device>\r
         </screen>\r
       </consumers>\r
     </channel>\r