]> git.sesse.net Git - casparcg/blobdiff - core/mixer/image/image_mixer.cpp
image_mixer: Fixed overlapping_items.
[casparcg] / core / mixer / image / image_mixer.cpp
index ceb270cd756b795b01f664621dc71c3485fdbe03..eda73da2f3af2a2ed7eb612998ab1057a155a3ba 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
 \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
 \r
 #include <algorithm>\r
-#include <array>\r
-#include <unordered_map>\r
+#include <deque>\r
+\r
+using namespace boost::assign;\r
 \r
 namespace caspar { namespace core {\r
-               \r
-struct render_item\r
-{\r
-       pixel_format_desc                                        desc;\r
-       std::vector<safe_ptr<device_buffer>> textures;\r
-       core::image_transform                            transform;\r
-       int                                                                      tag;\r
-};\r
+       \r
+typedef std::deque<render_item>                                layer;\r
 \r
-bool operator==(const render_item& lhs, const render_item& rhs)\r
+class image_renderer\r
 {\r
-       return lhs.textures == rhs.textures && lhs.transform == rhs.transform && lhs.tag == rhs.tag;\r
-}\r
-\r
-struct image_mixer::implementation : boost::noncopyable\r
-{              \r
-       video_channel_context&                                  channel_;\r
+       video_channel_context&                                  channel_;       \r
+       image_kernel                                                    kernel_;        \r
+       std::shared_ptr<device_buffer>                  active_buffer_;\r
+public:\r
+       image_renderer(video_channel_context& channel)\r
+               : channel_(channel)\r
+       {\r
+       }\r
        \r
-       std::stack<core::image_transform>               transform_stack_;\r
-\r
-       std::queue<std::queue<std::deque<render_item>>> render_queue_; // layer/stream/items\r
+       boost::unique_future<safe_ptr<host_buffer>> render(std::deque<layer>&& layers)\r
+       {               \r
+               auto layers2 = std::move(layers);\r
+               return channel_.ogl().begin_invoke([=]() mutable\r
+               {\r
+                       return do_render(std::move(layers2));\r
+               });\r
+       }\r
        \r
-       std::unique_ptr<image_kernel>                   kernel_;\r
+private:\r
+       safe_ptr<host_buffer> do_render(std::deque<layer>&& layers)\r
+       {\r
+               std::shared_ptr<device_buffer> layer_key_buffer;\r
+\r
+               auto draw_buffer = create_device_buffer(4);\r
+                               \r
+               BOOST_FOREACH(auto& layer, layers)\r
+                       draw_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
                \r
-       std::shared_ptr<device_buffer>                  draw_buffer_[2];\r
-       std::shared_ptr<device_buffer>                  write_buffer_;\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
-       std::shared_ptr<device_buffer>                  stream_key_buffer_[2];\r
-       std::shared_ptr<device_buffer>                  layer_key_buffer_;\r
-       \r
-public:\r
-       implementation(video_channel_context& video_channel) \r
-               : channel_(video_channel)\r
-       {\r
-               initialize_buffers();\r
-               transform_stack_.push(core::image_transform());\r
+               channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
+                       \r
+               return host_buffer;\r
+       }\r
+\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
-               channel_.ogl().invoke([=]\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
-                       if(!GLEE_VERSION_3_0)\r
-                               CASPAR_LOG(warning) << "Missing OpenGL 3.0 support.";//BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));\r
+                       auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
+                       auto layer_blend_mode = layer.front().blend_mode;\r
 \r
-                       kernel_.reset(new image_kernel());\r
-               });\r
+                       BOOST_FOREACH(auto& item, layer)\r
+                       {\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);\r
+                       item.transform                  = frame_transform();\r
+                       item.blend_mode                 = layer_blend_mode;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(item), *draw_buffer, nullptr, nullptr);\r
+               }\r
+               else // fast path\r
+               {\r
+                       BOOST_FOREACH(auto& item, layer)                \r
+                               draw_item(std::move(item), *draw_buffer, local_key_buffer, layer_key_buffer);           \r
+               }                                       \r
+\r
+               CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::field_mode::progressive);\r
+\r
+               std::swap(local_key_buffer.second, layer_key_buffer);\r
        }\r
 \r
