X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=68ef336a17a795ecf5925921fae5726bd4780017;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=26554e46c2c941dd92562ef7ad197687e56cd665;hpb=b67a3505b58ffd204ee1a2560be3026688be8f10;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 26554e46c..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,33 +22,35 @@ * @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 "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 +#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, 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_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); @@ -55,7 +58,7 @@ do_remote_encode (shared_ptr frame, ServerDescription description, Dat BOOST_AUTO_TEST_CASE (client_server_test_rgb) { - shared_ptr image (new Image (AV_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) { @@ -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 = 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; @@ -81,11 +84,11 @@ 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)), + make_shared (image), DCPTime (), Crop (), optional (), @@ -112,14 +115,14 @@ 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)); + 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,7 +142,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) BOOST_AUTO_TEST_CASE (client_server_test_yuv) { - shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); + 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]; @@ -148,7 +151,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 = 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; @@ -161,11 +164,11 @@ 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)), + make_shared (image), DCPTime (), Crop (), optional (), @@ -192,14 +195,14 @@ 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)); + 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) { @@ -219,7 +222,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) BOOST_AUTO_TEST_CASE (client_server_test_j2k) { - shared_ptr image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true)); + 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]; @@ -228,11 +231,11 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) } } - shared_ptr log (new FileLog ("build/test/client_server_test_j2k.log")); + shared_ptr log = make_shared ("build/test/client_server_test_j2k.log"); shared_ptr raw_pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image)), + make_shared (image), DCPTime (), Crop (), optional (), @@ -259,7 +262,8 @@ 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))), + /* This J2KImageProxy constructor is private, so no make_shared */ + shared_ptr (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))), DCPTime (), Crop (), optional (), @@ -284,14 +288,14 @@ 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)); + 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) {