#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/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
-#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 image_mixer::implementation : boost::noncopyable\r
-{ \r
- typedef std::deque<render_item> layer;\r
-\r
- video_channel_context& channel_;\r
-\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
-public:\r
- implementation(video_channel_context& video_channel) \r
- : channel_(video_channel)\r
- , transform_stack_(1)\r
- , mode_stack_(1, video_mode::progressive)\r
- {\r
- }\r
+using namespace boost::assign;\r
\r
- ~implementation()\r
- {\r
- channel_.ogl().gc();\r
- }\r
+namespace caspar { namespace core {\r
\r
- void begin(core::basic_frame& frame)\r
- {\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
- CASPAR_ASSERT(!layers_.empty());\r
-\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
- 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_back();\r
- mode_stack_.pop_back();\r
- }\r
+struct layer\r
+{\r
+ std::vector<render_item> items;\r
+ blend_mode::type blend_mode;\r
\r
- void begin_layer()\r
+ layer(blend_mode::type blend_mode) : blend_mode(blend_mode)\r
{\r
- layers_.push_back(layer());\r
}\r
+};\r
\r
- void end_layer()\r
+class image_renderer\r
+{\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
- boost::unique_future<safe_ptr<host_buffer>> render()\r
+ boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)\r
{ \r
- auto layers = 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 render(std::move(layers));\r
+ return do_render(std::move(layers2.value));\r
});\r
}\r
\r
- safe_ptr<host_buffer> render(std::deque<layer>&& layers)\r
+private:\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
- \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
host_buffer->begin_read(draw_buffer->width(), draw_buffer->height(), format(draw_buffer->stride()));\r
\r
- GL(glFlush());\r
- \r
+ active_buffer_ = draw_buffer;\r
+\r
+ channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
+ \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::shared_ptr<device_buffer> local_key_buffer;\r
- \r
- if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))\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.blend_mode != blend_mode::normal && has_overlapping_items(layer))\r
{\r
- auto local_draw_buffer = create_device_buffer(4); \r
- \r
- BOOST_FOREACH(auto& item, layer) \r
- {\r
- item.transform.set_blend_mode(image_transform::blend_mode::normal);\r
- draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer); \r
- }\r
-\r
- kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), draw_buffer, nullptr, nullptr);\r
+ auto layer_draw_buffer = create_device_buffer(4); // int is fields flag\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
}\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, local_key_buffer, layer_key_buffer); \r
} \r
\r
- std::swap(local_key_buffer, layer_key_buffer);\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
- 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
+ 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.get_is_key())\r
+ if(item.transform.is_key)\r
{\r
- if(!local_key_buffer)\r
- local_key_buffer = create_device_buffer(1);\r
-\r
- item.transform.set_opacity(1.0);\r
- item.transform.set_blend_mode(image_transform::blend_mode::normal);\r
- kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer), nullptr, nullptr);\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, layer_key_buffer);\r
- local_key_buffer.reset();\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
- // TODO: Optimize\r
- bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
- {\r
- if(layer.empty())\r
- return false; \r
- \r
- implementation::layer fill;\r
-\r
- std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
+ bool has_overlapping_items(const layer& layer)\r
+ { \r
+ auto upper_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
{\r
- return !item.transform.get_is_key();\r
+ return !item.transform.is_key && (item.transform.field_mode & field_mode::upper);\r
});\r
- \r
- if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
- {\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
- // 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
+ auto lower_count = boost::range::count_if(layer.items, [&](const render_item& item)\r
{\r
- return item.tag != fill.front().tag;\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
- render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\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
+ channel_.ogl().clear(*buffer);\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
+ 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
{\r
- CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
+ }\r
\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
+ void begin_layer(blend_mode::type blend_mode)\r
+ {\r
+ layers_.push_back(layer(blend_mode));\r
+ }\r
+ \r
+ void begin(core::basic_frame& frame)\r
+ {\r
+ transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform());\r
+ }\r
+ \r
+ void visit(core::write_frame& frame)\r
+ { \r
+ if(transform_stack_.back().field_mode == field_mode::empty)\r
+ return;\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
\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
+ layers_.back().items.push_back(item);\r
+ }\r
\r
- return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr); \r
+ void end()\r
+ {\r
+ transform_stack_.pop_back();\r
}\r
\r
- safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
+ void end_layer()\r
+ { \r
+ }\r
+ \r
+ boost::unique_future<safe_ptr<host_buffer>> render()\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
- return buffer;\r
+ return renderer_.render(std::move(layers_));\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(), tag, desc);\r
+ return make_safe<write_frame>(ogl_, tag, desc);\r
}\r
};\r
\r
void image_mixer::end(){impl_->end();}\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
projects / casparcg / blobdiff