-       ~implementation()\r
+       void draw_item(render_item&&                                                                    item, \r
+                                  device_buffer&                                                                       draw_buffer, \r
+                                  std::pair<int, std::shared_ptr<device_buffer>>&      local_key_buffer, \r
+                                  std::shared_ptr<device_buffer>&                                      layer_key_buffer)\r
+       {                                                                                       \r
+               if(item.transform.is_key)\r
+               {\r
+                       if(!local_key_buffer.second)\r
+                       {\r
+                               local_key_buffer.first = 0;\r
+                               local_key_buffer.second = create_device_buffer(1);\r
+                       }\r
+                       \r
+                       local_key_buffer.first |= item.transform.field_mode; // Add field to flag.\r
+                       kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer.second, nullptr, nullptr);\r
+               }\r
+               else\r
+               {\r
+                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);\r
+                       local_key_buffer.first ^= item.transform.field_mode; // Remove field from flag.\r
+                       \r
+                       if(local_key_buffer.first == 0) // If all fields from key has been used, reset it\r
+                       {\r
+                               local_key_buffer.first = 0;\r
+                               local_key_buffer.second.reset();\r
+                       }\r
+               }\r
+       }\r
+\r
+       bool has_overlapping_items(const layer& layer)\r
+       {               \r
+               auto upper_count = boost::range::count_if(layer, [&](const render_item& item)\r
+               {\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.is_key && (item.transform.field_mode & field_mode::lower);\r
+               });\r
+\r
+               return upper_count > 1 || lower_count > 1;\r
+       }                       \r
+               \r
+       safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r
-               channel_.ogl().gc();\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
-       void initialize_buffers()\r
+               \r
+struct image_mixer::implementation : boost::noncopyable\r
+{      \r
+       ogl_device&                                                             ogl_;\r
+       image_renderer                                                  renderer_;\r
+       std::vector<frame_transform>                    transform_stack_;\r
+       blend_mode::type                                                active_blend_mode_;\r
+       std::deque<std::deque<render_item>>             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
+               , active_blend_mode_(blend_mode::normal)                \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_[0]                 = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               draw_buffer_[1]                 = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               stream_key_buffer_[0]   = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-               stream_key_buffer_[1]   = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
        }\r
 \r
+       void begin_layer(blend_mode::type blend_mode)\r
+       {\r
+               active_blend_mode_ = blend_mode;\r
+               layers_ += layer();\r
+       }\r
+               \r
        void begin(core::basic_frame& frame)\r
        {\r
-               transform_stack_.push(transform_stack_.top()*frame.get_image_transform());\r
+               transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform());\r
        }\r
                \r
        void visit(core::write_frame& frame)\r
-       {                       \r
-               if(frame.get_textures().empty())\r
+       {       \r
+               if(transform_stack_.back().field_mode == field_mode::empty)\r
                        return;\r
-\r
-               render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.top()*frame.get_image_transform(), frame.tag()};      \r
-\r
-               auto& layer = render_queue_.back();\r
-\r
-               if(layer.empty() || (!layer.back().empty() && layer.back().back().tag != frame.tag()))\r
-                       layer.push(std::deque<render_item>());\r
-               \r
-               auto& stream = layer.back();\r
                \r
-               if(std::find(stream.begin(), stream.end(), item) == stream.end())\r
-                       stream.push_back(item);\r
-       }\r
+               core::render_item item;\r
+               item.pix_desc   = frame.get_pixel_format_desc();\r
+               item.textures   = frame.get_textures();\r
+               item.transform  = transform_stack_.back();\r
+               item.blend_mode = active_blend_mode_;   \r
 \r
-       void end()\r
-       {\r
-               transform_stack_.pop();\r
+               layers_.back() += item;\r
        }\r
 \r
-       void begin_layer()\r
+       void end()\r
        {\r
-               render_queue_.push(std::queue<std::deque<render_item>>());\r
+               transform_stack_.pop_back();\r
        }\r
 \r
        void end_layer()\r
