using std::cout;
using std::cerr;
using std::fixed;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::thread;
using boost::bind;
using boost::scoped_array;
using boost::optional;
+using dcp::ArrayData;
using dcp::Size;
-using dcp::Data;
using dcp::raw_convert;
EncodeServer::EncodeServer (bool verbose, int num_threads)
EncodeServer::~EncodeServer ()
{
+ boost::this_thread::disable_interruption dis;
+
{
boost::mutex::scoped_lock lm (_mutex);
_terminate = true;
}
_broadcast.io_service.stop ();
- if (_broadcast.thread.joinable()) {
- try {
- _broadcast.thread.join ();
- } catch (...) {
-
- }
- }
+ try {
+ _broadcast.thread.join ();
+ } catch (...) {}
}
/** @param after_read Filled in with gettimeofday() after reading the input from the network.
gettimeofday (&after_read, 0);
- Data encoded = dcp_video_frame.encode_locally ();
+ ArrayData encoded = dcp_video_frame.encode_locally ();
gettimeofday (&after_encode, 0);
try {
Socket::WriteDigestScope ds (socket);
socket->write (encoded.size());
- socket->write (encoded.data().get(), encoded.size());
+ socket->write (encoded.data(), encoded.size());
} catch (std::exception& e) {
cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());