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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 9861e5a1a..be69f3eed 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -1,20 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
-    Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -31,7 +31,7 @@
 #include "dcp_video.h"
 #include "config.h"
 #include "exceptions.h"
-#include "server_description.h"
+#include "encode_server_description.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "log.h"
@@ -44,7 +44,6 @@
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
 #include <dcp/colour_matrix.h>
-#include <openjpeg.h>
 #include <libxml++/libxml++.h>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
@@ -100,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);
+	shared_ptr<Image> image = frame->image (note, bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false);
 	if (frame->colour_conversion()) {
 		xyz = dcp::rgb_to_xyz (
 			image->data()[0],
@@ -122,8 +121,6 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 Data
 DCPVideo::encode_locally (dcp::NoteHandler note)
 {
-	shared_ptr<dcp::OpenJPEGImage> xyz = convert_to_xyz (_frame, note);
-
 	Data enc = compress_j2k (
 		convert_to_xyz (_frame, note),
 		_j2k_bandwidth,
@@ -154,14 +151,14 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
  *  @return Encoded data.
  */
 Data
-DCPVideo::encode_remotely (ServerDescription serv)
+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::iterator endpoint_iterator = resolver.resolve (query);
 
-	shared_ptr<Socket> socket (new Socket);
+	shared_ptr<Socket> socket (new Socket (timeout));
 
 	socket->connect (*endpoint_iterator);