X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=ff77f8e8feba3e6d70161cf61c4f297f884196ba;hb=2fabfde079641001d0968ca2fee8e70a0b929e27;hp=9e61c22828bf31bb463e2f3036612c75c7bc01ef;hpb=46f1b3106ab959e21946fe1f035efc6dc1743b49;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 9e61c2282..ff77f8e8f 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -27,131 +27,123 @@
 #include <sstream>
 #include <iostream>
 #include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/scoped_array.hpp>
+#include <libcxml/cxml.h>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
 #include "image.h"
 #include "dcp_video_frame.h"
 #include "config.h"
+#include "cross.h"
 
-using namespace std;
-using namespace boost;
+#include "i18n.h"
+
+using std::string;
+using std::stringstream;
+using std::multimap;
+using std::vector;
+using std::list;
+using std::cout;
+using std::cerr;
+using boost::shared_ptr;
+using boost::algorithm::is_any_of;
+using boost::algorithm::split;
+using boost::thread;
+using boost::bind;
+using boost::scoped_array;
+using boost::optional;
+using boost::lexical_cast;
+using libdcp::Size;
+
+ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
+{
+	_host_name = node->string_child ("HostName");
+	_threads = node->number_child<int> ("Threads");
+}
+
+void
+ServerDescription::as_xml (xmlpp::Node* root) const
+{
+	root->add_child("HostName")->add_child_text (_host_name);
+	root->add_child("Threads")->add_child_text (boost::lexical_cast<string> (_threads));
+}
 
 /** Create a server description from a string of metadata returned from as_metadata().
  *  @param v Metadata.
  *  @return ServerDescription, or 0.
  */
-ServerDescription *
+optional<ServerDescription>
 ServerDescription::create_from_metadata (string v)
 {
 	vector<string> b;
 	split (b, v, is_any_of (" "));
 
 	if (b.size() != 2) {
-		return 0;
+		return optional<ServerDescription> ();
 	}
 
-	return new ServerDescription (b[0], atoi (b[1].c_str ()));
-}
-
-/** @return Description of this server as text */
-string
-ServerDescription::as_metadata () const
-{
-	stringstream s;
-	s << _host_name << " " << _threads;
-	return s.str ();
+	return ServerDescription (b[0], atoi (b[1].c_str ()));
 }
 
-Server::Server (Log* log)
+Server::Server (shared_ptr<Log> log, bool verbose)
 	: _log (log)
+	, _verbose (verbose)
 {
 
 }
 
 int
-Server::process (shared_ptr<asio::ip::tcp::socket> socket)
+Server::process (shared_ptr<Socket> socket)
 {
-	DeadlineWrapper wrapper (_io_service);
-	wrapper.set_socket (socket);
+	uint32_t length = socket->read_uint32 ();
+	scoped_array<char> buffer (new char[length]);
+	socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
 	
-	char buffer[128];
-	wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
-	wrapper.consume (strlen (buffer) + 1);
-	
-	stringstream s (buffer);
-	
-	string command;
-	s >> command;
-	if (command != "encode") {
+	stringstream s (buffer.get());
+	shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
+	xml->read_stream (s);
+	if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
+		cerr << "Mismatched server/client versions\n";
+		_log->log ("Mismatched server/client versions");
 		return -1;
 	}
+
+	libdcp::Size size (
+		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
+		);
+
+	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
+
+	image->read_from_socket (socket);
+	DCPVideoFrame dcp_video_frame (image, xml, _log);
 	
-	Size in_size;
-	int pixel_format_int;
-	Size out_size;
-	int padding;
-	string scaler_id;
-	int frame;
-	float frames_per_second;
-	string post_process;
-	int colour_lut_index;
-	int j2k_bandwidth;
-	
-	s >> in_size.width >> in_size.height
-	  >> pixel_format_int
-	  >> out_size.width >> out_size.height
-	  >> padding
-	  >> scaler_id
-	  >> frame
-	  >> frames_per_second
-	  >> post_process
-	  >> colour_lut_index
-	  >> j2k_bandwidth;
-	
-	PixelFormat pixel_format = (PixelFormat) pixel_format_int;
-	Scaler const * scaler = Scaler::from_id (scaler_id);
-	if (post_process == "none") {
-		post_process = "";
-	}
-	
-	shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
-	
-	for (int i = 0; i < image->components(); ++i) {
-		int line_size;
-		s >> line_size;
-		image->set_line_size (i, line_size);
-	}
-	
-	for (int i = 0; i < image->components(); ++i) {
-		wrapper.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
-	}
-	
-#ifdef DEBUG_HASH
-	image->hash ("Image for encoding (as received by server)");
-#endif		
-	
-	DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log);
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
-	encoded->send (wrapper);
+	try {
+		encoded->send (socket);
+	} catch (std::exception& e) {
+		_log->log (String::compose (
+				   "Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components",
+				   dcp_video_frame.frame(), encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components()
+				   )
+			);
+		throw;
+	}
 
