X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;fp=test%2Fclient_server_test.cc;h=51594a47acbd930347ded076aad887dadd9d8203;hp=07af1255c486ea42380f570ba6a643d566aedde0;hb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;hpb=da38ed791a5a46a97b26947409cf837b7939fd54

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 07af1255c..51594a47a 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -17,6 +17,14 @@
 
 */
 
+/** @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"
@@ -39,12 +47,12 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription 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 +65,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;
@@ -76,8 +84,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 		new PlayerVideoFrame (
 			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
 			Crop (),
-			libdcp::Size (1998, 1080),
-			libdcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
 			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
@@ -85,7 +93,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	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 (
@@ -122,11 +130,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 +146,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;
@@ -155,8 +165,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 		new PlayerVideoFrame (
 			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
 			Crop (),
-			libdcp::Size (1998, 1080),
-			libdcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
 			Scaler::from_id ("bicubic"),
 			EYES_BOTH,
 			PART_WHOLE,
@@ -164,7 +174,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	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 (
@@ -201,5 +211,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
 		delete *i;
 	}
+
+	delete server;
 }