X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=363f47aa3f1dbd33f3a2eafbaaefe1b9cfa36835;hb=cb83cd412f95b6eb67fb7916f7ba8e9717a78fb2;hp=8e9c05f88c061b7367fe2ba9d4c35dc0f16d6482;hpb=56fc1394d2a481b3035f41868d38d0eac27a36f5;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 8e9c05f88..363f47aa3 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -37,186 +37,222 @@
 #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 <algorithm>
 #include <array>
+#include <deque>
 #include <unordered_map>
 
+using namespace boost::assign;
+
 namespace caspar { namespace core {
-		
-struct render_item
-{
-	pixel_format_desc					 desc;
-	std::vector<safe_ptr<device_buffer>> textures;
-	core::image_transform				 transform;
-	int									 tag;
-};
+	
+typedef std::deque<render_item>				layer;
 
-struct image_mixer::implementation : boost::noncopyable
-{	
-	static const size_t LOCAL_KEY_INDEX = 3;
-	static const size_t LAYER_KEY_INDEX = 4;
+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)
+	{
+	}
 	
-	video_channel_context&					channel_;
+	boost::unique_future<safe_ptr<host_buffer>> render(std::deque<layer>&& layers)
+	{		
+		auto layers2 = std::move(layers);
+		return channel_.ogl().begin_invoke([=]() mutable
+		{
+			return do_render(std::move(layers2));
+		});
+	}
 	
-	std::stack<core::image_transform>		transform_stack_;
+private:
+	safe_ptr<host_buffer> do_render(std::deque<layer>&& layers)
+	{
+		std::shared_ptr<device_buffer> layer_key_buffer;
 
-	std::queue<std::queue<std::queue<render_item>>>	render_queue_; // layer/stream/items
-	
-	image_kernel							kernel_;
+		auto draw_buffer = create_device_buffer(4);
+				
+		BOOST_FOREACH(auto& layer, layers)
+			draw(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()));
 		
-	safe_ptr<device_buffer>					draw_buffer_;
-	safe_ptr<device_buffer>					write_buffer_;
+		active_buffer_ = draw_buffer;
 
-	safe_ptr<device_buffer>					stream_key_buffer_;
-	safe_ptr<device_buffer>					layer_key_buffer_;
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_buffer;
+	}
 
-	bool									local_key_;
-	bool									layer_key_;
-	
-public:
-	implementation(video_channel_context& video_channel) 
-		: channel_(video_channel)
-		, 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))
-		, stream_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());
+	// 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)
+	{				
+		if(layer.empty())
+			return;
 
-		channel_.ogl().invoke([=]
+		std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer; // int is fields flag
+				
+		if(layer.front().blend_mode != blend_mode::normal && has_overlapping_items(layer))
 		{
-			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."));
-		});
+			auto layer_draw_buffer = std::make_pair(0, create_device_buffer(4)); // int is fields flag
+			auto layer_blend_mode = layer.front().blend_mode;
+
+			BOOST_FOREACH(auto& item, layer)
+			{
+				if(layer_draw_buffer.first & item.transform.get_field_mode())
+					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
+					layer_draw_buffer.first |= item.transform.get_field_mode();
+				}
+
+				draw_item(std::move(item), *layer_draw_buffer.second, 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.second);
+			item.transform			= image_transform();
+			item.blend_mode			= layer_blend_mode;
+
+			kernel_.draw(channel_.ogl(), std::move(item), *draw_buffer, nullptr, nullptr);
+		}
+		else // fast path
+		{
+			BOOST_FOREACH(auto& item, layer)		
+				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::field_mode::progressive);
+
+		std::swap(local_key_buffer.second, layer_key_buffer);
 	}
 
-	void begin(core::basic_frame& frame)
-	{
-		transform_stack_.push(transform_stack_.top()*frame.get_image_transform());
+	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.get_is_key())
+		{
+			if(!local_key_buffer.second)
+			{
+				local_key_buffer.first = 0;
+				local_key_buffer.second = create_device_buffer(1);
+			}
+			
+			local_key_buffer.first |= item.transform.get_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.get_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();
+			}
+		}
 	}
