X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=7863859deb817d3c66f364afb3613c5175108a65;hb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;hp=f1d2375b609f4c1addea946466be534b5e5080ac;hpb=f660fe3f1be97f373318806a77b3ce3fcd53cb73;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index f1d2375b6..7863859de 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -33,6 +33,8 @@ #include "server.h" #include "cross.h" #include "writer.h" +#include "server_finder.h" +#include "player.h" #include "i18n.h" @@ -45,19 +47,18 @@ using std::cout; using std::min; using std::make_pair; using boost::shared_ptr; +using boost::weak_ptr; using boost::optional; using boost::scoped_array; int const Encoder::_history_size = 25; /** @param f Film that we are encoding */ -Encoder::Encoder (shared_ptr f, shared_ptr j) +Encoder::Encoder (shared_ptr f, weak_ptr j) : _film (f) , _job (j) , _video_frames_out (0) , _terminate (false) - , _broadcast_thread (0) - , _listen_thread (0) { _have_a_real_frame[EYES_BOTH] = false; _have_a_real_frame[EYES_LEFT] = false; @@ -67,50 +68,31 @@ Encoder::Encoder (shared_ptr f, shared_ptr j) Encoder::~Encoder () { terminate_threads (); - if (_writer) { - _writer->finish (); - } } -/** Add a worker thread for a remote server. Caller must hold +/** Add a worker thread for a each thread on a remote server. Caller must hold * a lock on _mutex, or know that one is not currently required to * safely modify _threads. */ void -Encoder::add_worker_thread (ServerDescription d) +Encoder::add_worker_threads (ServerDescription d) { - _threads.push_back ( - make_pair (d, new boost::thread (boost::bind (&Encoder::encoder_thread, this, d))) - ); + for (int i = 0; i < d.threads(); ++i) { + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d))); + } } void Encoder::process_begin () { for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { - _threads.push_back ( - make_pair ( - optional (), - new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ())) - ) - ); - } - - vector servers = Config::instance()->servers (); - - for (vector::iterator i = servers.begin(); i != servers.end(); ++i) { - for (int j = 0; j < i->threads (); ++j) { - add_worker_thread (*i); - } + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ()))); } - _broadcast_thread = new boost::thread (boost::bind (&Encoder::broadcast_thread, this)); - _listen_thread = new boost::thread (boost::bind (&Encoder::listen_thread, this)); - _writer.reset (new Writer (_film, _job)); + ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); } - void Encoder::process_end () { @@ -196,8 +178,10 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, bool same) +Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, bool same) { + _waker.nudge (); + boost::mutex::scoped_lock lock (_mutex); /* XXX: discard 3D here if required */ @@ -213,9 +197,12 @@ Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversi return; } - if (_writer->thrown ()) { - _writer->rethrow (); - } + _writer->rethrow (); + /* Re-throw any exception raised by one of our threads. If more + than one has thrown an exception, only one will be rethrown, I think; + but then, if that happens something has gone badly wrong. + */ + rethrow (); if (_writer->can_fake_write (_video_frames_out)) { _writer->fake_write (_video_frames_out, eyes); @@ -230,8 +217,8 @@ Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversi TIMING ("adding to queue of %1", _queue.size ()); _queue.push_back (shared_ptr ( new DCPVideoFrame ( - image, _video_frames_out, eyes, conversion, _film->video_frame_rate(), - _film->j2k_bandwidth(), _film->log() + image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(), + _film->j2k_bandwidth(), _film->resolution(), _film->log() ) )); @@ -259,28 +246,19 @@ Encoder::terminate_threads () _condition.notify_all (); } - for (ThreadList::iterator i = _threads.begin(); i != _threads.end(); ++i) { - if (i->second->joinable ()) { - i->second->join (); + for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { + if ((*i)->joinable ()) { + (*i)->join (); } - delete i->second; + delete *i; } _threads.clear (); - - if (_broadcast_thread && _broadcast_thread->joinable ()) { - _broadcast_thread->join (); - } - delete _broadcast_thread; - - if (_listen_thread && _listen_thread->joinable ()) { - _listen_thread->join (); - } - delete _listen_thread; } void Encoder::encoder_thread (optional server) +try { /* Number of seconds that we currently wait between attempts to connect to the server; not relevant for localhost @@ -302,7 +280,7 @@ Encoder::encoder_thread (optional server) TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); shared_ptr vf = _queue.front (); - _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ())); + TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ()); _queue.pop_front (); lock.unlock (); @@ -362,81 +340,13 @@ Encoder::encoder_thread (optional server) _condition.notify_all (); } } - -void -Encoder::broadcast_thread () +catch (...) { - boost::system::error_code error; - boost::asio::io_service io_service; - boost::asio::ip::udp::socket socket (io_service); - socket.open (boost::asio::ip::udp::v4(), error); - if (error) { - throw NetworkError ("failed to set up broadcast socket"); - } - - socket.set_option (boost::asio::ip::udp::socket::reuse_address (true)); - socket.set_option (boost::asio::socket_base::broadcast (true)); - - boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1); - - while (1) { - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - socket.close (error); - return; - } - - string data = DCPOMATIC_HELLO; - socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point); - - lm.unlock (); - dcpomatic_sleep (10); - } + store_current (); } void -Encoder::listen_thread () +Encoder::server_found (ServerDescription s) { - while (1) { - { - /* See if we need to stop */ - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - return; - } - } - - shared_ptr sock (new Socket (10)); - - try { - sock->accept (Config::instance()->server_port_base() + 1); - } catch (std::exception& e) { - continue; - } - - uint32_t length = sock->read_uint32 (); - scoped_array buffer (new char[length]); - sock->read (reinterpret_cast (buffer.get()), length); - - stringstream s (buffer.get()); - shared_ptr xml (new cxml::Document ("ServerAvailable")); - xml->read_stream (s); - - { - /* See if we already know about this server */ - string const ip = sock->socket().remote_endpoint().address().to_string (); - boost::mutex::scoped_lock lm (_mutex); - ThreadList::iterator i = _threads.begin(); - while (i != _threads.end() && (!i->first || i->first->host_name() != ip)) { - ++i; - } - - if (i == _threads.end ()) { - cout << "Adding a thread for " << ip << "\n"; - add_worker_thread (ServerDescription (ip, xml->number_child ("Threads"))); - } else { - cout << "Already know about " << ip << "\n"; - } - } - } + add_worker_threads (s); }