2.0. Fixed mix transition.

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

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 302d7af5e681f458c788391871cb0cf41abf5356..393c8a7140f6383df22c486dadb3951f72bc459d 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -145,37 +145,34 @@ private:
                        return;\r
 \r
                std::shared_ptr<device_buffer> local_key_buffer;\r
+               std::shared_ptr<device_buffer> local_mix_buffer;\r
                                \r
                if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
                {\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
-                                               \r
-                       draw_params draw_params;\r
-                       draw_params.pix_desc.pix_fmt    = pixel_format::bgra;\r
-                       draw_params.pix_desc.planes             = list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-                       draw_params.textures                    = list_of(layer_draw_buffer);\r
-                       draw_params.transform                   = frame_transform();\r
-                       draw_params.blend_mode                  = layer.blend_mode;\r
-                       draw_params.background                  = draw_buffer;\r
-\r
-                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+                               draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);    \r
+               \r
+                       draw_device_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);                                                 \r
+                       draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.blend_mode);\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, layer_key_buffer, local_key_buffer, local_mix_buffer);          \r
+                                       \r
+                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
                }                                       \r
-               \r
+\r
                std::swap(local_key_buffer, layer_key_buffer);\r
        }\r
 \r
        void draw_item(item&&                                                   item, \r
                                   safe_ptr<device_buffer>&                     draw_buffer, \r
+                                  std::shared_ptr<device_buffer>&      layer_key_buffer, \r
                                   std::shared_ptr<device_buffer>&      local_key_buffer, \r
-                                  std::shared_ptr<device_buffer>&      layer_key_buffer)\r
+                                  std::shared_ptr<device_buffer>&      local_mix_buffer)\r
        {                       \r
                draw_params draw_params;\r
                draw_params.pix_desc                            = std::move(item.pix_desc);\r
@@ -193,8 +190,22 @@ private:
 \r
                        kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }\r
+               else if(item.transform.is_mix)\r
+               {\r
+                       local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_device_buffer(4);\r
+\r
+                       draw_params.background                  = local_mix_buffer;\r
+                       draw_params.local_key                   = std::move(local_key_buffer);\r
+                       draw_params.layer_key                   = layer_key_buffer;\r
+\r
+                       draw_params.blend_mode                  = blend_mode::mix;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+               }\r
                else\r
                {\r
+                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
+                       \r
                        draw_params.background                  = draw_buffer;\r
                        draw_params.local_key                   = std::move(local_key_buffer);\r
                        draw_params.layer_key                   = layer_key_buffer;\r
@@ -202,6 +213,22 @@ private:
                        kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }       \r
        }\r
+\r
+       void draw_device_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& source_buffer, blend_mode::type blend_mode = blend_mode::normal)\r
+       {\r
+               if(!source_buffer)\r
+                       return;\r
+\r
+               draw_params draw_params;\r
+               draw_params.pix_desc.pix_fmt    = pixel_format::bgra;\r
+               draw_params.pix_desc.planes             = list_of(pixel_format_desc::plane(source_buffer->width(), source_buffer->height(), 4));\r
+               draw_params.textures                    = list_of(source_buffer);\r
+               draw_params.transform                   = frame_transform();\r
+               draw_params.blend_mode                  = blend_mode;\r
+               draw_params.background                  = draw_buffer;\r
+\r
+               kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+       }\r
                        \r
        safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r