X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=a14578a6bd7774fbab8e7b365e9b3866e2bf4818;hp=5884df09aae9642ccea356b640a9d4491ef4fa3e;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=f515b8daea9d28200be803bb64ff17e9f30343c4

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 5884df09a..a14578a6b 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -36,9 +36,12 @@
 #include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
@@ -57,13 +60,13 @@ using std::list;
 using std::cout;
 using std::cerr;
 using std::fixed;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::bind;
 using boost::scoped_array;
 using boost::optional;
+using dcp::ArrayData;
 using dcp::Size;
-using dcp::Data;
 using dcp::raw_convert;
 
 EncodeServer::EncodeServer (bool verbose, int num_threads)
@@ -80,6 +83,8 @@ EncodeServer::EncodeServer (bool verbose, int num_threads)
 
 EncodeServer::~EncodeServer ()
 {
+	boost::this_thread::disable_interruption dis;
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_terminate = true;
@@ -87,14 +92,9 @@ EncodeServer::~EncodeServer ()
 		_full_condition.notify_all ();
 	}
 
-	BOOST_FOREACH (boost::thread* i, _worker_threads) {
-		try {
-			i->join ();
-		} catch (...) {
-
-		}
-		delete i;
-	}
+	try {
+		_worker_threads.join_all ();
+	} catch (...) {}
 
 	{
 		boost::mutex::scoped_lock lm (_broadcast.mutex);
@@ -106,13 +106,9 @@ EncodeServer::~EncodeServer ()
 	}
 
 	_broadcast.io_service.stop ();
-	if (_broadcast.thread.joinable()) {
-		try {
-			_broadcast.thread.join ();
-		} catch (...) {
-
-		}
-	}
+	try {
+		_broadcast.thread.join ();
+	} catch (...) {}
 }
 
 /** @param after_read Filled in with gettimeofday() after reading the input from the network.
@@ -121,6 +117,8 @@ EncodeServer::~EncodeServer ()
 int
 EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
 {
+	Socket::ReadDigestScope ds (socket);
+
 	uint32_t length = socket->read_uint32 ();
 	scoped_array<char> buffer (new char[length]);
 	socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
@@ -139,17 +137,22 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
 
 	shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
 
+	if (!ds.check()) {
+		throw NetworkError ("Checksums do not match");
+	}
+
 	DCPVideo dcp_video_frame (pvf, xml);
 
 	gettimeofday (&after_read, 0);
 
-	Data encoded = dcp_video_frame.encode_locally ();
+	ArrayData encoded = dcp_video_frame.encode_locally ();
 
 	gettimeofday (&after_encode, 0);
 
 	try {
+		Socket::WriteDigestScope ds (socket);
 		socket->write (encoded.size());
-		socket->write (encoded.data().get(), encoded.size());
+		socket->write (encoded.data(), encoded.size());
 	} catch (std::exception& e) {
 		cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
 		LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
@@ -234,10 +237,11 @@ EncodeServer::run ()
 	}
 
 	for (int i = 0; i < _num_threads; ++i) {
-		boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
-		_worker_threads.push_back (t);
 #ifdef DCPOMATIC_LINUX
+		boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
 		pthread_setname_np (t->native_handle(), "encode-server-worker");
+#else
+		_worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
 #endif
 	}