-       {\r
-       }\r
-       \r
-       safe_ptr<host_buffer> render()\r
        {               \r
-               auto render_queue = std::move(render_queue_);\r
-\r
-               return channel_.ogl().invoke([=]() mutable -> safe_ptr<host_buffer>\r
-               {                       \r
-                       if(channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())\r
-                               initialize_buffers();\r
-\r
-                       return do_render(std::move(render_queue));\r
-               });\r
        }\r
        \r
-       safe_ptr<host_buffer> do_render(std::queue<std::queue<std::deque<render_item>>>&& render_queue)\r
+       boost::unique_future<safe_ptr<host_buffer>> render()\r
        {\r
-               auto read_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
-\r
-               layer_key_buffer_->clear();\r
-               draw_buffer_[0]->clear();\r
-               draw_buffer_[1]->clear();\r
-               stream_key_buffer_[0]->clear();\r
-               stream_key_buffer_[1]->clear();\r
-\r
-               bool local_key = false;\r
-               bool layer_key = false;\r
-\r
-               while(!render_queue.empty())\r
-               {                       \r
-                       stream_key_buffer_[0]->clear();\r
-\r
-                       auto layer = std::move(render_queue.front());\r
-                       render_queue.pop();\r
-\r
-                       while(!layer.empty())\r
-                       {\r
-                               auto stream = std::move(layer.front());\r
-                               layer.pop();\r
-                                                               \r
-                               render(stream, local_key, layer_key);\r
-                               \r
-                               local_key = stream.front().transform.get_is_key();\r
-                               if(!local_key)\r
-                                       stream_key_buffer_[0]->clear();\r
-\r
-                               channel_.ogl().yield();\r
-                       }\r
-\r
-                       layer_key = local_key;\r
-                       local_key = false;\r
-                       std::swap(stream_key_buffer_[0], layer_key_buffer_);\r
-               }\r
-\r
-               std::swap(draw_buffer_[0], write_buffer_);\r
-\r
-               // Start transfer from device to host.                          \r
-               write_buffer_->write(*read_buffer);\r
-\r
-               return read_buffer;\r
+               return renderer_.render(std::move(layers_));\r
        }\r
 \r
-       void render(std::deque<render_item>& stream, bool local_key, bool layer_key)\r
-       {\r
-               CASPAR_ASSERT(!stream.empty());\r
-                               \r
-               if(stream.front().transform.get_is_key())\r
-               {\r
-                       stream_key_buffer_[1]->attach();\r
-                       \r
-                       BOOST_FOREACH(auto item2, stream)\r
-                       {       \r
-                               kernel_->draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, item2.textures, \r
-                                                               make_safe(stream_key_buffer_[0]), nullptr, nullptr);\r
-                       }\r
-\r
-                       std::swap(stream_key_buffer_[0], stream_key_buffer_[1]);\r
-\r
-                       stream_key_buffer_[1]->bind();\r
-                       glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, channel_.get_format_desc().width, channel_.get_format_desc().height); \r
-               }\r
-               else\r
-               {\r
-                       draw_buffer_[1]->attach();      \r
-                       \r
-                       BOOST_FOREACH(auto item2, stream)\r
-                       {       \r
-                               kernel_->draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, item2.textures, \r
-                                                               make_safe(draw_buffer_[0]), local_key ? stream_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr);      \r
-                       }\r
-\r
-                       std::swap(draw_buffer_[0], draw_buffer_[1]);\r
-                       \r
-                       draw_buffer_[1]->bind();\r
-                       glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, channel_.get_format_desc().width, channel_.get_format_desc().height);\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(), reinterpret_cast<int>(tag), desc);\r
+               return make_safe<write_frame>(ogl_, tag, desc);\r
        }\r
 };\r
 \r
@@ -248,9 +245,9 @@ image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new imple
 void image_mixer::begin(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
-safe_ptr<host_buffer> image_mixer::render(){return impl_->render();}\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