X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=302d7af5e681f458c788391871cb0cf41abf5356;hb=134faacd0105bffe3bd051d708f175010dd1e9b8;hp=c01e801b9833f1a022ad2869bdb5fa5900715b9a;hpb=06fe3a65d33c88522556f7a36ac2951d62ddf31e;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index c01e801b9..302d7af5e 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,118 +20,103 @@
 #include "../../stdafx.h"
 
 #include "image_mixer.h"
-#include "image_kernel.h"
 
+#include "image_kernel.h"
+#include "../write_frame.h"
 #include "../gpu/ogl_device.h"
 #include "../gpu/host_buffer.h"
 #include "../gpu/device_buffer.h"
-#include "../write_frame.h"
-
 #include "../../video_channel_context.h"
 
-#include <common/concurrency/executor.h>
 #include <common/exception/exceptions.h>
 #include <common/gl/gl_check.h>
+#include <common/utility/move_on_copy.h>
 
-#include <core/producer/frame/image_transform.h>
+#include <core/producer/frame/frame_transform.h>
 #include <core/producer/frame/pixel_format.h>
 #include <core/video_format.h>
 
 #include <gl/glew.h>
 
 #include <boost/foreach.hpp>
-#include <boost/range.hpp>
-#include <boost/range/algorithm/find.hpp>
+#include <boost/range/algorithm_ext/erase.hpp>
 
 #include <algorithm>
-#include <array>
 #include <deque>
