X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=core%2Fmixer%2Fimage%2Fimage_mixer.cpp;h=bcdf592d20adff3d2b2568658ee6cf5eb5b5ae9c;hb=2d37a4e2f1f5aedf3975796f7b775ab3cea5ccf4;hp=f5b2f6304e43ddef2a64f02333921cbd859789ea;hpb=521b5d02915125db05af3bfd14bd6d0bea8cd8be;p=casparcg

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index f5b2f6304..bcdf592d2 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -37,208 +37,231 @@
 #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>
 
 namespace caspar { namespace core {
 		
-struct render_item
-{
-	pixel_format_desc					 desc;
-	std::vector<safe_ptr<device_buffer>> textures;
-	core::image_transform				 transform;
-	int									 tag;
-};
-
 struct image_mixer::implementation : boost::noncopyable
 {		
+	typedef std::deque<render_item>			layer;
+
 	video_channel_context&					channel_;
-	
-	std::stack<core::image_transform>		transform_stack_;
 
-	std::queue<std::queue<std::deque<render_item>>>	render_queue_; // layer/stream/items
-	
-	std::unique_ptr<image_kernel>			kernel_;
-		
-	std::shared_ptr<device_buffer>			draw_buffer_[2];
-	std::shared_ptr<device_buffer>			write_buffer_;
+	std::vector<image_transform>			transform_stack_;
+	std::vector<video_mode::type>			mode_stack_;
 
-	std::shared_ptr<device_buffer>			stream_key_buffer_[2];
-	std::shared_ptr<device_buffer>			layer_key_buffer_;
+	std::deque<std::deque<render_item>>		layers_; // layer/stream/items
 	
+	image_kernel							kernel_;		
+
+	std::shared_ptr<device_buffer>			active_buffer_;
 public:
 	implementation(video_channel_context& video_channel) 
 		: channel_(video_channel)
+		, transform_stack_(1)
+		, mode_stack_(1, video_mode::progressive)
 	{
-		initialize_buffers();
-		transform_stack_.push(core::image_transform());
-
-		channel_.ogl().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."));
-
-			kernel_.reset(new image_kernel());
-		});
 	}
 
 	~implementation()
 	{
 		channel_.ogl().gc();
 	}
-
-	void initialize_buffers()
-	{
-		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);
-	}
-
+	
 	void begin(core::basic_frame& frame)
 	{
-		transform_stack_.push(transform_stack_.top()*frame.get_image_transform());
+		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());
 	}
 		
 	void visit(core::write_frame& frame)
-	{			
-		if(frame.get_textures().empty())
-			return;
+	{	
+		CASPAR_ASSERT(!layers_.empty());
 
-		render_item item = {frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.top()*frame.get_image_transform(), frame.tag()};	
+		// 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())
+			return;
+		
+		core::render_item item(frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.back(), mode_stack_.back(), frame.tag());	
 
-		auto& layer = render_queue_.back();
+		auto& layer = layers_.back();
 
-		if(layer.empty() || (!layer.back().empty() && layer.back().back().tag != frame.tag()))
-			layer.push(std::deque<render_item>());
-		
-		layer.back().push_back(item);
+		if(boost::range::find(layer, item) == layer.end())
+			layer.push_back(item);
 	}
 
 	void end()
 	{
-		transform_stack_.pop();
+		transform_stack_.pop_back();
+		mode_stack_.pop_back();
 	}
 
 	void begin_layer()
 	{
-		render_queue_.push(std::queue<std::deque<render_item>>());
+		layers_.push_back(layer());
 	}
 
 	void end_layer()
 	{
 	}
 	
-	safe_ptr<host_buffer> render()
+	boost::unique_future<safe_ptr<host_buffer>> render()
 	{		
-		auto render_queue = std::move(render_queue_);
-
-		return channel_.ogl().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(render_queue));
+		auto layers = std::move(layers_);
+		return channel_.ogl().begin_invoke([=]() mutable
+		{
+			return render(std::move(layers));
 		});
 	}
 	
-	safe_ptr<host_buffer> do_render(std::queue<std::queue<std::deque<render_item>>>&& render_queue)
+	safe_ptr<host_buffer> render(std::deque<layer>&& layers)
 	{
-		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();
+		std::shared_ptr<device_buffer> layer_key_buffer;
 
-		bool local_key = false;
-		bool layer_key = false;
+		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()));
+		
+		active_buffer_ = draw_buffer;
 
-		while(!render_queue.empty())
-		{			
-			stream_key_buffer_[0]->clear();
+		channel_.ogl().flush(); // NOTE: This is important, otherwise fences will deadlock.
+			
+		return host_buffer;
+	}
 
-			auto layer = std::move(render_queue.front());
-			render_queue.pop();
+	// 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;
 
