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

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 51594a47a..db198e79c 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -30,31 +30,31 @@
 #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/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, 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)
 {
 	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
 	uint8_t* p = image->data()[0];
-	
+
 	for (int y = 0; y < 1080; ++y) {
 		uint8_t* q = p;
 		for (int x = 0; x < 1998; ++x) {
@@ -80,13 +80,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<double> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -95,8 +96,8 @@ 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,
@@ -106,9 +107,8 @@ 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);
 
 	new thread (boost::bind (&Server::run, server, 2));
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 	uint8_t* p = image->data()[0];
 
-	for (int i = 0; i < image->components(); ++i) {
+	for (int i = 0; i < image->planes(); ++i) {
 		uint8_t* p = image->data()[i];
 		for (int j = 0; j < image->line_size()[i]; ++j) {
 			*p++ = j % 256;
@@ -161,13 +161,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<double> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -176,8 +177,8 @@ 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,
@@ -187,9 +188,8 @@ 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);
 
 	new thread (boost::bind (&Server::run, server, 2));