-#include <unordered_map>
-
-namespace caspar { namespace core {
-		
-struct image_mixer::implementation : boost::noncopyable
-{		
-	typedef std::deque<render_item>			layer;
-
-	video_channel_context&					channel_;
-
-	std::vector<image_transform>			transform_stack_;
-	std::vector<video_mode::type>			mode_stack_;
-
-	std::deque<std::deque<render_item>>		layers_; // layer/stream/items
-	
-	image_kernel							kernel_;		
 
-	std::shared_ptr<device_buffer>			active_buffer_;
-public:
-	implementation(video_channel_context& video_channel) 
-		: channel_(video_channel)
-		, transform_stack_(1)
-		, mode_stack_(1, video_mode::progressive)
-	{
-	}
+using namespace boost::assign;
 
-	~implementation()
-	{
-		channel_.ogl().gc();
-	}
+namespace caspar { namespace core {
 	
-	void begin(core::basic_frame& frame)
-	{
-		transform_stack_.push_back(transform_stack_.back()*frame.get_image_transform());
-		mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? mode_stack_.back() : frame.get_mode());
-	}
-		
-	void visit(core::write_frame& frame)
-	{	
-		CASPAR_ASSERT(!layers_.empty());
-
-		// Check if frame has been discarded by interlacing
-		if(boost::range::find(mode_stack_, video_mode::upper) != mode_stack_.end() && boost::range::find(mode_stack_, video_mode::lower) != mode_stack_.end())
-			return;
-		
-		core::render_item item(frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.back(), mode_stack_.back(), frame.tag());	
-
-		auto& layer = layers_.back();
-
-		if(boost::range::find(layer, item) == layer.end())
-			layer.push_back(item);
-	}
+struct item
+{
+	pixel_format_desc						pix_desc;
+	std::vector<safe_ptr<device_buffer>>	textures;
+	frame_transform							transform;
+};
 
-	void end()
-	{
-		transform_stack_.pop_back();
-		mode_stack_.pop_back();
-	}
+struct layer
+{
+	std::vector<item>						items;
+	blend_mode::type						blend_mode;
 
-	void begin_layer()
+	layer(blend_mode::type blend_mode) : blend_mode(blend_mode)
 	{
-		layers_.push_back(layer());
 	}
+};
 
-	void end_layer()
+class image_renderer
+{
+	video_channel_context&					channel_;	
+	image_kernel							kernel_;	
+	std::shared_ptr<device_buffer>			active_buffer_;
+public:
+	image_renderer(video_channel_context& channel)
+		: channel_(channel)
 	{
 	}
 	
-	boost::unique_future<safe_ptr<host_buffer>> render()
+	boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)
 	{		
-		auto layers = std::move(layers_);
-		return channel_.ogl().begin_invoke([=]() mutable
+		auto layers2 = make_move_on_copy(std::move(layers));
+		return channel_.ogl().begin_invoke([=]
 		{
-			return render(std::move(layers));
+			return do_render(std::move(layers2.value));
 		});
 	}
 	
-	safe_ptr<host_buffer> render(std::deque<layer>&& layers)
+private:
+	safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)
 	{
-		std::shared_ptr<device_buffer> layer_key_buffer;
-
 		auto draw_buffer = create_device_buffer(4);
-				
-		BOOST_FOREACH(auto& layer, layers)
-			draw(std::move(layer), draw_buffer, layer_key_buffer);
-		
+
+		if(channel_.get_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 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& layer, lower)
+			{
+				boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});
+				BOOST_FOREACH(auto& item, layer.items)
+					item.transform.field_mode = field_mode::lower;
+			}
+
+			draw(std::move(upper), draw_buffer);
+			draw(std::move(lower), draw_buffer);
+		}
+		else
+		{
+			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);
 		host_buffer->begin_read(draw_buffer->width(), draw_buffer->height(), format(draw_buffer->stride()));
@@ -143,134 +128,143 @@ public:
 		return host_buffer;
 	}
 
-	// TODO: We might have more overlaps for opacity transitions
-	// TODO: What about blending modes, are they ok? Maybe only overlap detection is required for opacity?
-	void draw(layer&& layer, const safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>& layer_key_buffer)
+	void draw(std::vector<layer>&&		layers, 
+			  safe_ptr<device_buffer>&	draw_buffer)
+	{
+		std::shared_ptr<device_buffer> layer_key_buffer;
+
+		BOOST_FOREACH(auto& layer, layers)
+			draw_layer(std::move(layer), draw_buffer, layer_key_buffer);
+	}
+
+	void draw_layer(layer&&							layer, 
+					safe_ptr<device_buffer>&		draw_buffer,
+					std::shared_ptr<device_buffer>& layer_key_buffer)
 	{				
-		if(layer.empty())
+		if(layer.items.empty())
 			return;
 
-		std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer;
-					
-		if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))
+		std::shared_ptr<device_buffer> local_key_buffer;
+				
+		if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)
 		{
-			auto local_draw_buffer = create_device_buffer(4);	
-
-			int mode = 0;
-			BOOST_FOREACH(auto& item, layer)
-			{
-				if(mode & item.mode)
-					item.transform.set_blend_mode(image_transform::blend_mode::normal); // Disable blending, it will be used when merging back into render stack.
-				else
-				{
-					item.transform.set_blend_mode(image_transform::blend_mode::replace); // Target field is empty, no blending
-					mode |= item.mode;
-				}
-
-				draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer);		
-			}
-
-			kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), draw_buffer, nullptr, nullptr);
+			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);		
+						
+			draw_params draw_params;
+			draw_params.pix_desc.pix_fmt	= pixel_format::bgra;
+			draw_params.pix_desc.planes		= list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));
+			draw_params.textures			= list_of(layer_draw_buffer);
+			draw_params.transform			= frame_transform();
+			draw_params.blend_mode			= layer.blend_mode;
+			draw_params.background			= draw_buffer;
+
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
 		}
 		else // fast path
 		{
-			BOOST_FOREACH(auto& item, layer)		
+			BOOST_FOREACH(auto& item, layer.items)		
 				draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);		
 		}					
-
-		CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::video_mode::progressive);
-
-		std::swap(local_key_buffer.second, layer_key_buffer);
+		
+		std::swap(local_key_buffer, layer_key_buffer);
 	}
 
