X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=25b2352887132a0597639825d32404f9374eb33f;hb=be5e83c3f9c90bf26b58eed3225bd9d0e1d9414f;hp=17d08278564b1061b95a55692600bf99651efb30;hpb=2d6b81e84203cdc4dbf131690fc91090784fa2a6;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 17d082785..25b235288 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -20,229 +20,284 @@
 #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>
 
-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 render_item
-	{
-		core::pixel_format_desc desc;
-		std::vector<safe_ptr<device_buffer>> textures;
-		core::image_transform transform;
-	};
+using namespace boost::assign;
 
-	const core::video_format_desc format_desc_;
-	
-	std::stack<core::image_transform>		transform_stack_;
-	std::vector<std::vector<render_item>>	transferring_queue_;
-	std::vector<std::vector<render_item>>	render_queue_;
-	
-	image_kernel kernel_;
-		
-	safe_ptr<host_buffer>	read_buffer_;
+namespace caspar { namespace core {
 	
-	safe_ptr<device_buffer>	draw_buffer_;
-	safe_ptr<device_buffer>	write_buffer_;
-
-	safe_ptr<device_buffer>	local_key_buffer_;
-	safe_ptr<device_buffer>	layer_key_buffer_;
+struct item
+{
+	pixel_format_desc						pix_desc;
+	std::vector<safe_ptr<device_buffer>>	textures;
+	frame_transform							transform;
+};
 
-	bool local_key_;
-	bool layer_key_;
+typedef std::pair<blend_mode::type, std::vector<item>> layer;
 
+class image_renderer
+{
+	video_channel_context&					channel_;	
+	image_kernel							kernel_;	
+	std::shared_ptr<device_buffer>			active_buffer_;
 public:
-	implementation(const core::video_format_desc& format_desc) 
-		: format_desc_(format_desc)
-		, read_buffer_(ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only))
-		, draw_buffer_(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 4))
-		, write_buffer_	(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 4))
-		, local_key_buffer_(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 1))
-		, layer_key_buffer_(ogl_device::create_device_buffer(format_desc.width, format_desc.height, 1))
-		, local_key_(false)
-		, layer_key_(false)
+	image_renderer(video_channel_context& channel)
+		: channel_(channel)
 	{
-		transform_stack_.push(core::image_transform());
 	}
 	
-	void begin(const core::basic_frame& frame)
-	{
-		transform_stack_.push(transform_stack_.top()*frame.get_image_transform());
+	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));
+		});
 	}
-		
-	void visit(core::write_frame& frame)
-	{						
-		auto desc		= frame.get_pixel_format_desc();
-		auto buffers	= frame.get_plane_buffers();
-		auto transform	= transform_stack_.top()*frame.get_image_transform();
+	
+private:
+	safe_ptr<host_buffer> do_render(std::vector<layer>&& layers)
+	{
+		auto draw_buffer = create_mixer_buffer(4);
 
-		ogl_device::begin_invoke([=]
+		if(channel_.get_format_desc().field_mode != field_mode::progressive)
 		{
-			render_item item;
+			auto upper = layers;
+			auto lower = std::move(layers);
 
-			item.desc = desc;
-			item.transform = transform;
-			
-			// Start transfer from host to device.
+			BOOST_FOREACH(auto& layer, upper)
+			{
+				boost::remove_erase_if(layer.second, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});
+				BOOST_FOREACH(auto& item, layer.second)
+					item.transform.field_mode = field_mode::upper;
+			}
 
-			for(size_t n = 0; n < buffers.size(); ++n)
+			BOOST_FOREACH(auto& layer, lower)
 			{
-				auto texture = ogl_device::create_device_buffer(desc.planes[n].width, desc.planes[n].height, desc.planes[n].channels);
-				texture->read(*buffers[n]);
-				item.textures.push_back(texture);
-			}	
+				boost::remove_erase_if(layer.second, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});
+				BOOST_FOREACH(auto& item, layer.second)
+					item.transform.field_mode = field_mode::lower;
+			}
 
-			transferring_queue_.back().push_back(item);
-		});
-	}
+			draw(std::move(upper), draw_buffer);
+			draw(std::move(lower), draw_buffer);
+		}
+		else
+		{
+			draw(std::move(layers), draw_buffer);
+		}
 
-	void end()
-	{
-		transform_stack_.pop();
-	}
+		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 begin_layer()
-	{
-		ogl_device::begin_invoke([=]
-		{
-			transferring_queue_.push_back(std::vector<render_item>());
-		});
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_buffer;
 	}
 
-	void end_layer()
+	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);
 	}
 
