X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=26554e46c2c941dd92562ef7ad197687e56cd665;hb=1d93a1663bb79677fcbd5603f94095f9ddbeea16;hp=0154200ad054c5a5ff1a024c76cf7c6ec56e06c8;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 0154200ad..26554e46c 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -25,16 +25,18 @@ * encoded data to check that they are the same. */ -#include -#include #include "lib/server.h" #include "lib/image.h" #include "lib/cross.h" #include "lib/dcp_video.h" -#include "lib/scaler.h" #include "lib/player_video.h" #include "lib/raw_image_proxy.h" -#include "lib/encoded_data.h" +#include "lib/j2k_image_proxy.h" +#include "lib/data.h" +#include "lib/server_description.h" +#include "lib/file_log.h" +#include +#include using std::list; using boost::shared_ptr; @@ -42,21 +44,20 @@ using boost::thread; using boost::optional; void -do_remote_encode (shared_ptr frame, ServerDescription description, shared_ptr locally_encoded) +do_remote_encode (shared_ptr frame, ServerDescription description, Data locally_encoded) { - shared_ptr remotely_encoded; + Data remotely_encoded; BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); - BOOST_CHECK (remotely_encoded); - - BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size()); - BOOST_CHECK_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0); + + 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_AUTO_TEST_CASE (client_server_test_rgb) { - shared_ptr image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true)); + shared_ptr image (new Image (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true)); uint8_t* p = image->data()[0]; - + for (int y = 0; y < 1080; ++y) { uint8_t* q = p; for (int x = 0; x < 1998; ++x) { @@ -67,7 +68,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += image->stride()[0]; } - shared_ptr sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -84,13 +85,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), - optional (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), EYES_BOTH, PART_WHOLE, ColourConversion () @@ -106,14 +106,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) 24, 200000000, RESOLUTION_2K, - true, log ) ); - shared_ptr locally_encoded = frame->encode_locally (); - BOOST_ASSERT (locally_encoded); - + Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Server* server = new Server (log, true); new thread (boost::bind (&Server::run, server, 2)); @@ -141,18 +139,17 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) BOOST_AUTO_TEST_CASE (client_server_test_yuv) { - shared_ptr image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); - uint8_t* p = image->data()[0]; + shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); - for (int i = 0; i < image->components(); ++i) { + for (int i = 0; i < image->planes(); ++i) { uint8_t* p = image->data()[i]; for (int j = 0; j < image->line_size()[i]; ++j) { *p++ = j % 256; } } - shared_ptr sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true)); - p = sub_image->data()[0]; + shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + uint8_t* p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; for (int x = 0; x < 100; ++x) { @@ -168,13 +165,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), - optional (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), EYES_BOTH, PART_WHOLE, ColourConversion () @@ -190,14 +186,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) 24, 200000000, RESOLUTION_2K, - true, log ) ); - shared_ptr locally_encoded = frame->encode_locally (); - BOOST_ASSERT (locally_encoded); - + Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + Server* server = new Server (log, true); new thread (boost::bind (&Server::run, server, 2)); @@ -223,3 +217,94 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) delete server; } +BOOST_AUTO_TEST_CASE (client_server_test_j2k) +{ + shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); + + for (int i = 0; i < image->planes(); ++i) { + uint8_t* p = image->data()[i]; + for (int j = 0; j < image->line_size()[i]; ++j) { + *p++ = j % 256; + } + } + + shared_ptr log (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 () + ) + ); + + shared_ptr raw_frame ( + new DCPVideo ( + raw_pvf, + 0, + 24, + 200000000, + RESOLUTION_2K, + log + ) + ); + + 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))), + DCPTime (), + Crop (), + optional (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), + EYES_BOTH, + PART_WHOLE, + PresetColourConversion::all().front().conversion + ) + ); + + shared_ptr j2k_frame ( + new DCPVideo ( + j2k_pvf, + 0, + 24, + 200000000, + RESOLUTION_2K, + log + ) + ); + + Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + + Server* server = new Server (log, true); + + new thread (boost::bind (&Server::run, server, 2)); + + /* Let the server get itself ready */ + dcpomatic_sleep (1); + + ServerDescription description ("localhost", 2); + + 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))); + } + + for (list::iterator i = threads.begin(); i != threads.end(); ++i) { + (*i)->join (); + } + + for (list::iterator i = threads.begin(); i != threads.end(); ++i) { + delete *i; + } + + delete server; +}