/** @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
Data remotely_encoded;
BOOST_CHECK_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);
}
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
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);
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
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);
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image)),
- DCPTime (),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
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),
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);
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}