\r
namespace caspar { namespace core {\r
\r
-struct layer\r
+struct item\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
+ pixel_format_desc pix_desc;\r
+ std::vector<safe_ptr<device_buffer>> textures;\r
+ frame_transform transform;\r
};\r
\r
+typedef std::pair<blend_mode::type, std::vector<item>> layer;\r
+\r
class image_renderer\r
{\r
video_channel_context& channel_; \r
private:\r
safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)\r
{\r
- auto draw_buffer = create_device_buffer(4);\r
+ auto draw_buffer = create_mixer_buffer(4);\r
\r
if(channel_.get_format_desc().field_mode != field_mode::progressive)\r
{\r
\r
BOOST_FOREACH(auto& layer, upper)\r
{\r
- boost::remove_erase_if(layer.items, [](const render_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
+ BOOST_FOREACH(auto& item, layer.second)\r
+ item.transform.field_mode = static_cast<field_mode::type>(item.transform.field_mode & field_mode::upper);\r
}\r
\r
BOOST_FOREACH(auto& layer, lower)\r
{\r
- boost::remove_erase_if(layer.items, [](const render_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
+ BOOST_FOREACH(auto& item, layer.second)\r
+ item.transform.field_mode = static_cast<field_mode::type>(item.transform.field_mode & field_mode::lower);\r
}\r
\r
- draw(std::move(upper), *draw_buffer);\r
- draw(std::move(lower), *draw_buffer);\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
+ 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
+ active_buffer_ = std::move(draw_buffer);\r
\r
channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
\r
return host_buffer;\r
}\r
\r
- void draw(std::vector<layer>&& layers, \r
- device_buffer& draw_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
}\r
\r
void draw_layer(layer&& layer, \r
- device_buffer& draw_buffer,\r
+ safe_ptr<device_buffer>& draw_buffer,\r
std::shared_ptr<device_buffer>& layer_key_buffer)\r
{ \r
- if(layer.items.empty())\r
+ boost::remove_erase_if(layer.second, [](const item& item){return item.transform.field_mode == field_mode::empty;});\r
+\r
+ if(layer.second.empty())\r
return;\r
\r
std::shared_ptr<device_buffer> local_key_buffer;\r
+ std::shared_ptr<device_buffer> local_mix_buffer;\r
\r
- if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
+ if(layer.first != blend_mode::normal && layer.second.size() > 1)\r
{\r
- auto layer_draw_buffer = create_device_buffer(4);\r
-\r
- BOOST_FOREACH(auto& item, layer.items)\r
- draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer); \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
+ auto layer_draw_buffer = create_mixer_buffer(4);\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_mixer_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal); \r
+ draw_mixer_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first);\r
}\r
else // fast path\r
{\r
- BOOST_FOREACH(auto& item, layer.items) \r
- draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer); \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_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
} \r
- \r
- std::swap(local_key_buffer, layer_key_buffer);\r
+\r
+ layer_key_buffer = std::move(local_key_buffer);\r
}\r
\r
- void draw_item(render_item&& item, \r
- device_buffer& draw_buffer, \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>& layer_key_buffer)\r
- { \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
- kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer, nullptr, nullptr);\r
+ local_key_buffer = local_key_buffer ? local_key_buffer : create_mixer_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_mixer_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, layer_key_buffer);\r
- local_key_buffer = nullptr;\r
+ draw_mixer_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 draw_mixer_buffer(safe_ptr<device_buffer>& draw_buffer, \r
+ std::shared_ptr<device_buffer>&& source_buffer, \r
+ 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
- safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
+ safe_ptr<device_buffer> create_mixer_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
channel_.ogl().clear(*buffer);\r
\r
void begin_layer(blend_mode::type blend_mode)\r
{\r
- layers_.push_back(layer(blend_mode));\r
+ layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));\r
}\r
\r
void begin(core::basic_frame& frame)\r
\r
void visit(core::write_frame& frame)\r
{ \r
- if(frame.get_frame_transform().field_mode == field_mode::empty)\r
- return;\r
-\r
- core::render_item item;\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
- layers_.back().items.push_back(item);\r
+ layers_.back().second.push_back(item);\r
}\r
\r
void end()\r
projects / casparcg / blobdiff