projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various bits mostly related to colour conversions.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index e5229b5ffa1794485d21d7b221507846c54c5d5f..7faf47c4158a72e5c86d88c37051a3b827f0cb12 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-17,8
+17,19
@@
*/
*/
+#include <boost/test/unit_test.hpp>
+#include <boost/thread.hpp>
+#include "lib/server.h"
+#include "lib/image.h"
+#include "lib/cross.h"
+#include "lib/dcp_video_frame.h"
+
+using std::list;
+using boost::shared_ptr;
+using boost::thread;
+
void
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));
@@
-30,7
+41,7
@@
do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* descriptio
BOOST_AUTO_TEST_CASE (client_server_test)
{
BOOST_AUTO_TEST_CASE (client_server_test)
{
- shared_ptr<Image> image (new
Simple
Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+ shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
@@
-43,7
+54,7
@@
BOOST_AUTO_TEST_CASE (client_server_test)
p += image->stride()[0];
}
p += image->stride()[0];
}
- shared_ptr<Image> sub_image (new
Simple
Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::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;
@@
-56,23
+67,16
@@
BOOST_AUTO_TEST_CASE (client_server_test)
p += sub_image->stride()[0];
}
p += sub_image->stride()[0];
}
-
shared_ptr<Subtitle> subtitle (new Subtitle (Position
(50, 60), sub_image));
+
// shared_ptr<Subtitle> subtitle (new Subtitle (Position<int>
(50, 60), sub_image));
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
shared_ptr<DCPVideoFrame> frame (
new DCPVideoFrame (
image,
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
shared_ptr<DCPVideoFrame> frame (
new DCPVideoFrame (
image,
- subtitle,
- libdcp::Size (1998, 1080),
- 0,
- 0,
- 1,
- Scaler::from_id ("bicubic"),
0,
0,
+ EYES_BOTH,
24,
24,
- "",
- 0,
200000000,
log
)
200000000,
log
)
@@
-86,13
+90,13
@@
BOOST_AUTO_TEST_CASE (client_server_test)
new thread (boost::bind (&Server::run, server, 2));
/* Let the server get itself ready */
new thread (boost::bind (&Server::run, server, 2));
/* Let the server get itself ready */
- d
vd
omatic_sleep (1);
+ d
cp
omatic_sleep (1);
ServerDescription description ("localhost", 2);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
ServerDescription description ("localhost", 2);
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) {