X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=1bfa4c5a61825350e544cdb107831d3f458decfb;hb=refs%2Fheads%2Fv2.17.x;hp=e21f41c7998163ec7c5290e1b6aa0b3ba16797aa;hpb=a78b741c43830c84bcb4d18e3147746f13a668e5;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index e21f41c79..43084bf31 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-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,45 +18,55 @@ */ + /** @file test/client_server_test.cc - * @brief Test the server class. - * - * Create a test image and then encode it using the standard mechanism - * and also using a EncodeServer object running on localhost. Compare the resulting - * encoded data to check that they are the same. + * @brief Test the remote encoding code. + * @ingroup feature */ -#include "lib/encode_server.h" -#include "lib/image.h" + +#include "lib/content_factory.h" #include "lib/cross.h" #include "lib/dcp_video.h" -#include "lib/player_video.h" -#include "lib/raw_image_proxy.h" -#include "lib/j2k_image_proxy.h" +#include "lib/dcpomatic_log.h" +#include "lib/encode_server.h" #include "lib/encode_server_description.h" +#include "lib/encode_server_finder.h" #include "lib/file_log.h" +#include "lib/film.h" +#include "lib/image.h" +#include "lib/j2k_image_proxy.h" +#include "lib/player_video.h" +#include "lib/raw_image_proxy.h" +#include "test.h" #include #include + using std::list; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; +using std::weak_ptr; using boost::thread; using boost::optional; -using dcp::Data; +using dcp::ArrayData; +using namespace dcpomatic; + 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), Image::Alignment::PADDED); uint8_t* p = image->data()[0]; for (int y = 0; y < 1080; ++y) { @@ -69,7 +79,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), Image::Alignment::PADDED); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -82,64 +92,64 @@ 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 = make_shared(true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread server_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; + 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(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; - } + threads.clear(); - delete server; + server->stop (); + server_thread.join(); } + 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), Image::Alignment::PADDED); for (int i = 0; i < image->planes(); ++i) { uint8_t* p = image->data()[i]; @@ -148,7 +158,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), Image::Alignment::PADDED); uint8_t* p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -161,64 +171,64 @@ 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 = make_shared(true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread server_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; + 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(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; - } + threads.clear(); - delete server; + server->stop (); + server_thread.join(); } + 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), Image::Alignment::PADDED); for (int i = 0; i < image->planes(); ++i) { uint8_t* p = image->data()[i]; @@ -227,81 +237,107 @@ 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 = make_shared(true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread server_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; + 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(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; - } + threads.clear(); + + server->stop (); + server_thread.join(); - delete server; + EncodeServerFinder::drop(); } + + +BOOST_AUTO_TEST_CASE(real_encode_with_server) +{ + Cleanup cl; + + auto content = content_factory(TestPaths::private_data() / "dolby_aurora.vob"); + auto film = new_test_film("real_encode_with_server", content, &cl); + film->set_interop(false); + + EncodeServerFinder::instance(); + + EncodeServer server(true, 4); + thread server_thread(boost::bind(&EncodeServer::run, &server)); + + make_and_verify_dcp(film); + + server.stop(); + server_thread.join(); + + BOOST_CHECK(server.frames_encoded() > 0); + EncodeServerFinder::drop(); + + cl.run(); +} +