\r
class image_renderer\r
{\r
- video_channel_context& channel_; \r
+ ogl_device& ogl_;\r
+ const video_format_desc format_desc_;\r
image_kernel kernel_; \r
- std::shared_ptr<device_buffer> active_buffer_;\r
+ std::shared_ptr<device_buffer> transferring_buffer_;\r
public:\r
- image_renderer(video_channel_context& channel)\r
- : channel_(channel)\r
+ image_renderer(ogl_device& ogl, const video_format_desc& format_desc)\r
+ : ogl_(ogl)\r
+ , format_desc_(format_desc)\r
{\r
}\r
\r
- boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)\r
+ boost::unique_future<safe_ptr<host_buffer>> operator()(std::vector<layer>&& layers)\r
{ \r
auto layers2 = make_move_on_copy(std::move(layers));\r
- return channel_.ogl().begin_invoke([=]\r
+ return ogl_.begin_invoke([=]\r
{\r
return do_render(std::move(layers2.value));\r
});\r
{\r
auto draw_buffer = create_mixer_buffer(4);\r
\r
- if(channel_.get_format_desc().field_mode != field_mode::progressive)\r
+ if(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.second, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
BOOST_FOREACH(auto& item, layer.second)\r
- item.transform.field_mode = field_mode::upper;\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.second, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
BOOST_FOREACH(auto& item, layer.second)\r
- item.transform.field_mode = field_mode::lower;\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(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
+ auto host_buffer = ogl_.create_host_buffer(format_desc_.size, host_buffer::read_only);\r
+ 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
+ transferring_buffer_ = std::move(draw_buffer);\r
\r
- channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.\r
+ ogl_.flush(); // NOTE: This is important, otherwise fences will deadlock.\r
\r
return host_buffer;\r
}\r
safe_ptr<device_buffer>& draw_buffer,\r
std::shared_ptr<device_buffer>& layer_key_buffer)\r
{ \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
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
+ layer_key_buffer = std::move(local_key_buffer);\r
}\r
\r
void draw_item(item&& item, \r
draw_params.local_key = nullptr;\r
draw_params.layer_key = nullptr;\r
\r
- kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+ kernel_.draw(ogl_, std::move(draw_params));\r
}\r
else if(item.transform.is_mix)\r
{\r
\r
draw_params.keyer = keyer::additive;\r
\r
- kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+ kernel_.draw(ogl_, std::move(draw_params));\r
}\r
else\r
{\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
+ kernel_.draw(ogl_, std::move(draw_params));\r
} \r
}\r
\r
- void draw_mixer_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& source_buffer, blend_mode::type blend_mode = blend_mode::normal)\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
draw_params.blend_mode = blend_mode;\r
draw_params.background = draw_buffer;\r
\r
- kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+ kernel_.draw(ogl_, std::move(draw_params));\r
}\r
\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
+ auto buffer = ogl_.create_device_buffer(format_desc_.width, format_desc_.height, stride);\r
+ ogl_.clear(*buffer);\r
return buffer;\r
}\r
};\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
+ implementation(ogl_device& ogl, const video_format_desc& format_desc) \r
+ : ogl_(ogl)\r
+ , renderer_(ogl, format_desc)\r
, transform_stack_(1) \r
{\r
}\r
layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));\r
}\r
\r
- void begin(core::basic_frame& frame)\r
+ void begin(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
+ void visit(write_frame& frame)\r
{ \r
- if(frame.get_frame_transform().field_mode == field_mode::empty)\r
- return;\r
-\r
item item;\r
item.pix_desc = frame.get_pixel_format_desc();\r
item.textures = frame.get_textures();\r
\r
boost::unique_future<safe_ptr<host_buffer>> render()\r
{\r
- return renderer_.render(std::move(layers_));\r
+ return renderer_(std::move(layers_));\r
}\r
\r
- safe_ptr<write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r
+ safe_ptr<write_frame> create_frame(const void* tag, const pixel_format_desc& desc)\r
{\r
return make_safe<write_frame>(ogl_, tag, desc);\r
}\r
+\r
+ boost::unique_future<safe_ptr<write_frame>> create_frame2(const void* tag, const pixel_format_desc& desc)\r
+ {\r
+ return ogl_.begin_invoke([=]{return make_safe<write_frame>(ogl_, tag, desc);}, high_priority);\r
+ }\r
};\r
\r
-image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r
-void image_mixer::begin(core::basic_frame& frame){impl_->begin(frame);}\r
-void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
+image_mixer::image_mixer(ogl_device& ogl, const video_format_desc& format_desc) : impl_(new implementation(ogl, format_desc)){}\r
+void image_mixer::begin(basic_frame& frame){impl_->begin(frame);}\r
+void image_mixer::visit(write_frame& frame){impl_->visit(frame);}\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
+safe_ptr<write_frame> image_mixer::create_frame(const void* tag, const pixel_format_desc& desc){return impl_->create_frame(tag, desc);}\r
+boost::unique_future<safe_ptr<write_frame>> image_mixer::create_frame2(const void* tag, const pixel_format_desc& desc){return impl_->create_frame2(tag, desc);}\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