-			while(!layer.empty())
+		std::pair<int, std::shared_ptr<device_buffer>> local_key_buffer;
+					
+		if(has_overlapping_items(layer, layer.front().transform.get_blend_mode()))
+		{
+			auto local_draw_buffer = create_device_buffer(4);	
+			
+			BOOST_FOREACH(auto& item, layer)		
 			{
-				auto stream = std::move(layer.front());
-				layer.pop();
-								
-				render(stream, local_key, layer_key);
-				
-				local_key = stream.front().transform.get_is_key();
-				if(!local_key)
-					stream_key_buffer_[0]->clear();
-
-				channel_.ogl().yield();
+				item.transform.set_blend_mode(image_transform::blend_mode::normal);
+				draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer);		
 			}
 
-			layer_key = local_key;
-			local_key = false;
-			std::swap(stream_key_buffer_[0], layer_key_buffer_);
+			kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, layer.front().transform.get_blend_mode()), 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);		
+		}					
 
-		std::swap(draw_buffer_[0], write_buffer_);
-
-		// Start transfer from device to host.				
-		write_buffer_->write(*read_buffer);
+		CASPAR_ASSERT(local_key_buffer.first == 0 || local_key_buffer.first == core::video_mode::progressive);
 
-		return read_buffer;
+		std::swap(local_key_buffer.second, layer_key_buffer);
 	}
 
-	void render(std::deque<render_item>& stream, bool local_key, bool layer_key)
-	{
-		CASPAR_ASSERT(!stream.empty());
-
-		while(stream.size() > 2)
-			stream.pop_front();
-
-		// Kernel expects lower field first for early explicit z-culling
-		if(stream[0].transform.get_mode() == core::video_mode::upper && stream.size() == 2)
-			std::swap(stream[0], stream[1]);		
-		
-		if(stream.front().transform.get_is_key())
+	void draw_item(render_item&&									item, 
+				   const safe_ptr<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())
 		{
-			stream_key_buffer_[1]->attach();
-			
-			BOOST_FOREACH(auto item2, stream)
-			{	
-				kernel_->draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, item2.textures, 
-								make_safe(stream_key_buffer_[0]), nullptr, nullptr);
+			if(!local_key_buffer.second)
+			{
+				local_key_buffer.first = 0;
+				local_key_buffer.second = create_device_buffer(1);
 			}
 
-			std::swap(stream_key_buffer_[0], stream_key_buffer_[1]);
+			item.transform.set_opacity(1.0);
+			item.transform.set_blend_mode(image_transform::blend_mode::normal);
 
-			stream_key_buffer_[1]->bind();
-			glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, channel_.get_format_desc().width, channel_.get_format_desc().height);	
+			local_key_buffer.first |= item.mode;
+			kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer.second), nullptr, nullptr);
 		}
 		else
 		{
-			draw_buffer_[1]->attach();	
+			kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);
+			local_key_buffer.first ^= item.mode;
 			
-			BOOST_FOREACH(auto item2, stream)
-			{	
-				kernel_->draw(channel_.get_format_desc().width, channel_.get_format_desc().height, item2.desc, item2.transform, item2.textures, 
-								make_safe(draw_buffer_[0]), local_key ? stream_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr);	
+			if(local_key_buffer.first == 0)
+			{
+				local_key_buffer.first = 0;
+				local_key_buffer.second.reset();
 			}
+		}
+	}
 
-			std::swap(draw_buffer_[0], draw_buffer_[1]);
+	// TODO: Optimize
+	bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)
+	{
+		if(layer.empty())
+			return false;	
+		
+		implementation::layer fill;
+
+		std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)
+		{
+			return !item.transform.get_is_key();
+		});
 			
-			draw_buffer_[1]->bind();
-			glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, channel_.get_format_desc().width, channel_.get_format_desc().height);
+		if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity
+		{
+			return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)
+			{
+				return item.transform.get_opacity() < 1.0 - 0.001;
+			});
 		}
-	}
+
+		// Simple solution, just check if we have differnt video streams / tags.
+		return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)
+		{
+			return item.tag != fill.front().tag;
+		});
+	}			
+			
+	render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)
+	{
+		CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");
+
+		pixel_format_desc desc;
+		desc.pix_fmt = pixel_format::bgra;
+		desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));
+
+		std::vector<safe_ptr<device_buffer>> textures;
+		textures.push_back(buffer);
 				
+		image_transform transform;
+		transform.set_blend_mode(blend_mode);
+
+		return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr);		 
+	}
+
+	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;
+	}
+
 	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>(channel_.ogl(), tag, desc);
 	}
 };
 
@@ -246,7 +269,7 @@ 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::end_layer(){impl_->end_layer();}