X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=35e95f0a34e1e75ad42b7a44709fab40b92e84e1;hb=580d5b82595893c83f7bf715c94de20b70745ae4;hp=9a5edc8805ff43b3c026917ce544da0410a73ec0;hpb=d06e831e868a26abee6d50e42bfca4af6ba5f063;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 9a5edc880..35e95f0a3 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,242 +20,287 @@
 #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/algorithm_ext/erase.hpp>
 
-#include <array>
-#include <unordered_map>
+#include <algorithm>
+#include <deque>
+
+using namespace boost::assign;
 
 namespace caspar { namespace core {
-		
-struct image_mixer::implementation : boost::noncopyable
-{	
-	static const size_t LOCAL_KEY_INDEX = 3;
-	static const size_t LAYER_KEY_INDEX = 4;
+	
+struct item
+{
+	pixel_format_desc						pix_desc;
+	std::vector<safe_ptr<device_buffer>>	textures;
+	frame_transform							transform;
+};
+
+struct layer
+{
+	std::vector<item>						items;
+	blend_mode::type						blend_mode;
 
-	struct render_item
+	layer(blend_mode::type blend_mode) : blend_mode(blend_mode)
 	{
-		pixel_format_desc					 desc;
-		std::vector<safe_ptr<device_buffer>> textures;
-		int									 tag;
-		core::image_transform				 transform;
-	};
+	}
+};
 
-	video_channel_context&					channel_;
+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)
+	{
+	}
 	
-	std::stack<core::image_transform>		transform_stack_;
-	std::queue<std::queue<render_item>>		render_queue_;
+	boost::unique_future<safe_ptr<host_buffer>> render(std::vector<layer>&& layers)
+	{		
+		auto layers2 = make_move_on_copy(std::move(layers));
+		return channel_.ogl().begin_invoke([=]
+		{
+			return do_render(std::move(layers2.value));
+		});
+	}
 	
-	image_kernel							kernel_;
-		
-	safe_ptr<host_buffer>					read_buffer_;
-	safe_ptr<device_buffer>					draw_buffer_;
-	safe_ptr<device_buffer>					write_buffer_;
+private:
+	safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)
+	{
+		auto draw_buffer = create_device_buffer(4);
 
-	safe_ptr<device_buffer>					local_key_buffer_;
-	safe_ptr<device_buffer>					layer_key_buffer_;
+		if(channel_.get_format_desc().field_mode != field_mode::progressive)
+		{
+			auto upper = layers;
+			auto lower = std::move(layers);
 
-	bool									local_key_;
-	bool									layer_key_;
-	
-public:
-	implementation(video_channel_context& video_channel) 
-		: channel_(video_channel)
-		, read_buffer_(video_channel.ogl().create_host_buffer(video_channel.get_format_desc().size, host_buffer::read_only))
-		, draw_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4))
-		, write_buffer_	(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 4))
-		, local_key_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1))
-		, layer_key_buffer_(video_channel.ogl().create_device_buffer(video_channel.get_format_desc().width, channel_.get_format_desc().height, 1))
-		, local_key_(false)
-		, layer_key_(false)
-	{
-		transform_stack_.push(core::image_transform());
+			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;
+			}
 
-		channel_.ogl().invoke([=]
+			draw(std::move(upper), draw_buffer);
+			draw(std::move(lower), draw_buffer);
+		}
+		else
 		{
-			if(!GLEE_VERSION_3_0)
-				CASPAR_LOG(warning) << "Missing OpenGL 3.0 support.";//BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));
-		});
-	}
+			draw(std::move(layers), draw_buffer);
+		}
 
-	void begin(const core::basic_frame& frame)
-	{
-		transform_stack_.push(transform_stack_.top()*frame.get_image_transform());
-	}
+		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()));
 		
-	void visit(core::write_frame& frame)
-	{			
-		render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), frame.tag(), transform_stack_.top()*frame.get_image_transform()};	
-		render_queue_.back().push(item);
-	}
+		active_buffer_ = draw_buffer;
 
-	void end()
-	{
-		transform_stack_.pop();
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_buffer;
 	}
 
-	void begin_layer()
+	void draw(std::vector<layer>&&		layers, 
+			  safe_ptr<device_buffer>&	draw_buffer)
 	{
-		render_queue_.push(std::queue<render_item>());
-	}
+		std::shared_ptr<device_buffer> layer_key_buffer;
 
-	void end_layer()
-	{
+		BOOST_FOREACH(auto& layer, layers)
+			draw_layer(std::move(layer), draw_buffer, layer_key_buffer);
 	}
 
-	void reinitialize_buffers()
-	{
-		read_buffer_	  = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);
-		draw_buffer_	  = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);
-		write_buffer_	  = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);
-		local_key_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);
-		layer_key_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);
-		channel_.ogl().gc();
-	}
+	void draw_layer(layer&&							layer, 
+					safe_ptr<device_buffer>&		draw_buffer,
+					std::shared_ptr<device_buffer>& layer_key_buffer)
+	{				
+		if(layer.items.empty())
+			return;
 
-	safe_ptr<host_buffer> render()
-	{		
-		auto read_buffer = read_buffer_;
-		auto result = channel_.ogl().begin_invoke([=]()  -> safe_ptr<host_buffer>
+		std::shared_ptr<device_buffer> local_key_buffer;
+		std::shared_ptr<device_buffer> local_mix_buffer;
+				
+		if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)
 		{
-			read_buffer->map();
-			return read_buffer;
-		});
+			auto layer_draw_buffer = create_device_buffer(4);
 
-		auto render_queue = std::move(render_queue_);
+			BOOST_FOREACH(auto& item, layer.items)
+				draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);	
+		
+			draw_device_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);							
+			draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.blend_mode);
+		}
+		else // fast path
+		{
+			BOOST_FOREACH(auto& item, layer.items)		
+				draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);		
+					
+			draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);
+		}					
+
+		std::swap(local_key_buffer, layer_key_buffer);
+	}
+
+	void draw_item(item&&							item, 
+				   safe_ptr<device_buffer>&			draw_buffer, 
+				   std::shared_ptr<device_buffer>&	layer_key_buffer, 
+				   std::shared_ptr<device_buffer>&	local_key_buffer, 
+				   std::shared_ptr<device_buffer>&	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);
 
