]> git.sesse.net Git - casparcg/blobdiff - core/mixer/image/image_mixer.cpp
2.0.0.2: Fixed data race in video_channel_context.
[casparcg] / core / mixer / image / image_mixer.cpp
index b5e30936fc0061e0681e6d42227aa5de3c2d5bcc..39f69e594359d05f441b181722798ac936cd4175 100644 (file)
@@ -27,6 +27,8 @@
 #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
@@ -44,23 +46,24 @@ namespace caspar { namespace core {
                \r
 struct image_mixer::implementation : boost::noncopyable\r
 {      \r
+       static const size_t LOCAL_KEY_INDEX = 3;\r
+       static const size_t LAYER_KEY_INDEX = 4;\r
+\r
        struct render_item\r
        {\r
-               core::pixel_format_desc desc;\r
+               pixel_format_desc                                        desc;\r
                std::vector<safe_ptr<device_buffer>> textures;\r
-               core::image_transform transform;\r
+               core::image_transform                            transform;\r
        };\r
 \r
-       const core::video_format_desc format_desc_;\r
+       video_channel_context&                                          channel_;\r
        \r
        std::stack<core::image_transform>               transform_stack_;\r
-       std::vector<std::vector<render_item>>   transferring_queue_;\r
-       std::vector<std::vector<render_item>>   render_queue_;\r
+       std::queue<std::queue<render_item>>             render_queue_;\r
        \r
        image_kernel kernel_;\r
                \r
        safe_ptr<host_buffer>   read_buffer_;\r
-       \r
        safe_ptr<device_buffer> draw_buffer_;\r
        safe_ptr<device_buffer> write_buffer_;\r
 \r
@@ -69,15 +72,15 @@ struct image_mixer::implementation : boost::noncopyable
 \r
        bool local_key_;\r
        bool layer_key_;\r
-\r
+       \r
 public:\r
-       implementation(const core::video_format_desc& format_desc\r
-               : format_desc_(format_desc)\r
-               , read_buffer_(ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only))\r
-               , draw_buffer_(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 4))\r
-               , write_buffer_ (ogl_device::create_device_buffer(format_desc.width, format_desc.height, 4))\r
-               , local_key_buffer_(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 1))\r
-               , layer_key_buffer_(ogl_device::create_device_buffer(format_desc.width, 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
@@ -90,29 +93,9 @@ public:
        }\r
                \r
        void visit(core::write_frame& frame)\r
-       {                                               \r
-               auto desc               = frame.get_pixel_format_desc();\r
-               auto buffers    = frame.get_plane_buffers();\r
-               auto transform  = transform_stack_.top()*frame.get_image_transform();\r
-\r
-               ogl_device::begin_invoke([=]\r
-               {\r
-                       render_item item;\r
-\r
-                       item.desc = desc;\r
-                       item.transform = transform;\r
-                       \r
-                       // Start transfer from host to device.\r
-\r
-                       for(size_t n = 0; n < buffers.size(); ++n)\r
-                       {\r
-                               auto texture = ogl_device::create_device_buffer(desc.planes[n].width, desc.planes[n].height, desc.planes[n].channels);\r
-                               texture->read(*buffers[n]);\r
-                               item.textures.push_back(texture);\r
-                       }       \r
-\r
-                       transferring_queue_.back().push_back(item);\r
-               });\r
+       {                       \r
+               render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.top()*frame.get_image_transform()};   \r
+               render_queue_.back().push(item);\r
        }\r
 \r
        void end()\r
@@ -122,26 +105,39 @@ public:
 \r
        void begin_layer()\r
        {\r
-               ogl_device::begin_invoke([=]\r
-               {\r
-                       transferring_queue_.push_back(std::vector<render_item>());\r
-               });\r
+               render_queue_.push(std::queue<render_item>());\r
        }\r
 \r
        void end_layer()\r
        {\r
        }\r
 \r
-       boost::unique_future<safe_ptr<const host_buffer>> render()\r
+       void reinitialize_buffers()\r
        {\r
-               auto result = ogl_device::begin_invoke([=]() -> safe_ptr<const host_buffer>\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
                {\r
-                       read_buffer_->map(); // Might block.\r
-                       return read_buffer_;\r
+                       read_buffer->map();\r
+                       return read_buffer;\r
                });\r
-                       \r
-               ogl_device::begin_invoke([=]\r
+\r
+               auto render_queue = std::move(render_queue_);\r
+\r
+               channel_.ogl().begin_invoke([=]() mutable\r
                {\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
                        layer_key_ = false;\r
 \r
@@ -152,36 +148,38 @@ public:
 \r
                        // Draw items in device.\r
 \r
-                       BOOST_FOREACH(auto layer, render_queue_)\r
+                       while(!render_queue.empty())\r
                        {\r
+                               auto layer = render_queue.front();\r
+                               render_queue.pop();\r
+                               \r
                                draw_buffer_->attach(); \r
 \r
-                               BOOST_FOREACH(auto item, layer)                 \r
-                                       draw(item);     \r
-                                                               \r
+                               while(!layer.empty())\r
+                               {\r
+                                       draw(layer.front());\r
+                                       layer.pop();\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
                                local_key_ = false;\r
 \r
                                std::swap(local_key_buffer_, layer_key_buffer_);\r
                        }\r
 \r
-                       // Move waiting items to queue.\r
-\r
-                       render_queue_ = std::move(transferring_queue_);\r
-\r
-                       // Start transfer from device to host.\r
-\r
-                       read_buffer_ = ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only);\r
-                       draw_buffer_->write(*read_buffer_);\r
-\r
                        std::swap(draw_buffer_, write_buffer_);\r
+\r
+                       // Start transfer from device to host.  \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
-               return std::move(result);\r
+               return std::move(result.get());\r
        }\r
        \r
        void draw(const render_item& item)\r
-       {                                               \r
+       {               \r
                // Bind textures\r
 \r
                for(size_t n = 0; n < item.textures.size(); ++n)\r
@@ -192,53 +190,48 @@ public:
                bool local_key = false;\r
                bool layer_key = false;\r
                \r
-               if(item.transform.get_is_key())\r
+               if(item.transform.get_is_key()) // This is a key frame, render it to the local_key buffer for later use.\r
                {\r
-                       if(!local_key_)\r
+                       if(!local_key_) // Initialize local-key if it is not active.\r
                        {\r
                                local_key_buffer_->clear();\r
                                local_key_buffer_->attach();\r
                                local_key_ = true;\r
                        }\r
                }               \r
-               else\r
+               else // This is a normal frame. Use key buffers if they are active.\r
                {               \r
                        local_key = local_key_;\r
                        layer_key = layer_key_;\r
 \r
-                       if(local_key_)\r
+                       if(local_key_) // Use local key if we have it.\r
                        {\r
-                               local_key_buffer_->bind(3);\r
+                               local_key_buffer_->bind(LOCAL_KEY_INDEX);\r
                                draw_buffer_->attach(); \r
-                               local_key_ = false;\r
+                               local_key_ = false; // Use it only one time.\r
                        }               \r
 \r
-                       if(layer_key_)\r
-                               layer_key_buffer_->bind(4);\r
+                       if(layer_key_) // Use layer key if we have it.\r
+                               layer_key_buffer_->bind(LAYER_KEY_INDEX);\r
                }       \r
 \r
                // Draw\r
 \r
-               kernel_.draw(format_desc_.width, 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
-       std::vector<safe_ptr<host_buffer>> create_buffers(const core::pixel_format_desc& format)\r
+       safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& desc)\r
        {\r
-               std::vector<safe_ptr<host_buffer>> buffers;\r
-               std::transform(format.planes.begin(), format.planes.end(), std::back_inserter(buffers), [&](const core::pixel_format_desc::plane& plane)\r
-               {\r
-                       return ogl_device::create_host_buffer(plane.size, host_buffer::write_only);\r
-               });\r
-               return buffers;\r
+               return make_safe<write_frame>(channel_.ogl(), reinterpret_cast<int>(tag), desc);\r
        }\r
 };\r
 \r
-image_mixer::image_mixer(const core::video_format_desc& format_desc) : impl_(new implementation(format_desc)){}\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
-boost::unique_future<safe_ptr<const host_buffer>> image_mixer::render(){return impl_->render();}\r
-std::vector<safe_ptr<host_buffer>> image_mixer::create_buffers(const core::pixel_format_desc& format){return impl_->create_buffers(format);}\r
+safe_ptr<host_buffer> image_mixer::render(){return impl_->render();}\r
+safe_ptr<write_frame> image_mixer::create_frame(void* tag, const core::pixel_format_desc& desc){return impl_->create_frame(tag, desc);}\r
 void image_mixer::begin_layer(){impl_->begin_layer();}\r
 void image_mixer::end_layer(){impl_->end_layer();}\r
 \r