X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=eab84cc397cb32684b55c5d56ebf57514cd98bc7;hb=15f23b356b757a9697bf1a9ec30c243ab8070404;hp=2dc1545d603dd48192299276800f3f7977fd3dd5;hpb=2c4023c4f8e9ed5c09a30e28cc0bf8633b7635a3;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 2dc1545d6..eab84cc39 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,31 +17,42 @@ */ +/** @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/dcp_video.h" +#include "lib/scaler.h" +#include "lib/player_video.h" +#include "lib/image_proxy.h" using std::list; using boost::shared_ptr; using boost::thread; void -do_remote_encode (shared_ptr frame, ServerDescription* description, shared_ptr locally_encoded) +do_remote_encode (shared_ptr frame, ServerDescription description, shared_ptr locally_encoded) { shared_ptr 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 (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0); } -BOOST_AUTO_TEST_CASE (client_server_test) +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) { @@ -54,7 +65,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) 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; @@ -67,17 +78,111 @@ BOOST_AUTO_TEST_CASE (client_server_test) p += sub_image->stride()[0]; } -// shared_ptr subtitle (new Subtitle (Position (50, 60), sub_image)); + shared_ptr log (new FileLog ("build/test/client_server_test_rgb.log")); + + shared_ptr pvf ( + new PlayerVideo ( + shared_ptr (new RawImageProxy (image, log)), + Crop (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), + Scaler::from_id ("bicubic"), + EYES_BOTH, + PART_WHOLE, + ColourConversion () + ) + ); - shared_ptr log (new FileLog ("build/test/client_server_test.log")); + pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); - shared_ptr frame ( - new DCPVideoFrame ( - image, + shared_ptr frame ( + new DCPVideo ( + pvf, 0, + 24, + 200000000, + RESOLUTION_2K, + log + ) + ); + + shared_ptr locally_encoded = frame->encode_locally (); + BOOST_ASSERT (locally_encoded); + + 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, frame, description, 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; +} + +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]; + + for (int i = 0; i < image->components(); ++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]; + for (int y = 0; y < 200; ++y) { + uint8_t* q = p; + for (int x = 0; x < 100; ++x) { + *q++ = y % 256; + *q++ = x % 256; + *q++ = (x + y) % 256; + *q++ = 1; + } + 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, log)), + Crop (), + dcp::Size (1998, 1080), + dcp::Size (1998, 1080), + Scaler::from_id ("bicubic"), EYES_BOTH, + PART_WHOLE, + ColourConversion () + ) + ); + + pvf->set_subtitle (PositionImage (sub_image, Position (50, 60))); + + shared_ptr frame ( + new DCPVideo ( + pvf, + 0, 24, 200000000, + RESOLUTION_2K, log ) ); @@ -85,7 +190,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) shared_ptr locally_encoded = frame->encode_locally (); BOOST_ASSERT (locally_encoded); - Server* server = new Server (log); + Server* server = new Server (log, true); new thread (boost::bind (&Server::run, server, 2)); @@ -96,7 +201,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) 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) { @@ -106,5 +211,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) for (list::iterator i = threads.begin(); i != threads.end(); ++i) { delete *i; } + + delete server; }