X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fserver.cpp;h=2c2c5f3d36be07e467ff86a8f2b877acddcd7177;hb=15f87be8b9a1732eaadcf2a095f4385a336fd982;hp=ecc3add8547f757d2c5ac57516c5a13635fc1c30;hpb=ad314b0e116a388096e538da8f206790619e0a41;p=casparcg

diff --git a/shell/server.cpp b/shell/server.cpp
index ecc3add85..2c2c5f3d3 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -23,6 +23,7 @@
 
 #include "server.h"
 #include "included_modules.h"
+#include "default_audio_config.h"
 
 #include <accelerator/accelerator.h>
 
@@ -31,15 +32,20 @@
 #include <common/utf.h>
 #include <common/memory.h>
 #include <common/polling_filesystem_monitor.h>
+#include <common/ptree.h>
 
 #include <core/video_channel.h>
 #include <core/video_format.h>
+#include <core/frame/audio_channel_layout.h>
 #include <core/producer/stage.h>
 #include <core/producer/frame_producer.h>
 #include <core/producer/scene/scene_producer.h>
 #include <core/producer/scene/xml_scene_producer.h>
 #include <core/producer/text/text_producer.h>
+#include <core/producer/color/color_producer.h>
 #include <core/consumer/output.h>
+#include <core/mixer/mixer.h>
+#include <core/mixer/image/image_mixer.h>
 #include <core/thumbnail_generator.h>
 #include <core/producer/media_info/media_info.h>
 #include <core/producer/media_info/media_info_repository.h>
@@ -48,6 +54,7 @@
 #include <core/diagnostics/subject_diagnostics.h>
 #include <core/diagnostics/call_context.h>
 #include <core/diagnostics/osd_graph.h>
+#include <core/diagnostics/graph_to_log_sink.h>
 #include <core/system_info_provider.h>
 #include <core/help/help_repository.h>
 
@@ -61,6 +68,7 @@
 #include <protocol/util/AsyncEventServer.h>
 #include <protocol/util/strategy_adapters.h>
 #include <protocol/osc/client.h>
+#include <protocol/log/tcp_logger_protocol_strategy.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/thread.hpp>
@@ -146,7 +154,8 @@ struct server::impl : boost::noncopyable
 		, shutdown_server_now_(shutdown_server_now)
 	{
 		running_ = false;
-		core::diagnostics::osd::register_sink();
+		core::diagnostics::register_graph_to_log_sink();
+		caspar::core::diagnostics::osd::register_sink();
 		diag_subject_->attach_parent(monitor_subject_);
 
 		module_dependencies dependencies(
@@ -159,12 +168,16 @@ struct server::impl : boost::noncopyable
 		initialize_modules(dependencies);
 		core::text::init(dependencies);
 		core::scene::init(dependencies);
+		help_repo_->register_item({ L"producer" }, L"Color Producer", &core::describe_color_producer);
 	}
 
 	void start()
 	{
 		running_ = true;
 
+		setup_audio_config(env::properties());
+		CASPAR_LOG(info) << L"Initialized audio config.";
+
 		setup_channels(env::properties());
 		CASPAR_LOG(info) << L"Initialized channels.";
 
@@ -206,44 +219,91 @@ struct server::impl : boost::noncopyable
 		uninitialize_modules();
 		core::diagnostics::osd::shutdown();
 	}
-				
+
+	void setup_audio_config(const boost::property_tree::wptree& pt)
+	{
+		using boost::property_tree::wptree;
+
+		auto default_config = get_default_audio_config();
+
+		// Start with the defaults
+		audio_channel_layout_repository::get_default()->register_all_layouts(default_config.get_child(L"audio.channel-layouts"));
+		audio_mix_config_repository::get_default()->register_all_configs(default_config.get_child(L"audio.mix-configs"));
+
+		// Merge with user configuration (adds to or overwrites the defaults)
+		auto custom_channel_layouts	= pt.get_child_optional(L"configuration.audio.channel-layouts");
+		auto custom_mix_configs		= pt.get_child_optional(L"configuration.audio.mix-configs");
+
+		if (custom_channel_layouts)
+		{
+			CASPAR_SCOPED_CONTEXT_MSG("/configuration/audio/channel-layouts");
+			audio_channel_layout_repository::get_default()->register_all_layouts(*custom_channel_layouts);
+		}
+
+		if (custom_mix_configs)
+		{
+			CASPAR_SCOPED_CONTEXT_MSG("/configuration/audio/mix-configs");
+			audio_mix_config_repository::get_default()->register_all_configs(*custom_mix_configs);
+		}
+	}
+
 	void setup_channels(const boost::property_tree::wptree& pt)
 	{   
 		using boost::property_tree::wptree;
-		for (auto& xml_channel : pt.get_child(L"configuration.channels"))
-		{		
-			auto format_desc = video_format_desc(xml_channel.second.get(L"video-mode", L"PAL"));		
+		for (auto& xml_channel : pt | witerate_children(L"configuration.channels") | welement_context_iteration)
+		{
+			ptree_verify_element_name(xml_channel, L"channel");
+
+			auto format_desc_str = xml_channel.second.get(L"video-mode", L"PAL");
+			auto format_desc = video_format_desc(format_desc_str);
 			if(format_desc.format == video_format::invalid)
-				CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid video-mode."));
-			
-			auto channel = spl::make_shared<video_channel>(static_cast<int>(channels_.size()+1), format_desc, accelerator_.create_image_mixer());
+				CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"Invalid video-mode: " + format_desc_str));
+
+			auto channel_layout_str = xml_channel.second.get(L"channel-layout", L"stereo");
+			auto channel_layout = core::audio_channel_layout_repository::get_default()->get_layout(channel_layout_str);
+			if (!channel_layout)
+				CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"Unknown channel-layout: " + channel_layout_str));
+
+			auto channel_id = static_cast<int>(channels_.size() + 1);
+			auto channel = spl::make_shared<video_channel>(channel_id, format_desc, *channel_layout, accelerator_.create_image_mixer(channel_id));
 
 			core::diagnostics::scoped_call_context save;
 			core::diagnostics::call_context::for_thread().video_channel = channel->index();
