X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=8e4fb0e1867e845e644864012eae8812b2468183;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=a80297ec690b132c041aa9d643f882c6457ff168;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index a80297ec6..8e4fb0e18 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,12 +17,23 @@
 
 */
 
+/** @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"
 
 using std::list;
 using boost::shared_ptr;
@@ -36,7 +47,7 @@ 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)
@@ -67,16 +78,27 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		p += sub_image->stride()[0];
 	}
 
-//	shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
+	shared_ptr<PlayerVideoFrame> pvf (
+		new PlayerVideoFrame (
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
+			Crop (),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
+			Scaler::from_id ("bicubic"),
+			EYES_BOTH,
+			PART_WHOLE,
+			ColourConversion ()
+			)
+		);
+
+	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
 	shared_ptr<DCPVideoFrame> frame (
 		new DCPVideoFrame (
-			image,
+			pvf,
 			0,
-			EYES_BOTH,
-			ColourConversion (),
 			24,
 			200000000,
 			RESOLUTION_2K,