]> git.sesse.net Git - casparcg/blobdiff - core/mixer/image/image_mixer.cpp
2.0. - image_mixer: Fixed bug where amongst others mixing to alpha did not work.
[casparcg] / core / mixer / image / image_mixer.cpp
index d1078f2ead3b2e68fcf237272fa1903602cec850..9192b67f83125af680c4720af532229447e4d784 100644 (file)
 #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
 \r
+#include <algorithm>\r
 #include <array>\r
+#include <deque>\r
 #include <unordered_map>\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
 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
-       static const size_t BASE_INDEX = 5;\r
-       \r
+{              \r
+       typedef std::deque<render_item>                 layer;\r
+\r
        video_channel_context&                                  channel_;\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
+       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
        \r
        image_kernel                                                    kernel_;\r
                \r
-       std::shared_ptr<device_buffer>                  draw_buffer_[2];\r
-       std::shared_ptr<device_buffer>                  write_buffer_;\r
-\r
-       std::shared_ptr<device_buffer>                  stream_key_buffer_[2];\r
-       std::shared_ptr<device_buffer>                  layer_key_buffer_;\r
-\r
-       bool                                                                    local_key_;\r
-       bool                                                                    layer_key_;\r
-       \r
+       std::shared_ptr<device_buffer>                  draw_buffer_;           \r
 public:\r
        implementation(video_channel_context& video_channel) \r
                : channel_(video_channel)\r
-               , write_buffer_ (video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4))\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
+               , transform_stack_(1)\r
+               , mode_stack_(1, video_mode::progressive)\r
        {\r
-               draw_buffer_[0] = channel_.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               draw_buffer_[1] = channel_.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4);\r
-               stream_key_buffer_[0] = video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-               stream_key_buffer_[1] = video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1);\r
-\r
-               transform_stack_.push(core::image_transform());\r
-\r
-               channel_.ogl().invoke([=]\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
-               });\r
        }\r
 \r
+       ~implementation()\r
+       {\r
+               channel_.ogl().gc();\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_image_transform());\r
+               mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? mode_stack_.back() : frame.get_mode());\r
        }\r
                \r
        void visit(core::write_frame& frame)\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
+               CASPAR_ASSERT(!layers_.empty());\r
 \r
-               if(layer.empty() || (!layer.back().empty() && layer.back().back().tag != frame.tag()))\r
-                       layer.push(std::deque<render_item>());\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
+                       return;\r
                \r
-               layer.back().push_back(item);\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
+\r
+               if(boost::range::find(layer, item) == layer.end())\r
+                       layer.push_back(item);\r
        }\r
 \r
        void end()\r
        {\r
-               transform_stack_.pop();\r
+               transform_stack_.pop_back();\r
+               mode_stack_.pop_back();\r
        }\r
 \r
        void begin_layer()\r
        {\r
-               render_queue_.push(std::queue<std::deque<render_item>>());\r
+               layers_.push_back(layer());\r
        }\r
 \r
        void end_layer()\r
        {\r
        }\r
-\r
-       void reinitialize_buffers()\r
-       {\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
-               write_buffer_                   = 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
-               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
+       boost::unique_future<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
+               auto layers = std::move(layers_);\r
+               return channel_.ogl().begin_invoke([=]()mutable\r
                {\r
-                       if(draw_buffer_[0]->width() != channel_.get_format_desc().width || draw_buffer_[0]->height() != channel_.get_format_desc().height)\r
-                               reinitialize_buffers();\r
-                       \r
-                       return do_render(std::move(render_queue));\r
+                       return render(std::move(layers));\r
                });\r
        }\r
        \r
-       safe_ptr<host_buffer> do_render(std::queue<std::queue<std::deque<render_item>>>&& render_queue)\r
+       safe_ptr<host_buffer> render(std::deque<layer>&& layers)\r
        {\r
-               auto read_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
+               std::shared_ptr<device_buffer> layer_key_buffer;\r
+\r
+               draw_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);                             \r
+               channel_.ogl().clear(*draw_buffer_);\r
+                               \r
+               BOOST_FOREACH(auto& layer, layers)\r
+                       draw(std::move(layer), layer_key_buffer);\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
+               GL(glFlush());\r
+               \r
+               return host_buffer;\r
+       }\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
+       // TODO: We might have more overlaps for opacity transitions\r
+       // TODO: What about blending modes, are they ok? Maybe only overlap detection is required for opacity?\r
+       void draw(layer&& layer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+       {                               \r
+               if(layer.empty())\r
+                       return;\r
 \r
-               bool local_key = false;\r
-               bool layer_key = false;\r
+               std::shared_ptr<device_buffer> local_key_buffer;\r
+                                       \r
+               if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))\r
+               {\r
+                       auto local_draw_buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);   \r
+                       channel_.ogl().clear(*local_draw_buffer);\r
 \r
