]> git.sesse.net Git - casparcg/blobdiff - core/mixer/image/image_mixer.cpp
2.0. image_mixer: Fixed wierd bug where "layer" was leaked.
[casparcg] / core / mixer / image / image_mixer.cpp
index d68113f64257ab8d962034bda8e8071e54d2e0f0..5d4507a8701e6bbe683149c594f9425fb7cd346a 100644 (file)
 #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
+#include <common/utility/move_on_copy.h>\r
 \r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
 #include <core/producer/frame/pixel_format.h>\r
 #include <core/video_format.h>\r
 \r
 #include <gl/glew.h>\r
 \r
 #include <boost/foreach.hpp>\r
-#include <boost/range.hpp>\r
-#include <boost/range/algorithm/find.hpp>\r
+#include <boost/range/algorithm_ext/erase.hpp>\r
 \r
 #include <algorithm>\r
-#include <array>\r
 #include <deque>\r
-#include <unordered_map>\r
 \r
-namespace caspar { namespace core {\r
-               \r
-struct image_mixer::implementation : boost::noncopyable\r
-{              \r
-       typedef std::deque<render_item>                 layer;\r
+using namespace boost::assign;\r
 \r
-       video_channel_context&                                  channel_;\r
-\r
-       std::vector<image_transform>                    transform_stack_;\r
-       std::vector<video_mode::type>                   mode_stack_;\r
-\r
-       std::deque<std::deque<render_item>>             layers_; // layer/stream/items\r
+namespace caspar { namespace core {\r
        \r
-       image_kernel                                                    kernel_;\r
-               \r
-       std::shared_ptr<device_buffer>                  draw_buffer_;\r
-       std::shared_ptr<device_buffer>                  write_buffer_;\r
+struct item\r
+{\r
+       pixel_format_desc                                               pix_desc;\r
+       std::vector<safe_ptr<device_buffer>>    textures;\r
+       frame_transform                                                 transform;\r
+};\r
 \r
-       std::shared_ptr<device_buffer>                  local_key_buffer_;\r
-       std::shared_ptr<device_buffer>                  layer_key_buffer_;\r
-               \r
+typedef std::pair<blend_mode::type, std::vector<item>> layer;\r
+\r
+class image_renderer\r
+{\r
+       video_channel_context&                                  channel_;       \r
+       image_kernel                                                    kernel_;        \r
+       std::shared_ptr<device_buffer>                  active_buffer_;\r
 public:\r
-       implementation(video_channel_context& video_channel) \r
-               : channel_(video_channel)\r
-               , transform_stack_(1)\r
-               , mode_stack_(1, video_mode::progressive)\r
+       image_renderer(video_channel_context& channel)\r
+               : channel_(channel)\r
        {\r
        }\r
-\r
-       ~implementation()\r
-       {\r
-               channel_.ogl().gc();\r
+       \r
+       boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)\r
+       {               \r
+               auto layers2 = make_move_on_copy(std::move(layers));\r
+               return channel_.ogl().begin_invoke([=]\r
+               {\r
+                       return do_render(std::move(layers2.value));\r
+               });\r
        }\r
-\r
-       void initialize_buffers()\r
+       \r
+private:\r
+       safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)\r
        {\r
-               write_buffer_.reset();  \r
-               layer_key_buffer_.reset();\r
-               draw_buffer_.reset();   \r
-               local_key_buffer_.reset();\r
+               auto draw_buffer = create_device_buffer(4);\r
 \r
-               channel_.ogl().gc();\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.second, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+                               BOOST_FOREACH(auto& item, layer.second)\r
+                                       item.transform.field_mode = field_mode::upper;\r
+                       }\r
+\r
+                       BOOST_FOREACH(auto& layer, lower)\r
+                       {\r
+                               boost::remove_erase_if(layer.second, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+                               BOOST_FOREACH(auto& item, layer.second)\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
+               \r
+               active_buffer_ = draw_buffer;\r
 \r
-               write_buffer_                   = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               layer_key_buffer_               = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-               draw_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
+               channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
+                       \r
+               return host_buffer;\r
        }\r
 \r
-       void begin(core::basic_frame& frame)\r
+       void draw(std::vector<layer>&&          layers, \r
+                         safe_ptr<device_buffer>&      draw_buffer)\r
        {\r
-               transform_stack_.push_back(transform_stack_.back()*frame.get_image_transform());\r
-               mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? mode_stack_.back() : frame.get_mode());\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 visit(core::write_frame& frame)\r
-       {       \r
-               CASPAR_ASSERT(!layers_.empty());\r
 \r
-               // Check if frame has been discarded by interlacing\r
-               if(boost::range::find(mode_stack_, video_mode::upper) != mode_stack_.end() && boost::range::find(mode_stack_, video_mode::lower) != mode_stack_.end())\r
+       void draw_layer(layer&&                                                 layer, \r
+                                       safe_ptr<device_buffer>&                draw_buffer,\r
+                                       std::shared_ptr<device_buffer>& layer_key_buffer)\r
+       {                               \r
+               if(layer.second.empty())\r
                        return;\r
-               \r
-               core::render_item item(frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.back(), mode_stack_.back(), frame.tag());  \r
 \r
-               auto& layer = layers_.back();\r
+               std::shared_ptr<device_buffer> local_key_buffer;\r
+               std::shared_ptr<device_buffer> local_mix_buffer;\r
+                               \r
+               if(layer.first != blend_mode::normal && layer.second.size() > 1)\r
+               {\r
+                       auto layer_draw_buffer = create_device_buffer(4);\r
 \r
-               if(boost::range::find(layer, item) == layer.end())\r
-                       layer.push_back(item);\r
-       }\r
+                       BOOST_FOREACH(auto& item, layer.second)\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.first);\r
+               }\r
+               else // fast path\r
+               {\r
+                       BOOST_FOREACH(auto& item, layer.second)         \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
-       void end()\r
-       {\r
-               transform_stack_.pop_back();\r
-               mode_stack_.pop_back();\r
+               std::swap(local_key_buffer, layer_key_buffer);\r
        }\r
 \r
-       void begin_layer()\r
-       {\r
-               layers_.push_back(layer());\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>&      local_mix_buffer)\r
+       {                       \r
+               draw_params draw_params;\r
+               draw_params.pix_desc                            = std::move(item.pix_desc);\r
+               draw_params.textures                            = std::move(item.textures);\r
+               draw_params.transform                           = std::move(item.transform);\r
+\r
+               if(item.transform.is_key)\r
+               {\r
+                       local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);\r
+\r
+                       draw_params.background                  = local_key_buffer;\r
+                       draw_params.local_key                   = nullptr;\r
+                       draw_params.layer_key                   = nullptr;\r
+\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.keyer                               = keyer::additive;\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
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+               }       \r
        }\r
 \r
-       void end_layer()\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
-       boost::unique_future<safe_ptr<host_buffer>> render()\r
-       {               \r
-               auto layers = std::move(layers_);\r
-               return channel_.ogl().begin_invoke([=]()mutable\r
-               {\r
-                       return render(std::move(layers));\r
-               });\r
-       }\r
-       \r
-       safe_ptr<host_buffer> render(std::deque<layer>&& layers)\r
+                       \r
+       safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r
-               if(!write_buffer_ || channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())\r
-                       initialize_buffers();\r
-                               \r
-               channel_.ogl().clear(*layer_key_buffer_);\r
-               channel_.ogl().clear(*local_key_buffer_);\r
-               channel_.ogl().clear(*draw_buffer_);\r
-               \r
-               bool layer_key = false;\r
+               auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);\r
+               channel_.ogl().clear(*buffer);\r
+               return buffer;\r
+       }\r
+};\r
                \r
-               BOOST_FOREACH(auto& layer, layers)\r
-                       draw(std::move(layer), layer_key);\r
+struct image_mixer::implementation : boost::noncopyable\r
+{      \r
+       ogl_device&                                             ogl_;\r
+       image_renderer                                  renderer_;\r
+       std::vector<frame_transform>    transform_stack_;\r
+       std::vector<layer>                              layers_; // layer/stream/items\r
+public:\r
+       implementation(video_channel_context& video_channel) \r
+               : ogl_(video_channel.ogl())\r
+               , renderer_(video_channel)\r
+               , transform_stack_(1)   \r
+       {\r
+       }\r
 \r
-               std::swap(draw_buffer_, write_buffer_);\r
-               \r
-               auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
-       \r
-               channel_.ogl().attach(*write_buffer_);\r
-               host_buffer->begin_read(write_buffer_->width(), write_buffer_->height(), format(write_buffer_->stride()));\r
-               \r
-               GL(glFlush());\r
+       void begin_layer(blend_mode::type blend_mode)\r
+       {\r
+               layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));\r
+       }\r
                \r
-               return host_buffer;\r
+       void begin(core::basic_frame& frame)\r
+       {\r
+               transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform());\r
        }\r
-\r
-       void draw(layer&& layer, bool& layer_key)\r
-       {                       \r
-               bool local_key = false;\r
                \r
-               channel_.ogl().clear(*local_key_buffer_);\r
+       void visit(core::write_frame& frame)\r
+       {                       \r
+               if(frame.get_frame_transform().field_mode == field_mode::empty)\r
+                       return;\r
 \r
-               BOOST_FOREACH(auto& item, layer)\r
-                       draw(std::move(item), local_key, layer_key);\r
-               \r
-               layer_key = local_key;\r
+               item item;\r
+               item.pix_desc   = frame.get_pixel_format_desc();\r
+               item.textures   = frame.get_textures();\r
+               item.transform  = transform_stack_.back();\r
 \r
-               std::swap(local_key_buffer_, layer_key_buffer_);\r
+               layers_.back().second.push_back(item);\r
        }\r
 \r
-       void draw(render_item&& item, bool& local_key, bool& layer_key)\r
-       {                                                                                       \r
-               if(item.transform.get_is_key())\r
-               {\r
-                       draw(local_key_buffer_, std::move(item), nullptr, nullptr);\r
-                       local_key = true;\r
-               }\r
-               else\r
-               {\r
-                       draw(draw_buffer_, std::move(item), local_key ? local_key_buffer_ : nullptr, layer_key ? layer_key_buffer_ : nullptr);  \r
-                       channel_.ogl().clear(*local_key_buffer_);\r
-                       local_key = false;\r
-               }\r
+       void end()\r
+       {\r
+               transform_stack_.pop_back();\r
+       }\r
+\r
+       void end_layer()\r
+       {               \r
        }\r
        \r
-       void draw(std::shared_ptr<device_buffer>& target, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
+       boost::unique_future<safe_ptr<host_buffer>> render()\r
        {\r
-               if(!std::all_of(item.textures.begin(), item.textures.end(), std::mem_fn(&device_buffer::ready)))\r
-               {\r
-                       CASPAR_LOG(warning) << L"[image_mixer] Performance warning. Host to device transfer not complete, GPU will be stalled";\r
-                       channel_.ogl().yield(); // Try to give it some more time.\r
-               }               \r
-\r
-               kernel_.draw(channel_.ogl(), std::move(item), make_safe(target), local_key, layer_key);\r
+               return renderer_.render(std::move(layers_));\r
        }\r
-                               \r
+\r
        safe_ptr<write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r
        {\r
-               return make_safe<write_frame>(channel_.ogl(), tag, desc);\r
+               return make_safe<write_frame>(ogl_, tag, desc);\r
        }\r
 };\r
 \r
@@ -221,7 +292,7 @@ void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}
 void image_mixer::end(){impl_->end();}\r
 boost::unique_future<safe_ptr<host_buffer>> image_mixer::render(){return impl_->render();}\r
 safe_ptr<write_frame> image_mixer::create_frame(const 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::begin_layer(blend_mode::type blend_mode){impl_->begin_layer(blend_mode);}\r
 void image_mixer::end_layer(){impl_->end_layer();}\r
 image_mixer& image_mixer::operator=(image_mixer&& other)\r
 {\r