-	boost::unique_future<safe_ptr<const host_buffer>> render()
-	{
-		auto result = ogl_device::begin_invoke([=]() -> safe_ptr<const host_buffer>
+	void draw_layer(layer&&							layer, 
+					safe_ptr<device_buffer>&		draw_buffer,
+					std::shared_ptr<device_buffer>& layer_key_buffer)
+	{				
+		if(layer.second.empty())
+			return;
+
+		std::shared_ptr<device_buffer> local_key_buffer;
+		std::shared_ptr<device_buffer> local_mix_buffer;
+				
+		if(layer.first != blend_mode::normal && layer.second.size() > 1)
 		{
-			read_buffer_->map(); // Might block.
-			return read_buffer_;
-		});
-			
-		ogl_device::begin_invoke([=]
-		{
-			local_key_ = false;
-			layer_key_ = false;
+			auto layer_draw_buffer = create_mixer_buffer(4);
 
-			// Clear buffers.
-			local_key_buffer_->clear();
-			layer_key_buffer_->clear();
-			draw_buffer_->clear();
-
-			// Draw items in device.
-
-			BOOST_FOREACH(auto layer, render_queue_)
-			{
-				draw_buffer_->attach();	
+			BOOST_FOREACH(auto& item, layer.second)
+				draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);	
+		
+			draw_mixer_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);							
+			draw_mixer_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first);
+		}
+		else // fast path
+		{
+			BOOST_FOREACH(auto& item, layer.second)		
+				draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);		
+					
+			draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);
+		}					
 
-				BOOST_FOREACH(auto item, layer)			
-					draw(item);	
-								
-				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);
+	}
 
-				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);
+
+		if(item.transform.is_key)
+		{
+			local_key_buffer = local_key_buffer ? local_key_buffer : create_mixer_buffer(1);
 
-			// Move waiting items to queue.
+			draw_params.background			= local_key_buffer;
+			draw_params.local_key			= nullptr;
+			draw_params.layer_key			= nullptr;
 
-			render_queue_ = std::move(transferring_queue_);
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}
+		else if(item.transform.is_mix)
+		{
+			local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_mixer_buffer(4);
 
-			// Start transfer from device to host.
+			draw_params.background			= local_mix_buffer;
+			draw_params.local_key			= std::move(local_key_buffer);
+			draw_params.layer_key			= layer_key_buffer;
 
-			read_buffer_ = ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only);
-			draw_buffer_->write(*read_buffer_);
+			draw_params.keyer				= keyer::additive;
 
-			std::swap(draw_buffer_, write_buffer_);
-		});
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}
+		else
+		{
+			draw_mixer_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;
 
-		return std::move(result);
+			kernel_.draw(channel_.ogl(), std::move(draw_params));
+		}	
 	}
-	
-	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
+	void draw_mixer_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));
+	}
+			
+	safe_ptr<device_buffer> create_mixer_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)	
+	{
+	}
 
-		bool local_key = false;
-		bool layer_key = false;
+	void begin_layer(blend_mode::type blend_mode)
+	{
+		layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));
+	}
 		
-		if(item.transform.get_is_key())
-		{
-			if(!local_key_)
-			{
-				local_key_buffer_->clear();
-				local_key_buffer_->attach();
-				local_key_ = true;
-			}
-		}		
-		else
-		{		
-			local_key = local_key_;
-			layer_key = layer_key_;
+	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;
 
-			if(local_key_)
-			{
-				local_key_buffer_->bind(LOCAL_KEY_INDEX);
-				draw_buffer_->attach();	
-				local_key_ = false;
-			}		
+		item item;
+		item.pix_desc	= frame.get_pixel_format_desc();
+		item.textures	= frame.get_textures();
+		item.transform	= transform_stack_.back();
 
-			if(layer_key_)
-				layer_key_buffer_->bind(LAYER_KEY_INDEX);
-		}	
+		layers_.back().second.push_back(item);
+	}
 
-		// Draw
+	void end()
+	{
+		transform_stack_.pop_back();
+	}
 
-		kernel_.draw(format_desc_.width, format_desc_.height, item.desc, item.transform, local_key, layer_key);	
+	void end_layer()
+	{		
 	}
-			
-	std::vector<safe_ptr<host_buffer>> create_buffers(const core::pixel_format_desc& format)
+	
+	boost::unique_future<safe_ptr<host_buffer>> render()
 	{
-		std::vector<safe_ptr<host_buffer>> buffers;
-		std::transform(format.planes.begin(), format.planes.end(), std::back_inserter(buffers), [&](const core::pixel_format_desc::plane& plane)
-		{
-			return ogl_device::create_host_buffer(plane.size, host_buffer::write_only);
-		});
-		return buffers;
+		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>(ogl_, tag, desc);
 	}
 };
 
-image_mixer::image_mixer(const core::video_format_desc& format_desc) : impl_(new implementation(format_desc)){}
-void image_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}
+image_mixer::image_mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}
+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();}
-boost::unique_future<safe_ptr<const host_buffer>> image_mixer::render(){return impl_->render();}
-std::vector<safe_ptr<host_buffer>> image_mixer::create_buffers(const core::pixel_format_desc& format){return impl_->create_buffers(format);}
-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)
+{
+	impl_ = std::move(other.impl_);
+	return *this;
+}
 
 }}
\ No newline at end of file