X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=22eeedbabe3f74f791d4a9126252d23d873ac7d3;hb=6fa9748f382302fa88292b4219598bb81edc7bd0;hp=592a7e294fe2c55caa10804515d17a6de46f81b8;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 592a7e294..22eeedbab 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,8 @@ #include "lib/j2k_image_proxy.h" #include "lib/encode_server_description.h" #include "lib/file_log.h" +#include "lib/dcpomatic_log.h" +#include "test.h" #include #include @@ -44,16 +46,16 @@ using boost::shared_ptr; using boost::thread; using boost::optional; using boost::weak_ptr; -using dcp::Data; +using dcp::ArrayData; void -do_remote_encode (shared_ptr frame, EncodeServerDescription description, Data locally_encoded) +do_remote_encode (shared_ptr frame, EncodeServerDescription description, ArrayData locally_encoded) { - Data remotely_encoded; - BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60)); + ArrayData remotely_encoded; + 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); + BOOST_CHECK_EQUAL (memcmp (locally_encoded.data(), remotely_encoded.data(), locally_encoded.size()), 0); } BOOST_AUTO_TEST_CASE (client_server_test_rgb) @@ -84,7 +86,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")); + LogSwitcher ls (shared_ptr(new FileLog("build/test/client_server_test_rgb.log"))); shared_ptr pvf ( new PlayerVideo ( @@ -96,8 +98,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), - optional() + optional(), + false ) ); @@ -109,19 +113,18 @@ 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)); + ArrayData 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, SERVER_LINK_VERSION); @@ -169,7 +172,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")); + LogSwitcher ls (shared_ptr(new FileLog("build/test/client_server_test_yuv.log"))); shared_ptr pvf ( new PlayerVideo ( @@ -181,8 +184,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), - optional() + optional(), + false ) ); @@ -194,19 +199,18 @@ 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)); + ArrayData 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, SERVER_LINK_VERSION); @@ -241,7 +245,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) } } - shared_ptr log (new FileLog ("build/test/client_server_test_j2k.log")); + LogSwitcher ls (shared_ptr(new FileLog("build/test/client_server_test_j2k.log"))); shared_ptr raw_pvf ( new PlayerVideo ( @@ -253,8 +257,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) EYES_BOTH, PART_WHOLE, ColourConversion(), + VIDEO_RANGE_FULL, weak_ptr(), - optional() + optional(), + false ) ); @@ -264,12 +270,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)); + ArrayData raw_locally_encoded = raw_frame->encode_locally (); shared_ptr j2k_pvf ( new PlayerVideo ( @@ -281,8 +286,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) EYES_BOTH, PART_WHOLE, PresetColourConversion::all().front().conversion, + VIDEO_RANGE_FULL, weak_ptr(), - optional() + optional(), + false ) ); @@ -292,19 +299,18 @@ 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)); + ArrayData 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, SERVER_LINK_VERSION);