X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=fab9411abb2ff528692ce86aca756f85b2543a6f;hb=970508d98224f0ed6e3b16cd528f49c24d04ff49;hp=6f7a170d0f47f5f17f8b9d3d96e5f9cd4839c159;hpb=17df947ac256397311a11894062070f8069c7e75;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 6f7a170d0..fab9411ab 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,24 +1,26 @@
 /*
     Copyright (C) 2012-2014 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/>.
 
 */
 
 /** @file  test/client_server_test.cc
  *  @brief Test the server class.
+ *  @ingroup specific
  *
  *  Create a test image and then encode it using the standard mechanism
  *  and also using a EncodeServer object running on localhost.  Compare the resulting
@@ -86,7 +88,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
 			shared_ptr<ImageProxy> (new RawImageProxy (image)),
-			DCPTime (),
 			Crop (),
 			optional<double> (),
 			dcp::Size (1998, 1080),
@@ -112,9 +113,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	EncodeServer* server = new EncodeServer (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&EncodeServer::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
@@ -166,7 +167,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
 			shared_ptr<ImageProxy> (new RawImageProxy (image)),
-			DCPTime (),
 			Crop (),
 			optional<double> (),
 			dcp::Size (1998, 1080),
@@ -192,9 +192,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	EncodeServer* server = new EncodeServer (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&EncodeServer::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
@@ -233,7 +233,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 	shared_ptr<PlayerVideo> raw_pvf (
 		new PlayerVideo (
 			shared_ptr<ImageProxy> (new RawImageProxy (image)),
-			DCPTime (),
 			Crop (),
 			optional<double> (),
 			dcp::Size (1998, 1080),
@@ -259,8 +258,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
 	shared_ptr<PlayerVideo> j2k_pvf (
 		new PlayerVideo (
-			shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))),
-			DCPTime (),
+			shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080), AV_PIX_FMT_XYZ12LE)),
 			Crop (),
 			optional<double> (),
 			dcp::Size (1998, 1080),
@@ -284,9 +282,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
 	Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	EncodeServer* server = new EncodeServer (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&EncodeServer::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);