projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename DEVELOPMENT -> DEVELOP.md and add some stuff about player stress testing.
[dcpomatic.git] / test / client_server_test.cc
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 5e4c2540e7b2fa3b5382cfa8571756d484c2b1c8..df854f9f3efec8bbb364e0ecbec2aedcb2fe7037 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,6 +36,7 @@
 #include "lib/j2k_image_proxy.h"
 #include "lib/encode_server_description.h"
 #include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
@@ -43,15 +44,16 @@ using std::list;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
+using boost::weak_ptr;
 using dcp::Data;
 
 void
 do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
 {
        Data remotely_encoded;
-       BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+       BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200));
 
-       BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
+       BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size());
        BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
 }
 
@@ -70,7 +72,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                p += image->stride()[0];
        }
 
-       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
        p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -83,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                p += sub_image->stride()[0];
        }
 
-       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
+       dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log"));
 
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
@@ -94,11 +96,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
                        PART_WHOLE,
-                       ColourConversion ()
+                       ColourConversion(),
+                       VIDEO_RANGE_FULL,
+                       weak_ptr<Content>(),
+                       optional<Frame>()
                        )
                );
 
-       pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+       pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
 
        shared_ptr<DCPVideo> frame (
                new DCPVideo (
@@ -106,21 +111,21 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        0,
                        24,
                        200000000,
-                       RESOLUTION_2K,
-                       log
+                       RESOLUTION_2K
                        )
                );
 
-       Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+       Data locally_encoded = frame->encode_locally ();
 
-       EncodeServer* server = new EncodeServer (log, true, 2);
+       EncodeServer* server = new EncodeServer (true, 2);
 
        thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
-       dcpomatic_sleep (1);
+       dcpomatic_sleep_seconds (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -152,7 +157,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                }
        }
 
-       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
        uint8_t* p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -165,7 +170,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                p += sub_image->stride()[0];
        }
 
-       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
+       dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log"));
 
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
@@ -176,11 +181,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
                        PART_WHOLE,
-                       ColourConversion ()
+                       ColourConversion(),
+                       VIDEO_RANGE_FULL,
+                       weak_ptr<Content>(),
+                       optional<Frame>()
                        )
                );
 
-       pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+       pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
 
        shared_ptr<DCPVideo> frame (
                new DCPVideo (
@@ -188,21 +196,21 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        0,
                        24,
                        200000000,
-                       RESOLUTION_2K,
-                       log
+                       RESOLUTION_2K
                        )
                );
 
-       Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+       Data locally_encoded = frame->encode_locally ();
 
-       EncodeServer* server = new EncodeServer (log, true, 2);
+       EncodeServer* server = new EncodeServer (true, 2);
 
        thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
-       dcpomatic_sleep (1);
+       dcpomatic_sleep_seconds (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -217,9 +225,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                delete *i;
        }
 
+       server->stop ();
        server_thread->join ();
        delete server_thread;
-
        delete server;
 }
 
@@ -234,7 +242,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                }
        }
 
-       shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_j2k.log"));
+       dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log"));
 
        shared_ptr<PlayerVideo> raw_pvf (
                new PlayerVideo (
@@ -245,7 +253,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
                        PART_WHOLE,
-                       ColourConversion ()
+                       ColourConversion(),
+                       VIDEO_RANGE_FULL,
+                       weak_ptr<Content>(),
+                       optional<Frame>()
                        )
                );
 
@@ -255,12 +266,11 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        0,
                        24,
                        200000000,
-                       RESOLUTION_2K,
-                       log
+                       RESOLUTION_2K
                        )
                );
 
-       Data raw_locally_encoded = raw_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+       Data raw_locally_encoded = raw_frame->encode_locally ();
 
        shared_ptr<PlayerVideo> j2k_pvf (
                new PlayerVideo (
@@ -271,7 +281,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        dcp::Size (1998, 1080),
                        EYES_BOTH,
                        PART_WHOLE,
-                       PresetColourConversion::all().front().conversion
+                       PresetColourConversion::all().front().conversion,
+                       VIDEO_RANGE_FULL,
+                       weak_ptr<Content>(),
+                       optional<Frame>()
                        )
                );
 
@@ -281,21 +294,21 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        0,
                        24,
                        200000000,
-                       RESOLUTION_2K,
-                       log
+                       RESOLUTION_2K
                        )
                );
 
-       Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+       Data j2k_locally_encoded = j2k_frame->encode_locally ();
 
-       EncodeServer* server = new EncodeServer (log, true, 2);
+       EncodeServer* server = new EncodeServer (true, 2);
 
        thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
-       dcpomatic_sleep (1);
+       dcpomatic_sleep_seconds (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
2.0 development branch of dcpomatic