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

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 751cf8ea1..302d7af5e 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,199 +20,251 @@
 #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_ext/erase.hpp>
 
 #include <algorithm>
-#include <array>
-#include <unordered_map>
+#include <deque>
+
+using namespace boost::assign;
 
 namespace caspar { namespace core {
-		
-struct image_mixer::implementation : boost::noncopyable
-{		
-	typedef std::deque<render_item>					layer;
+	
+struct item
+{
+	pixel_format_desc						pix_desc;
+	std::vector<safe_ptr<device_buffer>>	textures;
+	frame_transform							transform;
+};
 
-	video_channel_context&							channel_;
+struct layer
+{
+	std::vector<item>						items;
+	blend_mode::type						blend_mode;
 
-	std::vector<image_transform>					transform_stack_;
-	std::vector<video_mode::type>					mode_stack_;
+	layer(blend_mode::type blend_mode) : blend_mode(blend_mode)
+	{
+	}
+};
 
-	std::queue<std::deque<render_item>>				layers_; // layer/stream/items
+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)
+	{
+	}
 	
-	image_kernel									kernel_;
-		
-	std::array<std::shared_ptr<device_buffer>,2>	draw_buffer_;
-	std::shared_ptr<device_buffer>					write_buffer_;
-
-	std::array<std::shared_ptr<device_buffer>,2>	stream_key_buffer_;
-	std::shared_ptr<device_buffer>					layer_key_buffer_;
+	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));
+		});
+	}
 	
-public:
-	implementation(video_channel_context& video_channel) 
-		: channel_(video_channel)
+private:
+	safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)
 	{
-		initialize_buffers();
-		transform_stack_.push_back(image_transform());
-		mode_stack_.push_back(video_mode::progressive);
+		auto draw_buffer = create_device_buffer(4);
 
-		channel_.ogl().invoke([=]
+		if(channel_.get_format_desc().field_mode != field_mode::progressive)
 		{
-			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 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()));
+		
+		active_buffer_ = draw_buffer;
+
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_buffer;
 	}
 
-	~implementation()
+	void draw(std::vector<layer>&&		layers, 
+			  safe_ptr<device_buffer>&	draw_buffer)
 	{
-		channel_.ogl().gc();
+		std::shared_ptr<device_buffer> layer_key_buffer;
+
+		BOOST_FOREACH(auto& layer, layers)
+			draw_layer(std::move(layer), draw_buffer, layer_key_buffer);
 	}
 
-	void initialize_buffers()
+	void draw_layer(layer&&							layer, 
+					safe_ptr<device_buffer>&		draw_buffer,
+					std::shared_ptr<device_buffer>& layer_key_buffer)
+	{				
+		if(layer.items.empty())
+			return;
+
+		std::shared_ptr<device_buffer> local_key_buffer;
+				
+		if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)
+		{
+			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.items)		
+				draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);		
+		}					
+		
+		std::swap(local_key_buffer, layer_key_buffer);
+	}
+
+	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)
+		{
+			local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);
+
+			draw_params.background			= local_key_buffer;
+			draw_params.local_key			= nullptr;
+			draw_params.layer_key			= nullptr;
+
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}
+		else
+		{
+			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));
+		}	
+	}
+			
+	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)	
 	{
-		write_buffer_			= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);
-		layer_key_buffer_		= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);
-		draw_buffer_[0]			= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);
-		draw_buffer_[1]			= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);
-		stream_key_buffer_[0]	= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);
-		stream_key_buffer_[1]	= channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);
-		channel_.ogl().gc();
 	}
 
+	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_image_transform());
-		mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? mode_stack_.back() : frame.get_mode());
+		transform_stack_.push_back(transform_stack_.back()*frame.get_frame_transform());
 	}
 		
 	void visit(core::write_frame& frame)
-	{		
-		// 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())
+	{			
+		if(frame.get_frame_transform().field_mode == field_mode::empty)
 			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();
+		item item;
+		item.pix_desc	= frame.get_pixel_format_desc();
+		item.textures	= frame.get_textures();
+		item.transform	= transform_stack_.back();
 
-		auto it = boost::range::find(layer, item);
-		if(it == layer.end())
-			layer.push_back(item);
+		layers_.back().items.push_back(item);
 	}
 
 	void end()
 	{
 		transform_stack_.pop_back();
-		mode_stack_.pop_back();
-	}
-
-	void begin_layer()
-	{
-		layers_.push(layer());
 	}
 
 	void end_layer()
-	{
-	}
-	
-	boost::unique_future<safe_ptr<host_buffer>> render()
 	{		
-		auto layers = std::move(layers_);
-
-		return channel_.ogl().begin_invoke([=]() mutable -> safe_ptr<host_buffer>
-		{			
-			if(channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())
-				initialize_buffers();
-
-			return do_render(std::move(layers));
-		});
 	}
 	
-	safe_ptr<host_buffer> do_render(std::queue<layer>&& layers)
+	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_[0]->clear();
-		draw_buffer_[1]->clear();
-		stream_key_buffer_[0]->clear();
-		stream_key_buffer_[1]->clear();
-
-		bool local_key = false;
-		bool layer_key = false;
-
-		while(!layers.empty())
-		{			
-			stream_key_buffer_[0]->clear();
-
-			auto layer = std::move(layers.front());
-			layers.pop();
-			
-			while(!layer.empty())
-			{
-				auto item = std::move(layer.front());
-				layer.pop_front();
-											
-				if(item.transform.get_is_key())
-				{
-					render_item(stream_key_buffer_, std::move(item), nullptr, nullptr);
-					local_key = true;
-				}
-				else
-				{
-					render_item(draw_buffer_, std::move(item), local_key ? stream_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr);	
-					stream_key_buffer_[0]->clear();
-					local_key = false;
-				}
-				channel_.ogl().yield(); // Return resources to pool as early as possible.
-			}
-
-			layer_key = local_key;
-			local_key = false;
-			std::swap(stream_key_buffer_[0], layer_key_buffer_);
-		}
-
-		std::swap(draw_buffer_[0], write_buffer_);
-
-		// device -> host.				
-		write_buffer_->write(*read_buffer);
-
-		return read_buffer;
+		return renderer_.render(std::move(layers_));
 	}
-	
-	void render_item(std::array<std::shared_ptr<device_buffer>,2>& targets, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)
-	{
-		targets[1]->attach();
-			
-		kernel_.draw(item, make_safe(targets[0]), local_key, layer_key);
-		
-		targets[0]->bind();
 
-		glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, targets[0]->width(), targets[0]->height());
-		
-		std::swap(targets[0], targets[1]);
-	}
-				
 	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);
 	}
 };
 
@@ -222,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)
 {