X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=511e913d9b4e95dce3826fe945462b2b0fb44ca0;hb=a020b117c972db1d4e412c17465a5b7999eb3de9;hp=4e3ecc983a75524d20582b135ed29b73c08e2bff;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 4e3ecc983..511e913d9 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -31,24 +31,23 @@
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video.h"
-#include "lib/scaler.h"
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
-#include "lib/encoded_data.h"
+#include "lib/data.h"
 
 using std::list;
 using boost::shared_ptr;
 using boost::thread;
+using boost::optional;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
 {
-	shared_ptr<EncodedData> remotely_encoded;
+	Data remotely_encoded;
 	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
-	BOOST_CHECK (remotely_encoded);
 	
-	BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size());
-	BOOST_CHECK_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0);
+	BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
+	BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
@@ -83,12 +82,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
 			DCPTime (),
 			Crop (),
+			optional<float> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -109,8 +108,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
-	BOOST_ASSERT (locally_encoded);
+	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	
 	Server* server = new Server (log, true);
 
@@ -166,12 +164,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
 			DCPTime (),
 			Crop (),
+			optional<float> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -192,8 +190,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
-	BOOST_ASSERT (locally_encoded);
+	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	
 	Server* server = new Server (log, true);