-			
-			for (auto& xml_consumer : xml_channel.second.get_child(L"consumers"))
+
+			for (auto& xml_consumer : xml_channel.second | witerate_children(L"consumers") | welement_context_iteration)
 			{
+				auto name = xml_consumer.first;
+
 				try
 				{
-					auto name = xml_consumer.first;
-					
 					if (name != L"<xmlcomment>")
 						channel->output().add(consumer_registry_->create_consumer(name, xml_consumer.second, &channel->stage()));
 				}
-				catch(...)
+				catch (const user_error& e)
+				{
+					CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
+					CASPAR_LOG(error) << get_message_and_context(e) << " Turn on log level debug for stacktrace.";
+				}
+				catch (...)
 				{
 					CASPAR_LOG_CURRENT_EXCEPTION();
 				}
 			}		
 
 		    channel->monitor_output().attach_parent(monitor_subject_);
+			channel->mixer().set_straight_alpha_output(xml_channel.second.get(L"straight-alpha-output", false));
 			channels_.push_back(channel);
 		}
 
 		// Dummy diagnostics channel
 		if (env::properties().get(L"configuration.channel-grid", false))
 		{
-			channels_.push_back(spl::make_shared<video_channel>(static_cast<int>(channels_.size() + 1), core::video_format_desc(core::video_format::x576p2500), accelerator_.create_image_mixer()));
+			auto channel_id = static_cast<int>(channels_.size() + 1);
+			channels_.push_back(spl::make_shared<video_channel>(
+					channel_id,
+					core::video_format_desc(core::video_format::x576p2500),
+					*core::audio_channel_layout_repository::get_default()->get_layout(L"stereo"),
+					accelerator_.create_image_mixer(channel_id)));
 			channels_.back()->monitor_output().attach_parent(monitor_subject_);
 		}
 	}
