X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=59364fadd65aba787d1bfac5579c581eeba9a4c2;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=0c5792ae0da6b8d07d678e5244b6b04b381645e6;hpb=df085fc0ea4f1a3f009de5a7a5bf9f241173bcba;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 0c5792ae0..59364fadd 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
@@ -37,9 +37,15 @@
 #include "dcp_video_frame.h"
 #include "config.h"
 #include "cross.h"
+#include "player_video_frame.h"
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...)    _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_ERROR(...)      _log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
+#define LOG_ERROR_NC(...)   _log->log (__VA_ARGS__, Log::TYPE_ERROR);
+
 using std::string;
 using std::stringstream;
 using std::multimap;
@@ -56,8 +62,8 @@ using boost::thread;
 using boost::bind;
 using boost::scoped_array;
 using boost::optional;
-using libdcp::Size;
-using libdcp::raw_convert;
+using dcp::Size;
+using dcp::raw_convert;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
 	: _log (log)
@@ -75,24 +81,19 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 	uint32_t length = socket->read_uint32 ();
 	scoped_array<char> buffer (new char[length]);
 	socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
-	
+
 	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");
+		LOG_ERROR_NC ("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));
+	shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket, _log));
 
-	image->read_from_socket (socket);
-	DCPVideoFrame dcp_video_frame (image, xml, _log);
+	DCPVideoFrame dcp_video_frame (pvf, xml, _log);
 
 	gettimeofday (&after_read, 0);
 	
@@ -103,15 +104,12 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 	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()
-				   )
-			);
+		cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
+		LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
 		throw;
 	}
 
-	return dcp_video_frame.frame ();
+	return dcp_video_frame.index ();
 }
 
 void
@@ -142,7 +140,8 @@ Server::worker_thread ()
 			frame = process (socket, after_read, after_encode);
 			ip = socket->socket().remote_endpoint().address().to_string();
 		} catch (std::exception& e) {
-			_log->log (String::compose ("Error: %1", e.what()));
+			cerr << "Error: " << e.what() << "\n";
+			LOG_ERROR ("Error: %1", e.what());
 		}
 
 		gettimeofday (&end, 0);
@@ -167,7 +166,7 @@ Server::worker_thread ()
 				cout << message.str() << "\n";
 			}
 
-			_log->log (message.str ());
+			LOG_GENERAL_NC (message.str ());
 		}
 		
 		_worker_condition.notify_all ();
@@ -177,7 +176,7 @@ Server::worker_thread ()
 void
 Server::run (int num_threads)
 {
-	_log->log (String::compose ("Server starting with %1 threads", num_threads));
+	LOG_GENERAL ("Server starting with %1 threads", num_threads);
 	if (_verbose) {
 		cout << "DCP-o-matic server starting with " << num_threads << " threads.\n";
 	}