-	void draw_item(render_item&&									item, 
-				   const safe_ptr<device_buffer>&					draw_buffer, 
-				   std::pair<int, std::shared_ptr<device_buffer>>&	local_key_buffer, 
-				   std::shared_ptr<device_buffer>&					layer_key_buffer)
-	{											
-		if(item.transform.get_is_key())
+	void draw_item(item&&							item, 
+				   safe_ptr<device_buffer>&			draw_buffer, 
+				   std::shared_ptr<device_buffer>&	local_key_buffer, 
+				   std::shared_ptr<device_buffer>&	layer_key_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);
+		draw_params.blend_mode				= blend_mode::normal;
+
+		if(item.transform.is_key)
 		{
-			if(!local_key_buffer.second)
-			{
-				local_key_buffer.first = 0;
-				local_key_buffer.second = create_device_buffer(1);
-			}
+			local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);
 
-			// No transparency for key
-			item.transform.set_opacity(1.0);
-			item.transform.set_blend_mode(image_transform::blend_mode::normal);
+			draw_params.background			= local_key_buffer;
+			draw_params.local_key			= nullptr;
+			draw_params.layer_key			= nullptr;
 
-			local_key_buffer.first |= item.mode;
-			kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer.second), nullptr, nullptr);
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
 		}
 		else
 		{
-			kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);
-			local_key_buffer.first ^= item.mode;
+			draw_params.background			= draw_buffer;
+			draw_params.local_key			= std::move(local_key_buffer);
+			draw_params.layer_key			= layer_key_buffer;
+
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}	
+	}
 			
-			if(local_key_buffer.first == 0)
-			{
-				local_key_buffer.first = 0;
-				local_key_buffer.second.reset();
-			}
-		}
+	safe_ptr<device_buffer> create_device_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);
+		return buffer;
+	}
+};
+		
+struct image_mixer::implementation : boost::noncopyable
+{	
+	ogl_device&						ogl_;
+	image_renderer					renderer_;
+	std::vector<frame_transform>	transform_stack_;
+	std::vector<layer>				layers_; // layer/stream/items
+public:
+	implementation(video_channel_context& video_channel) 
+		: ogl_(video_channel.ogl())
+		, renderer_(video_channel)
+		, transform_stack_(1)	
+	{
 	}
 
-	// TODO: Optimize
-	bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)
+	void begin_layer(blend_mode::type blend_mode)
 	{
-		if(layer.size() < 2)
-			return false;	
+		layers_.push_back(layer(blend_mode));
+	}
 		
-		implementation::layer fill;
-
-		std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)
-		{
-			return !item.transform.get_is_key();
-		});
-			
-		if(blend_mode == image_transform::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;
-		});
-	}			
-			
-	render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)
+	void begin(core::basic_frame& frame)
 	{
-		CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");
+		transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform());
+	}
+		
+	void visit(core::write_frame& frame)
+	{			
+		if(frame.get_frame_transform().field_mode == field_mode::empty)
+			return;
 
-		pixel_format_desc desc;
-		desc.pix_fmt = pixel_format::bgra;
-		desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));
+		item item;
+		item.pix_desc	= frame.get_pixel_format_desc();
+		item.textures	= frame.get_textures();
+		item.transform	= transform_stack_.back();
 
-		std::vector<safe_ptr<device_buffer>> textures;
-		textures.push_back(buffer);
-				
-		image_transform transform;
-		transform.set_blend_mode(blend_mode);
+		layers_.back().items.push_back(item);
+	}
 
-		return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr);		 
+	void end()
+	{
+		transform_stack_.pop_back();
 	}
 
-	safe_ptr<device_buffer> create_device_buffer(size_t stride)
+	void end_layer()
+	{		
+	}
+	
+	boost::unique_future<safe_ptr<host_buffer>> render()
 	{
-		auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);
-		channel_.ogl().clear(*buffer);
-		return buffer;
+		return renderer_.render(std::move(layers_));
 	}
 
 	safe_ptr<write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)
 	{
-		return make_safe<write_frame>(channel_.ogl(), tag, desc);
+		return make_safe<write_frame>(ogl_, tag, desc);
 	}
 };
 
@@ -280,7 +274,7 @@ void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}
 void image_mixer::end(){impl_->end();}
 boost::unique_future<safe_ptr<host_buffer>> image_mixer::render(){return impl_->render();}
 safe_ptr<write_frame> image_mixer::create_frame(const void* tag, const core::pixel_format_desc& desc){return impl_->create_frame(tag, desc);}
-void image_mixer::begin_layer(){impl_->begin_layer();}
+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)
 {