#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/frame_transform.h>\r
#include <core/producer/frame/pixel_format.h>\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
using namespace boost::assign;\r
\r
namespace caspar { namespace core {\r
\r
-typedef std::deque<render_item> layer;\r
+struct layer\r
+{\r
+ std::vector<render_item> items;\r
+ blend_mode::type blend_mode;\r
+\r
+ layer(blend_mode::type blend_mode) : blend_mode(blend_mode)\r
+ {\r
+ }\r
+};\r
\r
class image_renderer\r
{\r
{\r
}\r
\r
- boost::unique_future<safe_ptr<host_buffer>> render(std::deque<layer>&& layers)\r
+ boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)\r
{ \r
- auto layers2 = std::move(layers);\r
- return channel_.ogl().begin_invoke([=]() mutable\r
+ auto layers2 = make_move_on_copy(std::move(layers));\r
+ return channel_.ogl().begin_invoke([=]\r
{\r
- return do_render(std::move(layers2));\r
+ return do_render(std::move(layers2.value));\r
});\r
}\r
\r
private:\r
- safe_ptr<host_buffer> do_render(std::deque<layer>&& layers)\r
+ safe_ptr<host_buffer> do_render(std::vector<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(std::move(layer), draw_buffer, layer_key_buffer);\r
+ draw_layer(std::move(layer), draw_buffer, 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
return host_buffer;\r
}\r
\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, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)\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
+ if(layer.items.empty())\r
return;\r
\r
- std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer; // int is fields flag\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
+ if(layer.blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
{\r
auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
- auto layer_blend_mode = layer.front().blend_mode;\r
\r
- BOOST_FOREACH(auto& item, layer)\r
- {\r
- item.blend_mode = blend_mode::normal; // Disable blending and just merge.\r
+ BOOST_FOREACH(auto& item, layer.items)\r
draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer); \r
- }\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
+ 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
+ BOOST_FOREACH(auto& item, layer.items) \r
draw_item(std::move(item), *draw_buffer, local_key_buffer, layer_key_buffer); \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
+ auto upper_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
{\r
- return item.transform.field_mode | field_mode::upper;\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
+ auto lower_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
{\r
- return item.transform.field_mode | field_mode::lower;\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
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
+ 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
- , active_blend_mode_(blend_mode::normal) \r
+ , transform_stack_(1) \r
{\r
}\r
\r
void begin_layer(blend_mode::type blend_mode)\r
{\r
- active_blend_mode_ = blend_mode;\r
- layers_ += layer();\r
+ layers_.push_back(layer(blend_mode));\r
}\r
\r
void begin(core::basic_frame& frame)\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
- layers_.back() += item;\r
+ layers_.back().items.push_back(item);\r
}\r
\r
void end()\r
projects / casparcg / blobdiff