/** @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
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;
- 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);
}
p += image->stride()[0];
}
- shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
}
}
- shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- PresetColourConversion::all().front().conversion
+ PresetColourConversion::all().front().conversion,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
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);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}