X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=9ad36138746e54877cf697608a889d9f8ffdc16a;hb=b7504915924b8eda7546f02ab976a4572fd56f5b;hp=51594a47acbd930347ded076aad887dadd9d8203;hpb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 51594a47a..9ad361387 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -30,17 +30,18 @@
 #include "lib/server.h"
 #include "lib/image.h"
 #include "lib/cross.h"
-#include "lib/dcp_video_frame.h"
-#include "lib/scaler.h"
-#include "lib/player_video_frame.h"
-#include "lib/image_proxy.h"
+#include "lib/dcp_video.h"
+#include "lib/player_video.h"
+#include "lib/raw_image_proxy.h"
+#include "lib/encoded_data.h"
 
 using std::list;
 using boost::shared_ptr;
 using boost::thread;
+using boost::optional;
 
 void
-do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
 {
 	shared_ptr<EncodedData> remotely_encoded;
 	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@ -80,13 +81,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
 
-	shared_ptr<PlayerVideoFrame> pvf (
-		new PlayerVideoFrame (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+	shared_ptr<PlayerVideo> pvf (
+		new PlayerVideo (
+			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 ()
@@ -95,18 +97,19 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
-	shared_ptr<DCPVideoFrame> frame (
-		new DCPVideoFrame (
+	shared_ptr<DCPVideo> frame (
+		new DCPVideo (
 			pvf,
 			0,
 			24,
 			200000000,
 			RESOLUTION_2K,
+			true,
 			log
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+	shared_ptr<EncodedData> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	BOOST_ASSERT (locally_encoded);
 	
 	Server* server = new Server (log, true);
@@ -161,13 +164,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
 
-	shared_ptr<PlayerVideoFrame> pvf (
-		new PlayerVideoFrame (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+	shared_ptr<PlayerVideo> pvf (
+		new PlayerVideo (
+			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 ()
@@ -176,18 +180,19 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
-	shared_ptr<DCPVideoFrame> frame (
-		new DCPVideoFrame (
+	shared_ptr<DCPVideo> frame (
+		new DCPVideo (
 			pvf,
 			0,
 			24,
 			200000000,
 			RESOLUTION_2K,
+			true,
 			log
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+	shared_ptr<EncodedData> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	BOOST_ASSERT (locally_encoded);
 	
 	Server* server = new Server (log, true);