X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=e326e00fb5a6da8c93467f40427751759b71a2c5;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=07af1255c486ea42380f570ba6a643d566aedde0;hpb=0f28d40f2f41b5a71bc1ed8192ebb575dbd2dc50;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 07af1255c..e326e00fb 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -17,36 +17,44 @@ */ +/** @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 Server object running on localhost. Compare the resulting + * 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_frame.h" -#include "lib/scaler.h" -#include "lib/player_video_frame.h" -#include "lib/image_proxy.h" +#include "lib/dcp_video.h" +#include "lib/player_video.h" +#include "lib/raw_image_proxy.h" +#include "lib/data.h" using std::list; using boost::shared_ptr; 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 (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, libdcp::Size (1998, 1080), true)); + shared_ptr image (new Image (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) { @@ -57,7 +65,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += image->stride()[0]; } - shared_ptr sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true)); + shared_ptr sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -72,23 +80,24 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr log (new FileLog ("build/test/client_server_test_rgb.log")); - shared_ptr pvf ( - new PlayerVideoFrame ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr pvf ( + new PlayerVideo ( + shared_ptr (new RawImageProxy (image)), + DCPTime (), Crop (), - libdcp::Size (1998, 1080), - libdcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), + optional (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, ColourConversion () ) ); - pvf->set_subtitle (sub_image, Position (50, 60)); + pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); - shared_ptr frame ( - new DCPVideoFrame ( + shared_ptr frame ( + new DCPVideo ( pvf, 0, 24, @@ -98,9 +107,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) ) ); - 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)); @@ -122,11 +130,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) for (list::iterator i = threads.begin(); i != threads.end(); ++i) { delete *i; } + + delete server; } BOOST_AUTO_TEST_CASE (client_server_test_yuv) { - shared_ptr image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true)); + shared_ptr image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); uint8_t* p = image->data()[0]; for (int i = 0; i < image->components(); ++i) { @@ -136,7 +146,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) } } - shared_ptr sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true)); + shared_ptr sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -151,23 +161,24 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr log (new FileLog ("build/test/client_server_test_yuv.log")); - shared_ptr pvf ( - new PlayerVideoFrame ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr pvf ( + new PlayerVideo ( + shared_ptr (new RawImageProxy (image)), + DCPTime (), Crop (), - libdcp::Size (1998, 1080), - libdcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), + optional (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, ColourConversion () ) ); - pvf->set_subtitle (sub_image, Position (50, 60)); + pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); - shared_ptr frame ( - new DCPVideoFrame ( + shared_ptr frame ( + new DCPVideo ( pvf, 0, 24, @@ -177,9 +188,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) ) ); - 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)); @@ -201,5 +211,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) for (list::iterator i = threads.begin(); i != threads.end(); ++i) { delete *i; } + + delete server; }