Add video waveform viewer.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 511e913d9b4e95dce3826fe945462b2b0fb44ca0..db198e79c3ebd9d26ab310a74dbf8e8bbb4c01ac 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -45,7 +45,7 @@ do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Dat
 {
        Data remotely_encoded;
        BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
-       
+
        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);
 }
@@ -54,7 +54,7 @@ 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) {
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
                        DCPTime (),
                        Crop (),
-                       optional<float> (),
+                       optional<double> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
@@ -103,13 +103,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        24,
                        200000000,
                        RESOLUTION_2K,
-                       true,
                        log
                        )
                );
 
        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));
@@ -140,7 +139,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;
@@ -167,7 +166,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
                        DCPTime (),
                        Crop (),
-                       optional<float> (),
+                       optional<double> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
@@ -185,13 +184,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        24,
                        200000000,
                        RESOLUTION_2K,
-                       true,
                        log
                        )
                );
 
        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));