projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow specification of DCP to build KDMs for (#235).
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 2dc1545d603dd48192299276800f3f7977fd3dd5..8662f54e8f6a3fa11f482da25b423c32e0e125cb 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-29,7
+29,7
@@
using boost::shared_ptr;
using boost::thread;
void
using boost::thread;
void
-do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription
*
description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
{
shared_ptr<EncodedData> remotely_encoded;
BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
{
shared_ptr<EncodedData> remotely_encoded;
BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@
-76,6
+76,7
@@
BOOST_AUTO_TEST_CASE (client_server_test)
image,
0,
EYES_BOTH,
image,
0,
EYES_BOTH,
+ ColourConversion (),
24,
200000000,
log
24,
200000000,
log
@@
-96,7
+97,7
@@
BOOST_AUTO_TEST_CASE (client_server_test)
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
- threads.push_back (new thread (boost::bind (do_remote_encode, frame,
&
description, locally_encoded)));
+ threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded)));
}
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
}
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {