X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=df854f9f3efec8bbb364e0ecbec2aedcb2fe7037;hp=b3d57e8139c0cc0dd244b1e49e602f449332404b;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=14cccb179fff7bbbf422e13f9d2e3264239c93c7 diff --git a/test/client_server_test.cc b/test/client_server_test.cc index b3d57e813..df854f9f3 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington 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 #include @@ -50,7 +51,7 @@ void do_remote_encode (shared_ptr frame, EncodeServerDescription description, Data locally_encoded) { Data remotely_encoded; - BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60)); + BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200)); 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); @@ -84,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += sub_image->stride()[0]; } - shared_ptr log (new FileLog ("build/test/client_server_test_rgb.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log")); shared_ptr pvf ( new PlayerVideo ( @@ -96,12 +97,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), optional() ) ); - pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); + pvf->set_text (PositionImage (sub_image, Position (50, 60))); shared_ptr frame ( new DCPVideo ( @@ -109,22 +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); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ - EncodeServerDescription description ("127.0.0.1", 1); + EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION); list threads; for (int i = 0; i < 8; ++i) { @@ -169,7 +170,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) p += sub_image->stride()[0]; } - shared_ptr log (new FileLog ("build/test/client_server_test_yuv.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log")); shared_ptr pvf ( new PlayerVideo ( @@ -181,12 +182,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), optional() ) ); - pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); + pvf->set_text (PositionImage (sub_image, Position (50, 60))); shared_ptr frame ( new DCPVideo ( @@ -194,22 +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); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ - EncodeServerDescription description ("127.0.0.1", 2); + EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION); list threads; for (int i = 0; i < 8; ++i) { @@ -241,7 +242,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) } } - shared_ptr log (new FileLog ("build/test/client_server_test_j2k.log")); + dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log")); shared_ptr raw_pvf ( new PlayerVideo ( @@ -253,6 +254,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), optional() ) @@ -264,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 j2k_pvf ( new PlayerVideo ( @@ -281,6 +282,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) EYES_BOTH, PART_WHOLE, PresetColourConversion::all().front().conversion, + VIDEO_RANGE_FULL, weak_ptr(), optional() ) @@ -292,22 +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); /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */ - EncodeServerDescription description ("127.0.0.1", 2); + EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION); list threads; for (int i = 0; i < 8; ++i) {