X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=9ad36138746e54877cf697608a889d9f8ffdc16a;hb=2898a88b4554335439891d8198bed8c820c20396;hp=07af1255c486ea42380f570ba6a643d566aedde0;hpb=0f28d40f2f41b5a71bc1ed8192ebb575dbd2dc50;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 07af1255c..9ad361387 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -17,34 +17,43 @@
 
 */
 
+/** @file  test/client_server_test.cc
+ *  @brief Test the server class.
+ *
+ *  Create a test image and then encode it using the standard mechanism
+ *  and also using a Server object running on localhost.  Compare the resulting
+ *  encoded data to check that they are the same.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 #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));
 	BOOST_CHECK (remotely_encoded);
 	
 	BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size());
-	BOOST_CHECK (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()) == 0);
+	BOOST_CHECK_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0);
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+	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) {
@@ -57,7 +66,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 		p += image->stride()[0];
 	}
 
-	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
 	p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		uint8_t* q = p;
@@ -72,33 +81,35 @@ 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 (),
-			libdcp::Size (1998, 1080),
-			libdcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
+			optional<float> (),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
 			)
 		);
 
-	pvf->set_subtitle (sub_image, Position<int> (50, 60));
+	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);
@@ -122,11 +133,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 	for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
 		delete *i;
 	}
+
+	delete server;
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true));
+	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) {
@@ -136,7 +149,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 		}
 	}
 
-	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
 	p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		uint8_t* q = p;
@@ -151,33 +164,35 @@ 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 (),
-			libdcp::Size (1998, 1080),
-			libdcp::Size (1998, 1080),
-			Scaler::from_id ("bicubic"),
+			optional<float> (),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
 			)
 		);
 
-	pvf->set_subtitle (sub_image, Position<int> (50, 60));
+	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);
@@ -201,5 +216,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
 		delete *i;
 	}
+
+	delete server;
 }