Move ServerDescription into its own header.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 4e3ecc983a75524d20582b135ed29b73c08e2bff..89a8e82cc2a6c3463069ef2ec594003fbef521e2 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -25,37 +25,38 @@
  *  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.h"
-#include "lib/scaler.h"
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
-#include "lib/encoded_data.h"
+#include "lib/data.h"
+#include "lib/server_description.h"
+#include "lib/log.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/thread.hpp>
 
 using std::list;
 using boost::shared_ptr;
 using boost::thread;
+using boost::optional;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> 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) {
@@ -83,12 +84,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
-                       shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+                       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 ()
@@ -104,14 +105,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        24,
                        200000000,
                        RESOLUTION_2K,
-                       true,
                        log
                        )
                );
 
-       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));
@@ -142,7 +141,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;
@@ -166,12 +165,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
-                       shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+                       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 ()
@@ -187,14 +186,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        24,
                        200000000,
                        RESOLUTION_2K,
-                       true,
                        log
                        )
                );
 
-       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));