X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=3dceb31b0623a400c0cccde9b82c690d055e619c;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=fab9411abb2ff528692ce86aca756f85b2543a6f;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index fab9411ab..3dceb31b0 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,7 +20,7 @@ /** @file test/client_server_test.cc * @brief Test the server class. - * @ingroup specific + * @ingroup feature * * Create a test image and then encode it using the standard mechanism * and also using a EncodeServer object running on localhost. Compare the resulting @@ -36,28 +36,32 @@ #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 using std::list; -using boost::shared_ptr; +using std::shared_ptr; +using std::weak_ptr; +using std::make_shared; using boost::thread; using boost::optional; -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_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60)); + ArrayData remotely_encoded; + BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200)); - 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); + BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size()); + BOOST_CHECK_EQUAL (memcmp (locally_encoded.data(), remotely_encoded.data(), locally_encoded.size()), 0); } BOOST_AUTO_TEST_CASE (client_server_test_rgb) { - shared_ptr image (new Image (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true)); + auto image = make_shared(AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true); uint8_t* p = image->data()[0]; for (int y = 0; y < 1080; ++y) { @@ -70,7 +74,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)); + auto sub_image = make_shared(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,64 +87,67 @@ 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")); - - shared_ptr pvf ( - new PlayerVideo ( - shared_ptr (new RawImageProxy (image)), - Crop (), - optional (), - dcp::Size (1998, 1080), - dcp::Size (1998, 1080), - EYES_BOTH, - PART_WHOLE, - ColourConversion () - ) + LogSwitcher ls (make_shared("build/test/client_server_test_rgb.log")); + + auto pvf = std::make_shared( + make_shared(image), + Crop (), + optional (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), + Eyes::BOTH, + Part::WHOLE, + ColourConversion(), + VideoRange::FULL, + weak_ptr(), + optional(), + false ); - pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); - - shared_ptr frame ( - new DCPVideo ( - pvf, - 0, - 24, - 200000000, - RESOLUTION_2K, - log - ) + pvf->set_text (PositionImage(sub_image, Position(50, 60))); + + auto frame = make_shared ( + pvf, + 0, + 24, + 200000000, + Resolution::TWO_K ); - Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + auto locally_encoded = frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + auto server = new EncodeServer (true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + auto 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) { threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded))); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - (*i)->join (); + for (auto i: threads) { + i->join (); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - delete *i; + for (auto i: threads) { + delete i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } BOOST_AUTO_TEST_CASE (client_server_test_yuv) { - shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); + auto image = make_shared(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true); for (int i = 0; i < image->planes(); ++i) { uint8_t* p = image->data()[i]; @@ -149,7 +156,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) } } - shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + auto sub_image = make_shared(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,64 +169,67 @@ 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")); - - shared_ptr pvf ( - new PlayerVideo ( - shared_ptr (new RawImageProxy (image)), - Crop (), - optional (), - dcp::Size (1998, 1080), - dcp::Size (1998, 1080), - EYES_BOTH, - PART_WHOLE, - ColourConversion () - ) + LogSwitcher ls (make_shared("build/test/client_server_test_yuv.log")); + + auto pvf = std::make_shared( + std::make_shared(image), + Crop(), + optional(), + dcp::Size(1998, 1080), + dcp::Size(1998, 1080), + Eyes::BOTH, + Part::WHOLE, + ColourConversion(), + VideoRange::FULL, + weak_ptr(), + optional(), + false ); - pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); - - shared_ptr frame ( - new DCPVideo ( - pvf, - 0, - 24, - 200000000, - RESOLUTION_2K, - log - ) + pvf->set_text (PositionImage(sub_image, Position(50, 60))); + + auto frame = make_shared( + pvf, + 0, + 24, + 200000000, + Resolution::TWO_K ); - Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + auto locally_encoded = frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + auto server = new EncodeServer (true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + auto 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) { - threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded))); + threads.push_back (new thread(boost::bind(do_remote_encode, frame, description, locally_encoded))); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - (*i)->join (); + for (auto i: threads) { + i->join (); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - delete *i; + for (auto i: threads) { + delete i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } BOOST_AUTO_TEST_CASE (client_server_test_j2k) { - shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); + auto image = make_shared(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true); for (int i = 0; i < image->planes(); ++i) { uint8_t* p = image->data()[i]; @@ -228,81 +238,83 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) } } - shared_ptr log (new FileLog ("build/test/client_server_test_j2k.log")); - - shared_ptr raw_pvf ( - new PlayerVideo ( - shared_ptr (new RawImageProxy (image)), - Crop (), - optional (), - dcp::Size (1998, 1080), - dcp::Size (1998, 1080), - EYES_BOTH, - PART_WHOLE, - ColourConversion () - ) + LogSwitcher ls (make_shared("build/test/client_server_test_j2k.log")); + + auto raw_pvf = std::make_shared ( + std::make_shared(image), + Crop(), + optional(), + dcp::Size(1998, 1080), + dcp::Size(1998, 1080), + Eyes::BOTH, + Part::WHOLE, + ColourConversion(), + VideoRange::FULL, + weak_ptr(), + optional(), + false ); - shared_ptr raw_frame ( - new DCPVideo ( - raw_pvf, - 0, - 24, - 200000000, - RESOLUTION_2K, - log - ) + auto raw_frame = make_shared ( + raw_pvf, + 0, + 24, + 200000000, + Resolution::TWO_K ); - Data raw_locally_encoded = raw_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); - - shared_ptr j2k_pvf ( - new PlayerVideo ( - 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 - ) + auto raw_locally_encoded = raw_frame->encode_locally (); + + auto j2k_pvf = std::make_shared ( + std::make_shared(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, + VideoRange::FULL, + weak_ptr(), + optional(), + false ); - shared_ptr j2k_frame ( - new DCPVideo ( - j2k_pvf, - 0, - 24, - 200000000, - RESOLUTION_2K, - log - ) + auto j2k_frame = make_shared ( + j2k_pvf, + 0, + 24, + 200000000, + Resolution::TWO_K ); - Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + auto j2k_locally_encoded = j2k_frame->encode_locally (); - EncodeServer* server = new EncodeServer (log, true, 2); + auto server = new EncodeServer (true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + auto 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) { - threads.push_back (new thread (boost::bind (do_remote_encode, j2k_frame, description, j2k_locally_encoded))); + threads.push_back (new thread(boost::bind(do_remote_encode, j2k_frame, description, j2k_locally_encoded))); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - (*i)->join (); + for (auto i: threads) { + i->join (); } - for (list::iterator i = threads.begin(); i != threads.end(); ++i) { - delete *i; + for (auto i: threads) { + delete i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; }