-#ifdef DEBUG_HASH
-	encoded->hash ("Encoded image (as made by server and as sent back)");
-#endif		
-	
-	return frame;
+	return dcp_video_frame.frame ();
 }
 
 void
 Server::worker_thread ()
 {
 	while (1) {
-		mutex::scoped_lock lock (_worker_mutex);
+		boost::mutex::scoped_lock lock (_worker_mutex);
 		while (_queue.empty ()) {
 			_worker_condition.wait (lock);
 		}
 
-		shared_ptr<asio::ip::tcp::socket> socket = _queue.front ();
+		shared_ptr<Socket> socket = _queue.front ();
 		_queue.pop_front ();
 		
 		lock.unlock ();
@@ -164,7 +156,7 @@ Server::worker_thread ()
 		try {
 			frame = process (socket);
 		} catch (std::exception& e) {
-			cerr << "Error: " << e.what() << "\n";
+			_log->log (String::compose ("Error: %1", e.what()));
 		}
 		
 		socket.reset ();
@@ -174,9 +166,16 @@ Server::worker_thread ()
 		if (frame >= 0) {
 			struct timeval end;
 			gettimeofday (&end, 0);
-			stringstream s;
-			s << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start));
-			_log->log (s.str ());
+
+			string const message = String::compose (
+				"Encoded frame %1 from %2 in %3s", frame, socket->socket().remote_endpoint().address().to_string(), seconds(end) - seconds(start)
+				);
+			
+			if (_verbose) {
+				cout << message << "\n";
+			}
+
+			_log->log (message);
 		}
 		
 		_worker_condition.notify_all ();
@@ -186,20 +185,29 @@ Server::worker_thread ()
 void
 Server::run (int num_threads)
 {
-	stringstream s;
-	s << "Server starting with " << num_threads << " threads.";
-	_log->log (s.str ());
+	_log->log (String::compose ("Server starting with %1 threads", num_threads));
+	if (_verbose) {
+		cout << "DCP-o-matic server started with " << num_threads << " threads.\n";
+	}
 	
 	for (int i = 0; i < num_threads; ++i) {
 		_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));
 	}
+
+	_broadcast.thread = new thread (bind (&Server::broadcast_thread, this));
+	
+	boost::asio::io_service io_service;
+
+	boost::asio::ip::tcp::acceptor acceptor (
+		io_service,
+		boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base ())
+		);
 	
-	asio::ip::tcp::acceptor acceptor (_io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
 	while (1) {
-		shared_ptr<asio::ip::tcp::socket> socket (new asio::ip::tcp::socket (_io_service));
-		acceptor.accept (*socket);
+		shared_ptr<Socket> socket (new Socket);
+		acceptor.accept (socket->socket ());
 
-		mutex::scoped_lock lock (_worker_mutex);
+		boost::mutex::scoped_lock lock (_worker_mutex);
 		
 		/* Wait until the queue has gone down a bit */
 		while (int (_queue.size()) >= num_threads * 2) {
@@ -210,3 +218,53 @@ Server::run (int num_threads)
 		_worker_condition.notify_all ();
 	}
 }
+
+void
+Server::broadcast_thread ()
+{
+	boost::asio::io_service io_service;
+
+	boost::asio::ip::address address = boost::asio::ip::address_v4::any ();
+	boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1);
+
+	_broadcast.socket = new boost::asio::ip::udp::socket (io_service);
+	_broadcast.socket->open (listen_endpoint.protocol ());
+	_broadcast.socket->bind (listen_endpoint);
+
+	_broadcast.socket->async_receive_from (
+		boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+		_broadcast.send_endpoint,
+		boost::bind (&Server::broadcast_received, this)
+		);
+
+	io_service.run ();
+}
+
+void
+Server::broadcast_received ()
+{
+	_broadcast.buffer[sizeof(_broadcast.buffer) - 1] = '\0';
+
+	if (strcmp (_broadcast.buffer, DCPOMATIC_HELLO) == 0) {
+		/* Reply to the client saying what we can do */
+		xmlpp::Document doc;
+		xmlpp::Element* root = doc.create_root_node ("ServerAvailable");
+		root->add_child("Threads")->add_child_text (lexical_cast<string> (_worker_threads.size ()));
+		stringstream xml;
+		doc.write_to_stream (xml, "UTF-8");
+
+		shared_ptr<Socket> socket (new Socket);
+		try {
+			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
+			socket->write (xml.str().length() + 1);
+			socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);
+		} catch (...) {
+
+		}
+	}
+		
+	_broadcast.socket->async_receive_from (
+		boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+		_broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this)
+		);
+}