X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=ba8057be06a97fa0f0ff751ca25e0b2a20f76884;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=be69f3eedc1255740f221379b53c229a8833688b;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index be69f3eed..ba8057be0 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -37,13 +37,12 @@
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"
-#include "raw_convert.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
-#include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
@@ -62,6 +61,7 @@ using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
 using dcp::Data;
+using dcp::raw_convert;
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -148,6 +148,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 
 /** Send this frame to a remote server for J2K encoding, then read the result.
  *  @param serv Server to send to.
+ *  @param timeout timeout in seconds.
  *  @return Encoded data.
  */
 Data
@@ -176,17 +177,17 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 	socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 
 	/* Send binary data */
-	LOG_TIMING("start-remote-send thread=%1", boost::this_thread::get_id());
+	LOG_TIMING("start-remote-send thread=%1", thread_id ());
 	_frame->send_binary (socket);
 
 	/* Read the response (JPEG2000-encoded data); this blocks until the data
 	   is ready and sent back.
 	*/
-	LOG_TIMING("start-remote-encode thread=%1", boost::this_thread::get_id ());
+	LOG_TIMING("start-remote-encode thread=%1", thread_id ());
 	Data e (socket->read_uint32 ());
-	LOG_TIMING("start-remote-receive thread=%1", boost::this_thread::get_id ());
+	LOG_TIMING("start-remote-receive thread=%1", thread_id ());
 	socket->read (e.data().get(), e.size());
-	LOG_TIMING("finish-remote-receive thread=%1", boost::this_thread::get_id ());
+	LOG_TIMING("finish-remote-receive thread=%1", thread_id ());
 
 	LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);