X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=d77ed4c15e4462bf0132895b192957e002f86aea;hp=26554e46c2c941dd92562ef7ad197687e56cd665;hb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;hpb=b67a3505b58ffd204ee1a2560be3026688be8f10 diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 26554e46c..d77ed4c15 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,39 +1,40 @@ /* 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 . */ /** @file test/client_server_test.cc * @brief Test the server class. + * @ingroup specific * * 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 "lib/server.h" +#include "lib/encode_server.h" #include "lib/image.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/data.h" -#include "lib/server_description.h" +#include "lib/encode_server_description.h" #include "lib/file_log.h" #include #include @@ -42,14 +43,16 @@ using std::list; using boost::shared_ptr; using boost::thread; using boost::optional; +using boost::weak_ptr; +using dcp::Data; void -do_remote_encode (shared_ptr frame, ServerDescription description, Data locally_encoded) +do_remote_encode (shared_ptr frame, EncodeServerDescription description, Data locally_encoded) { Data remotely_encoded; - BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); + BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60)); - BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size()); + BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size()); BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0); } @@ -68,7 +71,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)); + shared_ptr sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -86,14 +89,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr pvf ( new PlayerVideo ( shared_ptr (new RawImageProxy (image)), - DCPTime (), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - ColourConversion () + ColourConversion(), + weak_ptr(), + optional() ) ); @@ -112,14 +116,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); - Server* server = new Server (log, true); + EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&Server::run, server, 2)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription 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; for (int i = 0; i < 8; ++i) { @@ -134,6 +139,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } @@ -148,7 +156,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) } } - shared_ptr sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true)); uint8_t* p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -166,14 +174,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr pvf ( new PlayerVideo ( shared_ptr (new RawImageProxy (image)), - DCPTime (), Crop (), optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), EYES_BOTH, PART_WHOLE, - ColourConversion () + ColourConversion(), + weak_ptr(), + optional() ) ); @@ -192,14 +201,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); - Server* server = new Server (log, true); + EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&Server::run, server, 2)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription 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; for (int i = 0; i < 8; ++i) { @@ -214,6 +224,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; } @@ -233,14 +246,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) 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 () + ColourConversion(), + weak_ptr(), + optional() ) ); @@ -259,15 +273,16 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) shared_ptr j2k_pvf ( new PlayerVideo ( - shared_ptr (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))), - DCPTime (), + 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 + PresetColourConversion::all().front().conversion, + weak_ptr(), + optional() ) ); @@ -284,14 +299,15 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2)); - Server* server = new Server (log, true); + EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&Server::run, server, 2)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription 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; for (int i = 0; i < 8; ++i) { @@ -306,5 +322,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) delete *i; } + server->stop (); + server_thread->join (); + delete server_thread; delete server; }