From: Ronag Date: Sun, 21 Aug 2011 11:29:47 +0000 (+0000) Subject: 2.0. image_mixer: Refactored. X-Git-Tag: 2.0.1~96 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=58ec9bfbfa588d5597f22a6ff02e20d74224837c;p=casparcg 2.0. image_mixer: Refactored. git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1244 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp index b4505d065..2765f09b9 100644 --- a/core/mixer/image/image_kernel.cpp +++ b/core/mixer/image/image_kernel.cpp @@ -249,7 +249,7 @@ void image_kernel::draw(ogl_device& ogl, bool operator==(const render_item& lhs, const render_item& rhs) { - return lhs.textures == rhs.textures && lhs.transform == rhs.transform && lhs.tag == rhs.tag; + return lhs.textures == rhs.textures && lhs.transform == rhs.transform; } }} \ No newline at end of file diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h index 6b0fd32ef..ea81f75a8 100644 --- a/core/mixer/image/image_kernel.h +++ b/core/mixer/image/image_kernel.h @@ -38,7 +38,6 @@ struct render_item pixel_format_desc pix_desc; std::vector> textures; image_transform transform; - const void* tag; blend_mode::type blend_mode; }; diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp index 906ceea5a..0877430de 100644 --- a/core/mixer/image/image_mixer.cpp +++ b/core/mixer/image/image_mixer.cpp @@ -48,82 +48,34 @@ #include #include -namespace caspar { namespace core { - -struct image_mixer::implementation : boost::noncopyable -{ - typedef std::deque layer; - - video_channel_context& channel_; - - std::vector transform_stack_; - std::stack blend_mode_stack_; +using namespace boost::assign; - std::deque> layers_; // layer/stream/items +namespace caspar { namespace core { - image_kernel kernel_; +typedef std::deque layer; +class image_renderer +{ + video_channel_context& channel_; + image_kernel kernel_; std::shared_ptr active_buffer_; public: - implementation(video_channel_context& video_channel) - : channel_(video_channel) - , transform_stack_(1) + image_renderer(video_channel_context& channel) + : channel_(channel) { } - - ~implementation() - { - channel_.ogl().gc(); - } - void begin(core::basic_frame& frame) - { - transform_stack_.push_back(transform_stack_.back()*frame.get_image_transform()); - } - - void visit(core::write_frame& frame) - { - if(transform_stack_.back().get_field_mode() == field_mode::empty) - return; - - core::render_item item; - item.pix_desc = frame.get_pixel_format_desc(); - item.textures = frame.get_textures(); - item.transform = transform_stack_.back(); - item.tag = frame.tag(); - item.blend_mode = blend_mode_stack_.top(); - - auto& layer = layers_.back(); - if(boost::range::find(layer, item) == layer.end()) - layer.push_back(item); - } - - void end() - { - transform_stack_.pop_back(); - } - - void begin_layer(blend_mode::type blend_mode) - { - blend_mode_stack_.push(blend_mode); - layers_.push_back(layer()); - } - - void end_layer() - { - blend_mode_stack_.pop(); - } - - boost::unique_future> render() + boost::unique_future> render(std::deque&& layers) { - auto layers = std::move(layers_); + auto layers2 = std::move(layers); return channel_.ogl().begin_invoke([=]() mutable { - return render(std::move(layers)); + return do_render(std::move(layers2)); }); } - safe_ptr render(std::deque&& layers) +private: + safe_ptr do_render(std::deque&& layers) { std::shared_ptr layer_key_buffer; @@ -152,30 +104,31 @@ public: std::pair> local_key_buffer; - if(has_overlapping_items(layer, layer.front().blend_mode)) + if(layer.front().blend_mode != blend_mode::normal && has_overlapping_items(layer)) { - auto local_draw_buffer = create_device_buffer(4); - auto local_blend_mode = layer.front().blend_mode; + auto layer_draw_buffer = create_device_buffer(4); + auto layer_blend_mode = layer.front().blend_mode; int fields = 0; BOOST_FOREACH(auto& item, layer) { if(fields & item.transform.get_field_mode()) - item.blend_mode = blend_mode::normal; // Disable blending, it will be used when merging back into render stack. + item.blend_mode = blend_mode::normal; // Disable blending and just merge, it will be used when merging back into render stack. else { item.blend_mode = blend_mode::replace; // Target field is empty, no blending, just copy fields |= item.transform.get_field_mode(); } - draw_item(std::move(item), *local_draw_buffer, local_key_buffer, layer_key_buffer); + 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.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4)); - item.textures.push_back(local_draw_buffer); - item.blend_mode = local_blend_mode; + 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 = image_transform(); + item.blend_mode = layer_blend_mode; kernel_.draw(channel_.ogl(), std::move(item), *draw_buffer, nullptr, nullptr); } @@ -219,38 +172,25 @@ public: } } - //// TODO: Optimize - bool has_overlapping_items(const layer& layer, blend_mode::type blend_mode) + bool has_overlapping_items(const layer& layer) { if(layer.size() < 2) return false; - if(blend_mode == blend_mode::normal) - return false; - - return std::any_of(layer.begin(), layer.end(), [&](const render_item& item) + auto upper_count = boost::range::count_if(layer, [&](const render_item& item) + { + return item.transform.get_field_mode() | field_mode::upper; + }); + + auto lower_count = boost::range::count_if(layer, [&](const render_item& item) { - return item.tag != layer.front().tag; + return item.transform.get_field_mode() | field_mode::lower; }); - //std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item) - //{ - // return !item.transform.get_is_key(); - //}); - // - //if(blend_mode == blend_mode::normal) // only overlap if opacity - //{ - // return std::any_of(fill.begin(), fill.end(), [&](const render_item& item) - // { - // return item.transform.get_opacity() < 1.0 - 0.001; - // }); - //} - - //// simple solution, just check if we have differnt video streams / tags. - //return std::any_of(fill.begin(), fill.end(), [&](const render_item& item) - //{ - // return item.tag != fill.front().tag; - //}); + if(upper_count < 2 && lower_count < 2) + return false; + + return true; } safe_ptr create_device_buffer(size_t stride) @@ -259,10 +199,67 @@ public: channel_.ogl().clear(*buffer); return buffer; } +}; + + +struct image_mixer::implementation : boost::noncopyable +{ + ogl_device& ogl_; + image_renderer renderer_; + std::vector transform_stack_; + blend_mode::type active_blend_mode_; + std::deque> layers_; // layer/stream/items +public: + implementation(video_channel_context& video_channel) + : ogl_(video_channel.ogl()) + , renderer_(video_channel) + , transform_stack_(1) + , active_blend_mode_(blend_mode::normal) + { + } + + void begin_layer(blend_mode::type blend_mode) + { + active_blend_mode_ = blend_mode; + layers_ += layer(); + } + + void begin(core::basic_frame& frame) + { + transform_stack_.push_back(transform_stack_.back()*frame.get_image_transform()); + } + + void visit(core::write_frame& frame) + { + if(transform_stack_.back().get_field_mode() == field_mode::empty) + return; + + core::render_item item; + item.pix_desc = frame.get_pixel_format_desc(); + item.textures = frame.get_textures(); + item.transform = transform_stack_.back(); + item.blend_mode = active_blend_mode_; + + layers_.back() += item; + } + + void end() + { + transform_stack_.pop_back(); + } + + void end_layer() + { + } + + boost::unique_future> render() + { + return renderer_.render(std::move(layers_)); + } safe_ptr create_frame(const void* tag, const core::pixel_format_desc& desc) { - return make_safe(channel_.ogl(), tag, desc); + return make_safe(ogl_, tag, desc); } }; diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h index 3939157dc..03b03d3b6 100644 --- a/modules/decklink/interop/DeckLinkAPI_h.h +++ b/modules/decklink/interop/DeckLinkAPI_h.h @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 7.00.0555 */ -/* at Thu Aug 18 20:53:57 2011 +/* at Fri Aug 19 23:43:33 2011 */ /* Compiler settings for interop\DeckLinkAPI.idl: Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c index 0d54c148d..d90511728 100644 --- a/modules/decklink/interop/DeckLinkAPI_i.c +++ b/modules/decklink/interop/DeckLinkAPI_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0555 */ -/* at Thu Aug 18 20:53:57 2011 +/* at Fri Aug 19 23:43:33 2011 */ /* Compiler settings for interop\DeckLinkAPI.idl: Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555