-		channel_.ogl().begin_invoke([=]() mutable
+		if(item.transform.is_key)
 		{
-			if(draw_buffer_->width() != channel_.get_format_desc().width || draw_buffer_->height() != channel_.get_format_desc().height)
-				reinitialize_buffers();
+			local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);
 
-			local_key_ = false;
-			layer_key_ = false;
+			draw_params.background			= local_key_buffer;
+			draw_params.local_key			= nullptr;
+			draw_params.layer_key			= nullptr;
 
-			// Clear buffers.
-			local_key_buffer_->clear();
-			layer_key_buffer_->clear();
-			draw_buffer_->clear();
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}
+		else if(item.transform.is_mix)
+		{
+			local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_device_buffer(4);
 
-			// Draw items in device.
+			draw_params.background			= local_mix_buffer;
+			draw_params.local_key			= std::move(local_key_buffer);
+			draw_params.layer_key			= layer_key_buffer;
 
-			while(!render_queue.empty())
-			{
-				auto layer = render_queue.front();
-				render_queue.pop();
-				
-				draw_buffer_->attach();	
-				
-				while(!layer.empty())
-				{
-					// Split layer into streams
-					std::vector<render_item> stream;
-					do
-					{
-						stream.push_back(layer.front());
-						layer.pop();
-					}
-					while(!layer.empty() && layer.front().tag == stream.front().tag);
-
-					draw(stream);
-
-					channel_.ogl().yield(); // Allow quick buffer allocation to execute.
-				}
-
-				layer_key_ = local_key_; // If there was only key in last layer then use it as key for the entire next layer.
-				local_key_ = false;
-
-				std::swap(local_key_buffer_, layer_key_buffer_);
-			}
+			draw_params.keyer				= keyer::additive;
 
-			std::swap(draw_buffer_, write_buffer_);
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}
+		else
+		{
+			draw_device_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;
 
-			// Start transfer from device to host.	
-			read_buffer_ = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);					
-			write_buffer_->write(*read_buffer_);
-		});
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}	
+	}
 
-		return std::move(result.get());
+	void draw_device_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& 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(channel_.ogl(), std::move(draw_params));
 	}
-	
-	void draw(const std::vector<render_item>& stream)
-	{	
-		if(stream.empty())
-			return;				
+			
+	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;
+	}
+};
 		
-		BOOST_FOREACH(auto item, stream)
-		{
-			bool local_key = false;
-			bool layer_key = false;
+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)	
+	{
+	}
 
-			// Setup key and kernel
-					
-			if(item.transform.get_is_key()) // This is a key frame, render it to the local_key buffer for later use.
-			{
-				if(!local_key_) // Initialize local-key if it is not active.
-				{
-					local_key_buffer_->clear();
-					local_key_buffer_->attach();
-					local_key_ = true;
-				}
-			}		
-			else // This is a normal frame. Use key buffers if they are active.
-			{		
-				local_key = local_key_;
-				layer_key = layer_key_;
-
-				if(local_key_) // Use local key if we have it.
-				{
-					local_key_buffer_->bind(LOCAL_KEY_INDEX);
-					draw_buffer_->attach();	
-				}		
-
-				if(layer_key_) // Use layer key if we have it.
-					layer_key_buffer_->bind(LAYER_KEY_INDEX);
-			}	
-
-			// Bind textures
-
-			for(size_t n = 0; n < item.textures.size(); ++n)
-				item.textures[n]->bind(n);		
-			
-			// Draw
+	void begin_layer(blend_mode::type blend_mode)
+	{
+		layers_.push_back(layer(blend_mode));
+	}
+		
+	void begin(core::basic_frame& frame)
+	{
+		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;
 
-			kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item.desc, item.transform, local_key, layer_key);	
-		}
+		item item;
+		item.pix_desc	= frame.get_pixel_format_desc();
+		item.textures	= frame.get_textures();
+		item.transform	= transform_stack_.back();
 
-		local_key_ = stream.back().transform.get_is_key(); // Keep for next layer if last frame is key
+		layers_.back().items.push_back(item);
 	}
-			
-	safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& desc)
+
+	void end()
+	{
+		transform_stack_.pop_back();
+	}
+
+	void end_layer()
+	{		
+	}
+	
+	boost::unique_future<safe_ptr<host_buffer>> render()
+	{
+		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(), reinterpret_cast<int>(tag), desc);
+		return make_safe<write_frame>(ogl_, tag, desc);
 	}
 };
 
 image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}
-void image_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}
+void image_mixer::begin(core::basic_frame& frame){impl_->begin(frame);}
 void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}
 void image_mixer::end(){impl_->end();}
-safe_ptr<host_buffer> image_mixer::render(){return impl_->render();}
-safe_ptr<write_frame> image_mixer::create_frame(void* tag, const core::pixel_format_desc& desc){return impl_->create_frame(tag, desc);}
-void image_mixer::begin_layer(){impl_->begin_layer();}
+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(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)
 {