X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=68ef336a17a795ecf5925921fae5726bd4780017;hp=4e3ecc983a75524d20582b135ed29b73c08e2bff;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=7b2054e2a73844450b5b55c5788c02af671812ce diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 4e3ecc983..68ef336a1 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,41 +22,45 @@ * @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 + * and also using a EncodeServer object running on localhost. Compare the resulting * encoded data to check that they are the same. */ -#include -#include -#include "lib/server.h" +#include "lib/encode_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/encode_server_description.h" +#include "lib/file_log.h" +#include +#include +#include using std::list; using boost::shared_ptr; +using boost::make_shared; using boost::thread; +using boost::optional; +using dcp::Data; void -do_remote_encode (shared_ptr frame, ServerDescription description, shared_ptr locally_encoded) +do_remote_encode (shared_ptr frame, EncodeServerDescription description, Data 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_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0); + Data remotely_encoded; + BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60)); + + 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 = make_shared (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) { @@ -66,7 +71,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 = make_shared (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; @@ -79,16 +84,16 @@ 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 log = make_shared ("build/test/client_server_test_rgb.log"); shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + make_shared (image), DCPTime (), Crop (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), EYES_BOTH, PART_WHOLE, ColourConversion () @@ -104,22 +109,20 @@ 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); - - Server* server = new Server (log, true); + Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + + EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&Server::run, server, 2)); + new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription description ("localhost", 2); + EncodeServerDescription description ("localhost", 2); list threads; for (int i = 0; i < 8; ++i) { @@ -139,18 +142,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 = make_shared (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 = make_shared (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) { @@ -162,16 +164,16 @@ 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 log = make_shared ("build/test/client_server_test_yuv.log"); shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + make_shared (image), DCPTime (), Crop (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), - Scaler::from_id ("bicubic"), EYES_BOTH, PART_WHOLE, ColourConversion () @@ -187,22 +189,20 @@ 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); - - Server* server = new Server (log, true); + Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); + + EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&Server::run, server, 2)); + new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription description ("localhost", 2); + EncodeServerDescription description ("localhost", 2); list threads; for (int i = 0; i < 8; ++i) { @@ -220,3 +220,95 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) delete server; } +BOOST_AUTO_TEST_CASE (client_server_test_j2k) +{ + shared_ptr 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]; + for (int j = 0; j < image->line_size()[i]; ++j) { + *p++ = j % 256; + } + } + + shared_ptr log = make_shared ("build/test/client_server_test_j2k.log"); + + shared_ptr raw_pvf ( + new PlayerVideo ( + make_shared (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 ( + /* This J2KImageProxy constructor is private, so no make_shared */ + 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)); + + EncodeServer* server = new EncodeServer (log, true, 2); + + new thread (boost::bind (&EncodeServer::run, server)); + + /* Let the server get itself ready */ + dcpomatic_sleep (1); + + EncodeServerDescription 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; +}