-               while(!render_queue.empty())\r
-               {                       \r
-                       stream_key_buffer_[0]->clear();\r
+                       BOOST_FOREACH(auto& item, layer)                \r
+                               draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer);              \r
+                                                       \r
+                       kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), make_safe(draw_buffer_), nullptr, nullptr);\r
+               }\r
+               else // fast path\r
+               {\r
+                       BOOST_FOREACH(auto& item, layer)                \r
+                               draw_item(std::move(item), make_safe(draw_buffer_), local_key_buffer, layer_key_buffer);                \r
+               }                                       \r
 \r
-                       auto layer = std::move(render_queue.front());\r
-                       render_queue.pop();\r
+               std::swap(local_key_buffer, layer_key_buffer);\r
+       }\r
 \r
-                       while(!layer.empty())\r
+       void draw_item(render_item&& item, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& local_key_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\r
+       {                                                                                       \r
+               if(item.transform.get_is_key())\r
+               {\r
+                       if(!local_key_buffer)\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
+                               local_key_buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+                               channel_.ogl().clear(*local_key_buffer);\r
                        }\r
 \r
-                       layer_key = local_key;\r
-                       local_key = false;\r
-                       std::swap(stream_key_buffer_[0], layer_key_buffer_);\r
+                       kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer), nullptr, nullptr);\r
                }\r
+               else\r
+               {\r
+                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);\r
+                       local_key_buffer.reset();\r
+               }\r
+       }\r
+                       \r
+       render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
+       {\r
+               CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
 \r
-               std::swap(draw_buffer_[0], write_buffer_);\r
+               pixel_format_desc desc;\r
+               desc.pix_fmt = pixel_format::bgra;\r
+               desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
 \r
-               // Start transfer from device to host.                          \r
-               write_buffer_->write(*read_buffer);\r
+               std::vector<safe_ptr<device_buffer>> textures;\r
+               textures.push_back(buffer);\r
+                               \r
+               image_transform transform;\r
+               transform.set_blend_mode(blend_mode);\r
 \r
-               return read_buffer;\r
+               return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr);              \r
        }\r
 \r
-       void render(std::deque<render_item>& stream, bool local_key, bool layer_key)\r
+       // TODO: Optimize\r
+       bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
        {\r
-               while(stream.size() > 2)\r
-                       stream.pop_front();\r
+               if(layer.empty())\r
+                       return false;   \r
                \r
-               BOOST_FOREACH(auto item2, stream)\r
-               {\r
-                       for(size_t n = 0; n < item2.textures.size(); ++n)\r
-                               item2.textures[n]->bind(n);     \r
-               }\r
+               implementation::layer fill;\r
 \r
-               if(stream.front().transform.get_is_key())\r
+               std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
                {\r
-                       stream_key_buffer_[0]->bind(BASE_INDEX);                        \r
-                       stream_key_buffer_[1]->attach();\r
-                       \r
-                       BOOST_FOREACH(auto item2, stream)\r
-                               kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, false, false);\r
+                       return !item.transform.get_is_key();\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
+               if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
                {\r
-                       stream_key_buffer_[0]->bind(LOCAL_KEY_INDEX);   \r
-                       layer_key_buffer_->bind(LAYER_KEY_INDEX);\r
-                       \r
-                       draw_buffer_[0]->bind(BASE_INDEX);                      \r
-                       draw_buffer_[1]->attach();      \r
-                       \r
-                       BOOST_FOREACH(auto item2, stream)\r
-                               kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, local_key, layer_key);   \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
+                       return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+                       {\r
+                               return item.transform.get_opacity() < 1.0 - 0.001;\r
+                       });\r
                }\r
-       }\r
-                               \r
+\r
+               // Simple solution, just check if we have differnt video streams / tags.\r
+               return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+               {\r
+                       return item.tag != fill.front().tag;\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>(channel_.ogl(), tag, desc);\r
        }\r
 };\r
 \r
@@ -251,7 +244,7 @@ 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::end_layer(){impl_->end_layer();}\r