Merge master.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index c8a2b49efdcd88f83133ec6e25d81cc3175a5225..8e4fb0e1867e845e644864012eae8812b2468183 100644 (file)
--- 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)
 {
-       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)
                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;
@@ -74,8 +82,8 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                new PlayerVideoFrame (
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
                        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,
@@ -83,7 +91,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                        )
                );
 
-       pvf->set_subtitle (sub_image, Position<int> (50, 60));
+       pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
        shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));