_full_condition.notify_all ();
}
- BOOST_FOREACH (boost::thread& i, _worker_threads) {
+ BOOST_FOREACH (boost::thread* i, _worker_threads) {
try {
- i.join ();
+ i->join ();
} catch (...) {
}
+ delete i;
}
{
int
EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
{
+ Socket::ReadDigestScope ds (socket);
+
uint32_t length = socket->read_uint32 ();
scoped_array<char> buffer (new char[length]);
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
+ if (!ds.check()) {
+ throw NetworkError ("Checksums do not match");
+ }
+
DCPVideo dcp_video_frame (pvf, xml);
gettimeofday (&after_read, 0);
gettimeofday (&after_encode, 0);
try {
+ Socket::WriteDigestScope ds (socket);
socket->write (encoded.size());
socket->write (encoded.data().get(), encoded.size());
} catch (std::exception& e) {
}
for (int i = 0; i < _num_threads; ++i) {
- _worker_threads.push_back (thread(bind(&EncodeServer::worker_thread, this)));
+ boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
+ _worker_threads.push_back (t);
#ifdef DCPOMATIC_LINUX
- pthread_setname_np (_worker_threads.back().native_handle(), "encode-server-worker");
+ pthread_setname_np (t->native_handle(), "encode-server-worker");
#endif
}