2.0.0.2: Fixed data race in video_channel_context.

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

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 214451a7eb26b50ecd7d978754918cd4e27899fb..39f69e594359d05f441b181722798ac936cd4175 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -27,7 +27,7 @@
 #include "../gpu/device_buffer.h"\r
 #include "../write_frame.h"\r
 \r
-#include "../../channel_context.h"\r
+#include "../../video_channel_context.h"\r
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/exception/exceptions.h>\r
@@ -56,7 +56,7 @@ struct image_mixer::implementation : boost::noncopyable
                core::image_transform                            transform;\r
        };\r
 \r
-       channel_context&                                                channel_;\r
+       video_channel_context&                                          channel_;\r
        \r
        std::stack<core::image_transform>               transform_stack_;\r
        std::queue<std::queue<render_item>>             render_queue_;\r
@@ -74,13 +74,13 @@ struct image_mixer::implementation : boost::noncopyable
        bool layer_key_;\r
        \r
 public:\r
-       implementation(channel_context& channel) \r
-               : channel_(channel)\r
-               , read_buffer_(channel.ogl.create_host_buffer(channel.format_desc.size, host_buffer::read_only))\r
-               , draw_buffer_(channel.ogl.create_device_buffer(channel.format_desc.width, channel_.format_desc.height, 4))\r
-               , write_buffer_ (channel.ogl.create_device_buffer(channel.format_desc.width, channel_.format_desc.height, 4))\r
-               , local_key_buffer_(channel.ogl.create_device_buffer(channel.format_desc.width, channel_.format_desc.height, 1))\r
-               , layer_key_buffer_(channel.ogl.create_device_buffer(channel.format_desc.width, channel_.format_desc.height, 1))\r
+       implementation(video_channel_context& video_channel) \r
+               : channel_(video_channel)\r
+               , read_buffer_(video_channel.ogl().create_host_buffer(video_channel.get_format_desc().size, host_buffer::read_only))\r
+               , draw_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4))\r
+               , write_buffer_ (video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4))\r
+               , local_key_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1))\r
+               , layer_key_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1))\r
                , local_key_(false)\r
                , layer_key_(false)\r
        {\r
@@ -114,18 +114,18 @@ public:
 \r
        void reinitialize_buffers()\r
        {\r
-               read_buffer_      = channel_.ogl.create_host_buffer(channel_.format_desc.size, host_buffer::read_only);\r
-               draw_buffer_      = channel_.ogl.create_device_buffer(channel_.format_desc.width, channel_.format_desc.height, 4);\r
-               write_buffer_     = channel_.ogl.create_device_buffer(channel_.format_desc.width, channel_.format_desc.height, 4);\r
-               local_key_buffer_ = channel_.ogl.create_device_buffer(channel_.format_desc.width, channel_.format_desc.height, 1);\r
-               layer_key_buffer_ = channel_.ogl.create_device_buffer(channel_.format_desc.width, channel_.format_desc.height, 1);\r
-               channel_.ogl.gc();\r
+               read_buffer_      = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
+               draw_buffer_      = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
+               write_buffer_     = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
+               local_key_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+               layer_key_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+               channel_.ogl().gc();\r
        }\r
 \r
        safe_ptr<host_buffer> render()\r
        {               \r
                auto read_buffer = read_buffer_;\r
-               auto result = channel_.ogl.begin_invoke([=]()  -> safe_ptr<host_buffer>\r
+               auto result = channel_.ogl().begin_invoke([=]()  -> safe_ptr<host_buffer>\r
                {\r
                        read_buffer->map();\r
                        return read_buffer;\r
@@ -133,9 +133,9 @@ public:
 \r
                auto render_queue = std::move(render_queue_);\r
 \r
-               channel_.ogl.begin_invoke([=]() mutable\r
+               channel_.ogl().begin_invoke([=]() mutable\r
                {\r
-                       if(draw_buffer_->width() != channel_.format_desc.width || draw_buffer_->height() != channel_.format_desc.height)\r
+                       if(draw_buffer_->width() != channel_.get_format_desc().width || draw_buffer_->height() != channel_.get_format_desc().height)\r
                                reinitialize_buffers();\r
 \r
                        local_key_ = false;\r
@@ -159,7 +159,7 @@ public:
                                {\r
                                        draw(layer.front());\r
                                        layer.pop();\r
-                                       channel_.ogl.yield(); // Allow quick buffer allocation to execute.\r
+                                       channel_.ogl().yield(); // Allow quick buffer allocation to execute.\r
                                }\r
 \r
                                layer_key_ = local_key_; // If there was only key in last layer then use it as key for the entire next layer.\r
@@ -171,7 +171,7 @@ public:
                        std::swap(draw_buffer_, write_buffer_);\r
 \r
                        // Start transfer from device to host.  \r
-                       read_buffer_ = channel_.ogl.create_host_buffer(channel_.format_desc.size, host_buffer::read_only);                                      \r
+                       read_buffer_ = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);                                      \r
                        write_buffer_->write(*read_buffer_);\r
                });\r
 \r
@@ -217,16 +217,16 @@ public:
 \r
                // Draw\r
 \r
-               kernel_.draw(channel_.format_desc.width, channel_.format_desc.height, item.desc, item.transform, local_key, layer_key); \r
+               kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item.desc, item.transform, local_key, layer_key);     \r
        }\r
                        \r
        safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& desc)\r
        {\r
-               return make_safe<write_frame>(channel_.ogl, reinterpret_cast<int>(tag), desc);\r
+               return make_safe<write_frame>(channel_.ogl(), reinterpret_cast<int>(tag), desc);\r
        }\r
 };\r
 \r
-image_mixer::image_mixer(channel_context& channel) : impl_(new implementation(channel)){}\r
+image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r
 void image_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}\r
 void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
 void image_mixer::end(){impl_->end();}\r