X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=d40325db0055b7350c8bb04e8df5ca2f25a9200f;hb=bd9906422fe59126a27a3002b2bb4ce497eef508;hp=f8c4425d991f42b4a538e2593b198514ddcd491c;hpb=4fd257106009b2db170dafddece06ee3c190fceb;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index f8c4425d9..d40325db0 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -33,6 +33,7 @@
 #include "image.h"
 #include "dcp_video_frame.h"
 #include "config.h"
+#include "subtitle.h"
 
 using namespace std;
 using namespace boost;
@@ -72,62 +73,73 @@ Server::Server (Log* log)
 int
 Server::process (shared_ptr<Socket> socket)
 {
-	char buffer[128];
+	char buffer[256];
 	socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
 	socket->consume (strlen (buffer) + 1);
 	
 	stringstream s (buffer);
-	
+
 	string command;
 	s >> command;
 	if (command != "encode") {
 		return -1;
 	}
-	
+
 	Size in_size;
 	int pixel_format_int;
 	Size out_size;
 	int padding;
+	int subtitle_offset;
+	int subtitle_scale;
 	string scaler_id;
 	int frame;
 	float frames_per_second;
 	string post_process;
 	int colour_lut_index;
 	int j2k_bandwidth;
+	Position subtitle_position;
+	Size subtitle_size;
 	
 	s >> in_size.width >> in_size.height
 	  >> pixel_format_int
 	  >> out_size.width >> out_size.height
 	  >> padding
+	  >> subtitle_offset
+	  >> subtitle_scale
 	  >> scaler_id
 	  >> frame
 	  >> frames_per_second
 	  >> post_process
 	  >> colour_lut_index
-	  >> j2k_bandwidth;
-	
+	  >> j2k_bandwidth
+	  >> subtitle_position.x >> subtitle_position.y
+	  >> subtitle_size.width >> subtitle_size.height;
+
 	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) {
-		socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
+	shared_ptr<Image> image (new AlignedImage (pixel_format, in_size));
+
+	image->read_from_socket (socket);
+
+	shared_ptr<Subtitle> sub;
+	if (subtitle_position.x != -1) {
+		shared_ptr<Image> subtitle_image (new AlignedImage (PIX_FMT_RGBA, subtitle_size));
+		subtitle_image->read_from_socket (socket);
+		sub.reset (new Subtitle (subtitle_position, subtitle_image));
 	}
+
+	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
+		);
 	
-	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 (socket);
-	
+
 	return frame;
 }
 
@@ -163,9 +175,7 @@ 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 ());
+			_log->log (String::compose ("Encoded frame %1 in %2", frame, seconds (end) - seconds (start)));
 		}
 		
 		_worker_condition.notify_all ();
@@ -175,9 +185,7 @@ 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));
 	
 	for (int i = 0; i < num_threads; ++i) {
 		_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));