@@ -262,12 +322,14 @@ struct server::impl : boost::noncopyable
 
 		if (predefined_clients)
 		{
-			for (auto& predefined_client : *predefined_clients)
+			for (auto& predefined_client : pt | witerate_children(L"configuration.osc.predefined-clients") | welement_context_iteration)
 			{
+				ptree_verify_element_name(predefined_client, L"predefined-client");
+
 				const auto address =
-						predefined_client.second.get<std::wstring>(L"address");
+						ptree_get<std::wstring>(predefined_client.second, L"address");
 				const auto port =
-						predefined_client.second.get<unsigned short>(L"port");
+						ptree_get<unsigned short>(predefined_client.second, L"port");
 				predefined_osc_subscriptions_.push_back(
 						osc_client_->get_subscription_token(udp::endpoint(
 								address_v4::from_string(u8(address)),
@@ -307,14 +369,12 @@ struct server::impl : boost::noncopyable
 			pt.get(L"configuration.thumbnails.width", 256),
 			pt.get(L"configuration.thumbnails.height", 144),
 			core::video_format_desc(pt.get(L"configuration.thumbnails.video-mode", L"720p2500")),
-			accelerator_.create_image_mixer(),
+			accelerator_.create_image_mixer(0),
 			pt.get(L"configuration.thumbnails.generate-delay-millis", 2000),
 			&image::write_cropped_png,
 			media_info_repo_,
 			producer_registry_,
 			pt.get(L"configuration.thumbnails.mipmap", true)));
-
-		CASPAR_LOG(info) << L"Initialized thumbnail generator.";
 	}
 		
 	void setup_controllers(const boost::property_tree::wptree& pt)
@@ -328,36 +388,30 @@ struct server::impl : boost::noncopyable
 				help_repo_,
 				producer_registry_,
 				consumer_registry_,
+				accelerator_.get_ogl_device(),
 				shutdown_server_now_);
 		amcp::register_commands(*amcp_command_repo_);
 
 		using boost::property_tree::wptree;
-		for (auto& xml_controller : pt.get_child(L"configuration.controllers"))
+		for (auto& xml_controller : pt | witerate_children(L"configuration.controllers") | welement_context_iteration)
 		{
-			try
-			{
-				auto name = xml_controller.first;
-				auto protocol = xml_controller.second.get<std::wstring>(L"protocol");	
-
-				if(name == L"tcp")
-				{					
-					unsigned int port = xml_controller.second.get(L"port", 5250);
-					auto asyncbootstrapper = spl::make_shared<IO::AsyncEventServer>(
-							io_service_,
-							create_protocol(protocol, L"TCP Port " + boost::lexical_cast<std::wstring>(port)),
-							port);
-					async_servers_.push_back(asyncbootstrapper);
-
-					if (!primary_amcp_server_ && boost::iequals(protocol, L"AMCP"))
-						primary_amcp_server_ = asyncbootstrapper;
-				}
-				else
-					CASPAR_LOG(warning) << "Invalid controller: " << name;	
-			}
-			catch(...)
-			{
-				CASPAR_LOG_CURRENT_EXCEPTION();
+			auto name = xml_controller.first;
+			auto protocol = ptree_get<std::wstring>(xml_controller.second, L"protocol");
+
+			if(name == L"tcp")
+			{					
+				auto port = ptree_get<unsigned int>(xml_controller.second, L"port");
+				auto asyncbootstrapper = spl::make_shared<IO::AsyncEventServer>(
+						io_service_,
+						create_protocol(protocol, L"TCP Port " + boost::lexical_cast<std::wstring>(port)),
+						port);
+				async_servers_.push_back(asyncbootstrapper);
+
+				if (!primary_amcp_server_ && boost::iequals(protocol, L"AMCP"))
+					primary_amcp_server_ = asyncbootstrapper;
 			}
+			else
+				CASPAR_LOG(warning) << "Invalid controller: " << name;	
 		}
 	}
 
@@ -373,8 +427,10 @@ struct server::impl : boost::noncopyable
 			return spl::make_shared<to_unicode_adapter_factory>(
 					"ISO-8859-1",
 					spl::make_shared<CLK::clk_protocol_strategy_factory>(channels_, cg_registry_, producer_registry_));
-		
-		CASPAR_THROW_EXCEPTION(caspar_exception() << arg_name_info(L"name") << arg_value_info(name) << msg_info(L"Invalid protocol"));
+		else if (boost::iequals(name, L"LOG"))
+			return spl::make_shared<protocol::log::tcp_logger_protocol_strategy_factory>();
+
+		CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"Invalid protocol: " + name));
 	}
 
 	void start_initial_media_info_scan()