Manual tweaks.

[dcpomatic.git] / src / lib / dcp_video.cc

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index be69f3eedc1255740f221379b53c229a8833688b..31d1661947b80527d5a51f825b10f5ae6abf2f40 100644 (file)
--- 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)
 
@@ -99,7 +99,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 {
        shared_ptr<dcp::OpenJPEGImage> xyz;
 
-       shared_ptr<Image> image = frame->image (note, bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false);
+       shared_ptr<Image> image = frame->image (bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false);
        if (frame->colour_conversion()) {
                xyz = dcp::rgb_to_xyz (
                        image->data()[0],
@@ -109,7 +109,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
                        note
                        );
        } else {
-               xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);
+               xyz.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0]));
        }
 
        return xyz;
@@ -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
@@ -155,7 +156,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);
-       boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (Config::instance()->server_port_base ()));
+       boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (ENCODE_FRAME_PORT));
        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
        shared_ptr<Socket> socket (new Socket (timeout));
@@ -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);