projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to tidy up internal APIs slightly.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 26554e46c2c941dd92562ef7ad197687e56cd665..e21f41c7998163ec7c5290e1b6aa0b3ba16797aa 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,19
+22,18
@@
* @brief Test the server class.
*
* Create a test image and then encode it using the standard mechanism
* @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
Encode
Server object running on localhost. Compare the resulting
* encoded data to check that they are the same.
*/
* 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/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 <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
#include "lib/file_log.h"
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
@@
-42,12
+42,13
@@
using std::list;
using boost::shared_ptr;
using boost::thread;
using boost::optional;
using boost::shared_ptr;
using boost::thread;
using boost::optional;
+using dcp::Data;
void
void
-do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame,
Encode
ServerDescription description, Data locally_encoded)
{
Data remotely_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);
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);
@@
-86,7
+87,6
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
@@
-112,14
+112,14
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
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);
/* Let the server get itself ready */
dcpomatic_sleep (1);
- ServerDescription description ("localhost", 2);
+
Encode
ServerDescription description ("localhost", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
@@
-166,7
+166,6
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
@@
-192,14
+191,14
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
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);
/* Let the server get itself ready */
dcpomatic_sleep (1);
- ServerDescription description ("localhost", 2);
+
Encode
ServerDescription description ("localhost", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
@@
-233,7
+232,6
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
@@
-259,8
+257,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
shared_ptr<PlayerVideo> j2k_pvf (
new PlayerVideo (
shared_ptr<PlayerVideo> j2k_pvf (
new PlayerVideo (
- shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))),
- DCPTime (),
+ shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080), AV_PIX_FMT_XYZ12LE)),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
@@
-284,14
+281,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));
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);
/* Let the server get itself ready */
dcpomatic_sleep (1);
- ServerDescription description ("localhost", 2);
+
Encode
ServerDescription description ("localhost", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {