X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=0212dbbedd8547fe1b3f6da04e7b14fd9764edf3;hb=8dddd2d1fef983f60df1f90984dd47f9e95256d6;hp=ca0bec580b62a4412c77e33677814153c9b8a378;hpb=cd4a82d90677cec80e891ac190000cb70767446f;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index ca0bec580..0212dbbed 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -36,7 +36,6 @@
 #include "image.h"
 #include "dcp_video_frame.h"
 #include "config.h"
-#include "subtitle.h"
 
 #include "i18n.h"
 
@@ -50,6 +49,7 @@ using boost::algorithm::split;
 using boost::thread;
 using boost::bind;
 using boost::scoped_array;
+using boost::optional;
 using libdcp::Size;
 
 ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
@@ -69,17 +69,17 @@ ServerDescription::as_xml (xmlpp::Node* root) const
  *  @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 (N_(" ")));
 
 	if (b.size() != 2) {
-		return 0;
+		return optional<ServerDescription> ();
 	}
 
-	return new ServerDescription (b[0], atoi (b[1].c_str ()));
+	return ServerDescription (b[0], atoi (b[1].c_str ()));
 }
 
 Server::Server (shared_ptr<Log> log)
@@ -96,62 +96,35 @@ Server::process (shared_ptr<Socket> socket)
 	socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
 	
 	stringstream s (buffer.get());
-	multimap<string, string> kv = read_key_value (s);
-
-	if (get_required_string (kv, N_("encode")) != N_("please")) {
+	shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
+	xml->read_stream (s);
+	if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
+		_log->log ("Mismatched server/client versions");
 		return -1;
 	}
 
-	libdcp::Size in_size (get_required_int (kv, N_("input_width")), get_required_int (kv, N_("input_height")));
-	int pixel_format_int = get_required_int (kv, N_("input_pixel_format"));
-	libdcp::Size out_size (get_required_int (kv, N_("output_width")), get_required_int (kv, N_("output_height")));
-	int padding = get_required_int (kv, N_("padding"));
-	int subtitle_offset = get_required_int (kv, N_("subtitle_offset"));
-	float subtitle_scale = get_required_float (kv, N_("subtitle_scale"));
-	string scaler_id = get_required_string (kv, N_("scaler"));
-	int frame = get_required_int (kv, N_("frame"));
-	int frames_per_second = get_required_int (kv, N_("frames_per_second"));
-	string post_process = get_optional_string (kv, N_("post_process"));
-	int colour_lut_index = get_required_int (kv, N_("colour_lut"));
-	int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth"));
-	Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y")));
-	libdcp::Size subtitle_size (get_optional_int (kv, N_("subtitle_width")), get_optional_int (kv, N_("subtitle_height")));
-
-	/* This checks that colour_lut_index is within range */
-	colour_lut_index_to_name (colour_lut_index);
-
-	PixelFormat pixel_format = (PixelFormat) pixel_format_int;
-	Scaler const * scaler = Scaler::from_id (scaler_id);
-	
-	shared_ptr<Image> image (new SimpleImage (pixel_format, in_size, true));
-
-	image->read_from_socket (socket);
+	libdcp::Size size (
+		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
+		);
 
-	shared_ptr<Subtitle> sub;
-	if (subtitle_size.width && subtitle_size.height) {
-		shared_ptr<Image> subtitle_image (new SimpleImage (PIX_FMT_RGBA, subtitle_size, true));
-		subtitle_image->read_from_socket (socket);
-		sub.reset (new Subtitle (subtitle_position, subtitle_image));
-	}
+	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
 
-	DCPVideoFrame dcp_video_frame (
-		image, sub, out_size, padding, subtitle_offset, subtitle_scale,
-		scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log
-		);
+	image->read_from_socket (socket);
+	DCPVideoFrame dcp_video_frame (image, xml, _log);
 	
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
 	try {
 		encoded->send (socket);
 	} catch (std::exception& e) {
 		_log->log (String::compose (
-				   N_("Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components"),
-				   frame, encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components()
+				   "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;
 	}
 
-	return frame;
+	return dcp_video_frame.frame ();
 }
 
 void