X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=5416f2ae76cfdfc5fa6bc09d0c382021e5f35e54;hp=31d1661947b80527d5a51f825b10f5ae6abf2f40;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=e5b744922fb6aed65ec13f22a9de0c86dd1bd561

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 31d166194..5416f2ae7 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -35,6 +35,7 @@
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "cross.h"
 #include "player_video.h"
 #include "compose.hpp"
@@ -50,10 +51,6 @@
 #include <iomanip>
 #include <iostream>
 
-#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE);
-#define LOG_TIMING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING);
-
 #include "i18n.h"
 
 using std::string;
@@ -69,24 +66,21 @@ using dcp::raw_convert;
  *  @param frame Input frame.
  *  @param index Index of the frame within the DCP.
  *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
- *  @param l Log to write to.
  */
 DCPVideo::DCPVideo (
-	shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int bw, Resolution r, shared_ptr<Log> l
+	shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int bw, Resolution r
 	)
 	: _frame (frame)
 	, _index (index)
 	, _frames_per_second (dcp_fps)
 	, _j2k_bandwidth (bw)
 	, _resolution (r)
-	, _log (l)
 {
 
 }
 
-DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::Node> node, shared_ptr<Log> log)
+DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::Node> node)
 	: _frame (frame)
-	, _log (log)
 {
 	_index = node->number_child<int> ("Index");
 	_frames_per_second = node->number_child<int> ("FramesPerSecond");
@@ -119,10 +113,10 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
  *  @return Encoded data.
  */
 Data
-DCPVideo::encode_locally (dcp::NoteHandler note)
+DCPVideo::encode_locally ()
 {
 	Data enc = compress_j2k (
-		convert_to_xyz (_frame, note),
+		convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)),
 		_j2k_bandwidth,
 		_frames_per_second,
 		_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT,
@@ -171,23 +165,31 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 
 	LOG_DEBUG_ENCODE (N_("Sending frame %1 to remote"), _index);
 
-	/* Send XML metadata */
-	string xml = doc.write_to_string ("UTF-8");
-	socket->write (xml.length() + 1);
-	socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
+	{
+		Socket::WriteDigestScope ds (socket);
+
+		/* Send XML metadata */
+		string xml = doc.write_to_string ("UTF-8");
+		socket->write (xml.length() + 1);
+		socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 
-	/* Send binary data */
-	LOG_TIMING("start-remote-send thread=%1", thread_id ());
-	_frame->send_binary (socket);
+		/* Send binary data */
+		LOG_TIMING("start-remote-send thread=%1", thread_id ());
+		_frame->write_to_socket (socket);
+	}
 
 	/* Read the response (JPEG2000-encoded data); this blocks until the data
 	   is ready and sent back.
 	*/
+	Socket::ReadDigestScope ds (socket);
 	LOG_TIMING("start-remote-encode thread=%1", thread_id ());
 	Data e (socket->read_uint32 ());
 	LOG_TIMING("start-remote-receive thread=%1", thread_id ());
 	socket->read (e.data().get(), e.size());
 	LOG_TIMING("finish-remote-receive thread=%1", thread_id ());
+	if (!ds.check()) {
+		throw NetworkError ("Checksums do not match");
+	}
 
 	LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);