image_mixer: Fixed overlapping_items.

[casparcg] / core / mixer / image / image_mixer.cpp

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 5ed421e7edf71ea6fd854db3699193655adcca2a..eda73da2f3af2a2ed7eb612998ab1057a155a3ba 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,16 +20,14 @@
 #include "../../stdafx.h"\r
 \r
 #include "image_mixer.h"\r
-#include "image_kernel.h"\r
 \r
+#include "image_kernel.h"\r
+#include "../write_frame.h"\r
 #include "../gpu/ogl_device.h"\r
 #include "../gpu/host_buffer.h"\r
 #include "../gpu/device_buffer.h"\r
-#include "../write_frame.h"\r
-\r
 #include "../../video_channel_context.h"\r
 \r
-#include <common/concurrency/executor.h>\r
 #include <common/exception/exceptions.h>\r
 #include <common/gl/gl_check.h>\r
 \r
@@ -40,13 +38,9 @@
 #include <gl/glew.h>\r
 \r
 #include <boost/foreach.hpp>\r
-#include <boost/range.hpp>\r
-#include <boost/range/algorithm/find.hpp>\r
 \r
 #include <algorithm>\r
-#include <array>\r
 #include <deque>\r
-#include <unordered_map>\r
 \r
 using namespace boost::assign;\r
 \r
@@ -82,7 +76,7 @@ private:
                auto draw_buffer = create_device_buffer(4);\r
                                \r
                BOOST_FOREACH(auto& layer, layers)\r
-                       draw(std::move(layer), draw_buffer, layer_key_buffer);\r
+                       draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\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
@@ -95,37 +89,28 @@ private:
                return host_buffer;\r
        }\r
 \r
-       // TODO: We might have more overlaps for opacity transitions\r
-       // TODO: What about blending modes, are they ok? Maybe only overlap detection is required for opacity?\r
-       void draw(layer&& layer, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+       void draw_layer(layer&& layer, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
        {                               \r
                if(layer.empty())\r
                        return;\r
 \r
-               std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer; // int is fields flag\r
+               std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer = std::make_pair(0, nullptr); // int is fields flag\r
                                \r
                if(layer.front().blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
                {\r
-                       auto layer_draw_buffer = std::make_pair(0, create_device_buffer(4)); // int is fields flag\r
+                       auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
                        auto layer_blend_mode = layer.front().blend_mode;\r
 \r
                        BOOST_FOREACH(auto& item, layer)\r
                        {\r
-                               if(layer_draw_buffer.first & item.transform.field_mode)\r
-                                       item.blend_mode = blend_mode::normal; // Disable blending and just merge, it will be used when merging back into render stack.\r
-                               else\r
-                               {\r
-                                       item.blend_mode = blend_mode::replace; // Target field is empty, no blending, just copy\r
-                                       layer_draw_buffer.first |= item.transform.field_mode;\r
-                               }\r
-\r
-                               draw_item(std::move(item), *layer_draw_buffer.second, local_key_buffer, layer_key_buffer);              \r
+                               item.blend_mode = blend_mode::normal; // Disable blending and just merge.\r
+                               draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer);             \r
                        }\r
                        \r
                        render_item item;\r
                        item.pix_desc.pix_fmt   = pixel_format::bgra;\r
                        item.pix_desc.planes    = list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-                       item.textures                   = list_of(layer_draw_buffer.second);\r
+                       item.textures                   = list_of(layer_draw_buffer);\r
                        item.transform                  = frame_transform();\r
                        item.blend_mode                 = layer_blend_mode;\r
 \r
@@ -175,12 +160,12 @@ private:
        {               \r
                auto upper_count = boost::range::count_if(layer, [&](const render_item& item)\r
                {\r
-                       return item.transform.field_mode | field_mode::upper;\r
+                       return !item.transform.is_key && (item.transform.field_mode & field_mode::upper);\r
                });\r
 \r
                auto lower_count = boost::range::count_if(layer, [&](const render_item& item)\r
                {\r
-                       return item.transform.field_mode | field_mode::lower;\r
+                       return  !item.transform.is_key && (item.transform.field_mode & field_mode::lower);\r
                });\r
 \r
                return upper_count > 1 || lower_count > 1;\r