X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=df854f9f3efec8bbb364e0ecbec2aedcb2fe7037;hp=1f77f7f907cc718a0bcf61dd32b41881c9dd34c3;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05 diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 1f77f7f90..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. @@ -20,6 +20,7 @@ /** @file test/client_server_test.cc * @brief Test the server class. + * @ingroup specific * * Create a test image and then encode it using the standard mechanism * and also using a EncodeServer object running on localhost. Compare the resulting @@ -35,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 @@ -42,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 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); } @@ -69,7 +72,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += image->stride()[0]; } - shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr 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; @@ -82,23 +85,25 @@ 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 ( shared_ptr (new RawImageProxy (image)), - DCPTime (), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - ColourConversion () + 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 ( @@ -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); - new thread (boost::bind (&EncodeServer::run, server)); + 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 threads; for (int i = 0; i < 8; ++i) { @@ -135,6 +140,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } @@ -149,7 +157,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) } } - shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr 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; @@ -162,23 +170,25 @@ 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 ( shared_ptr (new RawImageProxy (image)), - DCPTime (), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - ColourConversion () + 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 ( @@ -186,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); - new thread (boost::bind (&EncodeServer::run, server)); + 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 threads; for (int i = 0; i < 8; ++i) { @@ -215,6 +225,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } @@ -229,19 +242,21 @@ 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 ( shared_ptr (new RawImageProxy (image)), - DCPTime (), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - ColourConversion () + ColourConversion(), + VIDEO_RANGE_FULL, + weak_ptr(), + optional() ) ); @@ -251,24 +266,25 @@ 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 ( - shared_ptr (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))), - DCPTime (), + shared_ptr (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080), AV_PIX_FMT_XYZ12LE)), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - PresetColourConversion::all().front().conversion + PresetColourConversion::all().front().conversion, + VIDEO_RANGE_FULL, + weak_ptr(), + optional() ) ); @@ -278,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); - new thread (boost::bind (&EncodeServer::run, server)); + 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 threads; for (int i = 0; i < 8; ++i) { @@ -307,5 +323,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; }