\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/algorithm_ext/erase.hpp>\r
\r
#include <algorithm>\r
#include <deque>\r
\r
namespace caspar { namespace core {\r
\r
-typedef std::deque<render_item> layer;\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
+struct layer\r
+{\r
+ std::vector<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_layer(std::move(layer), draw_buffer, layer_key_buffer);\r
- \r
+\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.items, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+ BOOST_FOREACH(auto& item, layer.items)\r
+ item.transform.field_mode = field_mode::upper;\r
+ }\r
+\r
+ BOOST_FOREACH(auto& layer, lower)\r
+ {\r
+ boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+ BOOST_FOREACH(auto& item, layer.items)\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
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
+ void draw(std::vector<layer>&& layers, \r
+ safe_ptr<device_buffer>& draw_buffer)\r
+ {\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 draw_layer(layer&& layer, \r
+ safe_ptr<device_buffer>& draw_buffer,\r
+ 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 = std::make_pair(0, nullptr); // int is fields flag\r
+ std::shared_ptr<device_buffer> local_key_buffer;\r
+ std::shared_ptr<device_buffer> local_mix_buffer;\r
\r
- if(layer.front().blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
+ if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
{\r
- auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\r
- auto layer_blend_mode = layer.front().blend_mode;\r
+ auto layer_draw_buffer = create_device_buffer(4);\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
+ BOOST_FOREACH(auto& item, layer.items)\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.blend_mode);\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
+ BOOST_FOREACH(auto& item, layer.items) \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
- 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
+ std::swap(local_key_buffer, layer_key_buffer);\r
}\r
\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
+ 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
- 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
+ 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
- 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
+ draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\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
+ 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
- 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
+ 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
- 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
+ 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
- return upper_count > 1 || lower_count > 1;\r
- } \r
- \r
+ kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+ }\r
+ \r
safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
{\r
auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);\r
return buffer;\r
}\r
};\r
-\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
}\r
\r
void visit(core::write_frame& frame)\r
- { \r
- if(transform_stack_.back().field_mode == field_mode::empty)\r
+ { \r
+ if(frame.get_frame_transform().field_mode == field_mode::empty)\r
return;\r
- \r
- core::render_item item;\r
+\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
- 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