X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=d81c9f798156bafa03ee97777246e5998fb96895;hb=371df45d22eba16e04e14238d34c86162a36ce20;hp=ec167ce39cbc1bf4b68666df026eb9e25496b090;hpb=2cfe40e47c46a652eed324a73cd68bc23bbcf4b7;p=casparcg diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp index ec167ce39..d81c9f798 100644 --- a/core/mixer/image/image_mixer.cpp +++ b/core/mixer/image/image_mixer.cpp @@ -48,31 +48,32 @@ using namespace boost::assign; namespace caspar { namespace core { -struct layer +struct item { - std::vector items; - blend_mode::type blend_mode; - - layer(blend_mode::type blend_mode) : blend_mode(blend_mode) - { - } + pixel_format_desc pix_desc; + std::vector> textures; + frame_transform transform; }; +typedef std::pair> layer; + class image_renderer { - video_channel_context& channel_; + ogl_device& ogl_; + const video_format_desc format_desc_; image_kernel kernel_; - std::shared_ptr active_buffer_; + std::shared_ptr transferring_buffer_; public: - image_renderer(video_channel_context& channel) - : channel_(channel) + image_renderer(ogl_device& ogl, const video_format_desc& format_desc) + : ogl_(ogl) + , format_desc_(format_desc) { } - boost::unique_future> render(std::vector&& layers) + boost::unique_future> operator()(std::vector&& layers) { auto layers2 = make_move_on_copy(std::move(layers)); - return channel_.ogl().begin_invoke([=] + return ogl_.begin_invoke([=] { return do_render(std::move(layers2.value)); }); @@ -81,48 +82,46 @@ public: private: safe_ptr do_render(std::vector&& layers) { - auto draw_buffer = create_device_buffer(4); + auto draw_buffer = create_mixer_buffer(4); - if(channel_.get_format_desc().field_mode != field_mode::progressive) + if(format_desc_.field_mode != field_mode::progressive) { auto upper = layers; auto lower = std::move(layers); BOOST_FOREACH(auto& layer, upper) { - boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::upper);}); - BOOST_FOREACH(auto& item, layer.items) - item.transform.field_mode = field_mode::upper; + BOOST_FOREACH(auto& item, layer.second) + item.transform.field_mode = static_cast(item.transform.field_mode & field_mode::upper); } BOOST_FOREACH(auto& layer, lower) { - boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::lower);}); - BOOST_FOREACH(auto& item, layer.items) - item.transform.field_mode = field_mode::lower; + BOOST_FOREACH(auto& item, layer.second) + item.transform.field_mode = static_cast(item.transform.field_mode & field_mode::lower); } - draw(std::move(upper), *draw_buffer); - draw(std::move(lower), *draw_buffer); + draw(std::move(upper), draw_buffer); + draw(std::move(lower), draw_buffer); } else { - draw(std::move(layers), *draw_buffer); + draw(std::move(layers), draw_buffer); } - auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only); - channel_.ogl().attach(*draw_buffer); + auto host_buffer = ogl_.create_host_buffer(format_desc_.size, host_buffer::read_only); + ogl_.attach(*draw_buffer); host_buffer->begin_read(draw_buffer->width(), draw_buffer->height(), format(draw_buffer->stride())); - active_buffer_ = draw_buffer; + transferring_buffer_ = std::move(draw_buffer); - channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock. + ogl_.flush(); // NOTE: This is important, otherwise fences will deadlock. return host_buffer; } - void draw(std::vector&& layers, - device_buffer& draw_buffer) + void draw(std::vector&& layers, + safe_ptr& draw_buffer) { std::shared_ptr layer_key_buffer; @@ -131,60 +130,105 @@ private: } void draw_layer(layer&& layer, - device_buffer& draw_buffer, + safe_ptr& draw_buffer, std::shared_ptr& layer_key_buffer) { - if(layer.items.empty()) + boost::remove_erase_if(layer.second, [](const item& item){return item.transform.field_mode == field_mode::empty;}); + + if(layer.second.empty()) return; std::shared_ptr local_key_buffer; + std::shared_ptr local_mix_buffer; - if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1) + if(layer.first != blend_mode::normal) { - auto layer_draw_buffer = create_device_buffer(4); - - BOOST_FOREACH(auto& item, layer.items) - draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer); - - render_item item; - item.pix_desc.pix_fmt = pixel_format::bgra; - item.pix_desc.planes = list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4)); - item.textures = list_of(layer_draw_buffer); - item.transform = frame_transform(); - item.blend_mode = layer.blend_mode; - - kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, nullptr, nullptr); + auto layer_draw_buffer = create_mixer_buffer(4); + + BOOST_FOREACH(auto& item, layer.second) + draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer); + + draw_mixer_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal); + draw_mixer_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first); } else // fast path { - BOOST_FOREACH(auto& item, layer.items) - draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer); + BOOST_FOREACH(auto& item, layer.second) + draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer); + + draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal); } - - std::swap(local_key_buffer, layer_key_buffer); + + layer_key_buffer = std::move(local_key_buffer); } - void draw_item(render_item&& item, - device_buffer& draw_buffer, + void draw_item(item&& item, + safe_ptr& draw_buffer, + std::shared_ptr& layer_key_buffer, std::shared_ptr& local_key_buffer, - std::shared_ptr& layer_key_buffer) - { + std::shared_ptr& local_mix_buffer) + { + draw_params draw_params; + draw_params.pix_desc = std::move(item.pix_desc); + draw_params.textures = std::move(item.textures); + draw_params.transform = std::move(item.transform); + if(item.transform.is_key) { - local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1); - kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer, nullptr, nullptr); + local_key_buffer = local_key_buffer ? local_key_buffer : create_mixer_buffer(1); + + draw_params.background = local_key_buffer; + draw_params.local_key = nullptr; + draw_params.layer_key = nullptr; + + kernel_.draw(ogl_, std::move(draw_params)); + } + else if(item.transform.is_mix) + { + local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_mixer_buffer(4); + + draw_params.background = local_mix_buffer; + draw_params.local_key = std::move(local_key_buffer); + draw_params.layer_key = layer_key_buffer; + + draw_params.keyer = keyer::additive; + + kernel_.draw(ogl_, std::move(draw_params)); } else { - kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer); - local_key_buffer = nullptr; + draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal); + + draw_params.background = draw_buffer; + draw_params.local_key = std::move(local_key_buffer); + draw_params.layer_key = layer_key_buffer; + + kernel_.draw(ogl_, std::move(draw_params)); } } + + void draw_mixer_buffer(safe_ptr& draw_buffer, + std::shared_ptr&& source_buffer, + blend_mode::type blend_mode = blend_mode::normal) + { + if(!source_buffer) + return; + + draw_params draw_params; + draw_params.pix_desc.pix_fmt = pixel_format::bgra; + draw_params.pix_desc.planes = list_of(pixel_format_desc::plane(source_buffer->width(), source_buffer->height(), 4)); + draw_params.textures = list_of(source_buffer); + draw_params.transform = frame_transform(); + draw_params.blend_mode = blend_mode; + draw_params.background = draw_buffer; + + kernel_.draw(ogl_, std::move(draw_params)); + } - safe_ptr create_device_buffer(size_t stride) + safe_ptr create_mixer_buffer(size_t stride) { - auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride); - channel_.ogl().clear(*buffer); + auto buffer = ogl_.create_device_buffer(format_desc_.width, format_desc_.height, stride); + ogl_.clear(*buffer); return buffer; } }; @@ -196,34 +240,31 @@ struct image_mixer::implementation : boost::noncopyable std::vector transform_stack_; std::vector layers_; // layer/stream/items public: - implementation(video_channel_context& video_channel) - : ogl_(video_channel.ogl()) - , renderer_(video_channel) + implementation(ogl_device& ogl, const video_format_desc& format_desc) + : ogl_(ogl) + , renderer_(ogl, format_desc) , transform_stack_(1) { } void begin_layer(blend_mode::type blend_mode) { - layers_.push_back(layer(blend_mode)); + layers_.push_back(std::make_pair(blend_mode, std::vector())); } - void begin(core::basic_frame& frame) + void begin(basic_frame& frame) { transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform()); } - void visit(core::write_frame& frame) + void visit(write_frame& frame) { - if(frame.get_frame_transform().field_mode == field_mode::empty) - return; - - core::render_item item; + item item; item.pix_desc = frame.get_pixel_format_desc(); item.textures = frame.get_textures(); item.transform = transform_stack_.back(); - layers_.back().items.push_back(item); + layers_.back().second.push_back(item); } void end() @@ -237,21 +278,21 @@ public: boost::unique_future> render() { - return renderer_.render(std::move(layers_)); + return renderer_(std::move(layers_)); } - safe_ptr create_frame(const void* tag, const core::pixel_format_desc& desc) + safe_ptr create_frame(const void* tag, const pixel_format_desc& desc) { return make_safe(ogl_, tag, desc); } }; -image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){} -void image_mixer::begin(core::basic_frame& frame){impl_->begin(frame);} -void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);} +image_mixer::image_mixer(ogl_device& ogl, const video_format_desc& format_desc) : impl_(new implementation(ogl, format_desc)){} +void image_mixer::begin(basic_frame& frame){impl_->begin(frame);} +void image_mixer::visit(write_frame& frame){impl_->visit(frame);} void image_mixer::end(){impl_->end();} boost::unique_future> image_mixer::render(){return impl_->render();} -safe_ptr image_mixer::create_frame(const void* tag, const core::pixel_format_desc& desc){return impl_->create_frame(tag, desc);} +safe_ptr image_mixer::create_frame(const void* tag, const pixel_format_desc& desc){return impl_->create_frame(tag, desc);} void image_mixer::begin_layer(blend_mode::type blend_mode){impl_->begin_layer(blend_mode);} void image_mixer::end_layer(){impl_->end_layer();} image_mixer& image_mixer::operator=(image_mixer&& other)