X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=941e28d6c58fbbe18dd1c16af9671678bc07b915;hb=a486c25d5e6ce0ebe08e9a2d793a447ff3cb797a;hp=bb196fe286f434af14113a1ef5aba237ce7bbc36;hpb=c9f71981bb6fb7d78f2b90349a74883e849e1632;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index bb196fe28..941e28d6c 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,225 +20,235 @@
 #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 <array>
-#include <unordered_map>
+#include <algorithm>
+#include <deque>
 
-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;
+using namespace boost::assign;
 
-	struct render_item
-	{
-		pixel_format_desc					 desc;
-		std::vector<safe_ptr<device_buffer>> textures;
-		core::image_transform				 transform;
-	};
-
-	video_channel_context&					channel_;
-	
-	std::stack<core::image_transform>		transform_stack_;
-	std::queue<std::queue<render_item>>		render_queue_;
+namespace caspar { namespace core {
 	
-	image_kernel							kernel_;
-		
-	safe_ptr<host_buffer>					read_buffer_;
-	safe_ptr<device_buffer>					draw_buffer_;
-	safe_ptr<device_buffer>					write_buffer_;
+struct layer
+{
+	std::vector<render_item> items;
+	blend_mode::type		 blend_mode;
 
-	safe_ptr<device_buffer>					local_key_buffer_;
-	safe_ptr<device_buffer>					layer_key_buffer_;
+	layer(blend_mode::type blend_mode) : blend_mode(blend_mode)
+	{
+	}
+};
 
-	bool									local_key_;
-	bool									layer_key_;
-	
+class image_renderer
+{
+	video_channel_context&					channel_;	
+	image_kernel							kernel_;	
+	std::shared_ptr<device_buffer>			active_buffer_;
 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)
+	image_renderer(video_channel_context& channel)
+		: channel_(channel)
 	{
-		transform_stack_.push(core::image_transform());
-
-		channel_.ogl().invoke([=]
+	}
+	
+	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([=]
 		{
-			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."));
+			return do_render(std::move(layers2.value));
 		});
 	}
 	
-	void begin(const core::basic_frame& frame)
+private:
+	safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)
 	{
-		transform_stack_.push(transform_stack_.top()*frame.get_image_transform());
-	}
-		
-	void visit(core::write_frame& frame)
-	{			
-		render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.top()*frame.get_image_transform()};	
-		render_queue_.back().push(item);
-	}
+		std::shared_ptr<device_buffer> layer_key_buffer;
 
-	void end()
-	{
-		transform_stack_.pop();
-	}
-
-	void begin_layer()
-	{
-		render_queue_.push(std::queue<render_item>());
-	}
+		auto draw_buffer = create_device_buffer(4);
+				
+		BOOST_FOREACH(auto& layer, layers)
+			draw_layer(std::move(layer), draw_buffer, layer_key_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()));
+		
+		active_buffer_ = draw_buffer;
 
-	void end_layer()
-	{
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_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, const 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::pair<int, std::shared_ptr<device_buffer>> local_key_buffer = std::make_pair(0, nullptr); // int is fields flag
+				
+		if(layer.blend_mode != blend_mode::normal && has_overlapping_items(layer))
 		{
-			read_buffer->map();
-			return read_buffer;
-		});
-
-		auto render_queue = std::move(render_queue_);
-
-		channel_.ogl().begin_invoke([=]() mutable
+			auto layer_draw_buffer = create_device_buffer(4); // int is fields flag
+
+			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);
+		}
+		else // fast path
 		{
-			if(draw_buffer_->width() != channel_.get_format_desc().width || draw_buffer_->height() != channel_.get_format_desc().height)
-				reinitialize_buffers();
-
-			local_key_ = false;
-			layer_key_ = false;
+			BOOST_FOREACH(auto& item, layer.items)		
+				draw_item(std::move(item), *draw_buffer, local_key_buffer, layer_key_buffer);		
+		}					
 
-			// Clear buffers.
-			local_key_buffer_->clear();
-			layer_key_buffer_->clear();
-			draw_buffer_->clear();
+		CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::field_mode::progressive);
 
-			// Draw items in device.
+		std::swap(local_key_buffer.second, layer_key_buffer);
+	}
 
-			while(!render_queue.empty())
+	void draw_item(render_item&&									item, 
+				   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.is_key)
+		{
+			if(!local_key_buffer.second)
 			{
-				auto layer = render_queue.front();
-				render_queue.pop();
-				
-				draw_buffer_->attach();	
-
-				while(!layer.empty())
-				{
-					draw(layer.front());
-					layer.pop();
-					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_);
+				local_key_buffer.first = 0;
+				local_key_buffer.second = create_device_buffer(1);
 			}
+			
+			local_key_buffer.first |= item.transform.field_mode; // Add field to flag.
+			kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer.second, nullptr, nullptr);
+		}
+		else
+		{
+			kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);
+			local_key_buffer.first ^= item.transform.field_mode; // Remove field from flag.
+			
+			if(local_key_buffer.first == 0) // If all fields from key has been used, reset it
+			{
+				local_key_buffer.first = 0;
+				local_key_buffer.second.reset();
+			}
+		}
+	}
 
-			std::swap(draw_buffer_, write_buffer_);
+	bool has_overlapping_items(const layer& layer)
+	{		
+		auto upper_count = boost::range::count_if(layer.items, [&](const render_item& item)
+		{
+			return !item.transform.is_key && (item.transform.field_mode & field_mode::upper);
+		});
 
-			// 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_);
+		auto lower_count = boost::range::count_if(layer.items, [&](const render_item& item)
+		{
+			return  !item.transform.is_key && (item.transform.field_mode & field_mode::lower);
 		});
 
-		return std::move(result.get());
+		return upper_count > 1 || lower_count > 1;
+	}			
+		
+	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;
 	}
-	
-	void draw(const render_item& item)
-	{		
-		// Bind textures
-
-		for(size_t n = 0; n < item.textures.size(); ++n)
-			item.textures[n]->bind(n);		
-
-		// Setup key and kernel
+};
 
-		bool local_key = false;
-		bool layer_key = false;
 		
-		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_;
+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)	
+	{
+	}
 
-			if(local_key_) // Use local key if we have it.
-			{
-				local_key_buffer_->bind(LOCAL_KEY_INDEX);
-				draw_buffer_->attach();	
-				local_key_ = false; // Use it only one time.
-			}		
+	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(transform_stack_.back().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();
 
-			if(layer_key_) // Use layer key if we have it.
-				layer_key_buffer_->bind(LAYER_KEY_INDEX);
-		}	
+		layers_.back().items.push_back(item);
+	}
 
-		// Draw
+	void end()
+	{
+		transform_stack_.pop_back();
+	}
 
-		kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item.desc, item.transform, local_key, layer_key);	
+	void end_layer()
+	{		
 	}
-			
-	safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& desc)
+	
+	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)
 {