-		
-	void visit(core::write_frame& frame)
-	{			
-		render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.top()*frame.get_image_transform(), frame.tag()};	
 
-		auto& layer = render_queue_.back();
+	bool has_overlapping_items(const layer& layer)
+	{		
+		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.transform.get_field_mode() | field_mode::lower;
+		});
 
-		if(layer.empty() || (!layer.back().empty() && layer.back().back().tag != frame.tag()))
-			layer.push(std::queue<render_item>());
+		return upper_count > 1 || lower_count > 1;
+	}			
 		
-		layer.back().push(item);
+	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 end()
+		
+struct image_mixer::implementation : boost::noncopyable
+{	
+	ogl_device&								ogl_;
+	image_renderer							renderer_;
+	std::vector<image_transform>			transform_stack_;
+	blend_mode::type						active_blend_mode_;
+	std::deque<std::deque<render_item>>		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)		
 	{
-		transform_stack_.pop();
 	}
 
-	void begin_layer()
+	void begin_layer(blend_mode::type blend_mode)
 	{
-		render_queue_.push(std::queue<std::queue<render_item>>());
+		active_blend_mode_ = blend_mode;
+		layers_ += layer();
 	}
-
-	void end_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 reinitialize_buffers()
+	void end()
 	{
-		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);
-		stream_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();
+		transform_stack_.pop_back();
 	}
 
-	safe_ptr<host_buffer> render()
+	void end_layer()
 	{		
-		auto render_queue = std::move(render_queue_);
-
-		return channel_.ogl().invoke([=]() mutable -> safe_ptr<host_buffer>
-		{
-			if(draw_buffer_->width() != channel_.get_format_desc().width || draw_buffer_->height() != channel_.get_format_desc().height)
-				reinitialize_buffers();
-			
-			return do_render(std::move(render_queue));
-		});
 	}
 	
-	safe_ptr<host_buffer> do_render(std::queue<std::queue<std::queue<render_item>>>&& render_queue)
+	boost::unique_future<safe_ptr<host_buffer>> render()
 	{
-		auto read_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);
-
-		layer_key_buffer_->clear();
-		draw_buffer_->clear();
-
-		while(!render_queue.empty())
-		{			
-			stream_key_buffer_->clear();
-
-			auto layer = std::move(render_queue.front());
-			render_queue.pop();
-											
-			while(!layer.empty())
-			{
-				auto stream = std::move(layer.front());
-				layer.pop();
-
-				bool last_is_key = stream.empty() ? false : stream.back().transform.get_is_key();
-
-				while(!stream.empty())
-				{
-					auto item = std::move(stream.front());
-					stream.pop();
-
-					render(item);
-
-					channel_.ogl().yield(); // Allow quick buffer allocation to execute.
-				}		
-
-				if(!last_is_key)
-					stream_key_buffer_->clear();
-			}
-
-			std::swap(stream_key_buffer_, layer_key_buffer_);
-		}
-
-		std::swap(draw_buffer_, write_buffer_);
-
-		// Start transfer from device to host.				
-		write_buffer_->write(*read_buffer);
-
-		return read_buffer;
+		return renderer_.render(std::move(layers_));
 	}
 
-	void render(render_item& item)
-	{
-		for(size_t n = 0; n < item.textures.size(); ++n)
-			item.textures[n]->bind(n);	
-				
-		if(item.transform.get_is_key())
-		{
-			stream_key_buffer_->attach();
-
-			kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item.desc, item.transform, false, false);	
-		}
-		else
-		{
-			stream_key_buffer_->bind(LOCAL_KEY_INDEX);	
-			layer_key_buffer_->bind(LAYER_KEY_INDEX);
-				
-			draw_buffer_->attach();	
-
-			kernel_.draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item.desc, item.transform, !stream_key_buffer_->empty(), !layer_key_buffer_->empty());	
-		}
-	}
-				
 	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);
 	}
 };
 
@@ -224,9 +260,9 @@ image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new imple
 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();}
+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)
 {