projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add stub fi_FI.po files.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 1f77f7f907cc718a0bcf61dd32b41881c9dd34c3..b3d57e8139c0cc0dd244b1e49e602f449332404b 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-20,6
+20,7
@@
/** @file test/client_server_test.cc
* @brief Test the server class.
/** @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 EncodeServer object running on localhost. Compare the resulting
*
* Create a test image and then encode it using the standard mechanism
* and also using a EncodeServer object running on localhost. Compare the resulting
@@
-42,15
+43,16
@@
using std::list;
using boost::shared_ptr;
using boost::thread;
using boost::optional;
using boost::shared_ptr;
using boost::thread;
using boost::optional;
+using boost::weak_ptr;
using dcp::Data;
void
do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
{
Data remotely_encoded;
using dcp::Data;
void
do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
{
Data remotely_encoded;
- BOOST_
CHECK
_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+ 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);
}
BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
}
@@
-69,7
+71,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
p += image->stride()[0];
}
p += image->stride()[0];
}
- shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_
RGB
A, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_
BGR
A, dcp::Size (100, 200), true));
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-87,14
+89,15
@@
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),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
)
);
@@
-115,12
+118,13
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
EncodeServer* server = new EncodeServer (log, true, 2);
EncodeServer* server = new EncodeServer (log, true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+
thread* server_thread =
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 1);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
@@
-135,6
+139,9
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
delete *i;
}
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
delete server;
}
@@
-149,7
+156,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
}
}
}
}
- shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_
RGB
A, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_
BGR
A, dcp::Size (100, 200), true));
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-167,14
+174,15
@@
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),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
)
);
@@
-195,12
+203,13
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
EncodeServer* server = new EncodeServer (log, true, 2);
EncodeServer* server = new EncodeServer (log, true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+
thread* server_thread =
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
@@
-215,6
+224,9
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
delete *i;
}
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
delete server;
}
@@
-234,14
+246,15
@@
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),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
)
);
@@
-260,15
+273,16
@@
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),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- PresetColourConversion::all().front().conversion
+ PresetColourConversion::all().front().conversion,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
)
);
@@
-287,12
+301,13
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
EncodeServer* server = new EncodeServer (log, true, 2);
EncodeServer* server = new EncodeServer (log, true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+
thread* server_thread =
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
@@
-307,5
+322,8
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
delete *i;
}
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
delete server;
}