X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=8f31b596eb8f4d972f38eb95c3b9e84c8e9d921f;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=52927c5d324f054250e939f96d9e4b841153e2a1;hpb=b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 52927c5d3..8f31b596e 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -22,24 +22,20 @@ */ #include -#include -#include -#include +#include +#include #include "encoder.h" #include "util.h" #include "film.h" #include "log.h" -#include "exceptions.h" -#include "filter.h" #include "config.h" #include "dcp_video_frame.h" #include "server.h" -#include "format.h" #include "cross.h" #include "writer.h" +#include "server_finder.h" #include "player.h" -#include "audio_mapping.h" -#include "container.h" +#include "dcp_video.h" #include "i18n.h" @@ -49,28 +45,40 @@ using std::stringstream; using std::vector; using std::list; 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) - , _have_a_real_frame (false) , _terminate (false) { - + } Encoder::~Encoder () { terminate_threads (); - if (_writer) { - _writer->finish (); +} + +/** 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_threads (ServerDescription d) +{ + _film->log()->log (String::compose (N_("Adding %1 worker threads for remote %2"), d.host_name ())); + for (int i = 0; i < d.threads(); ++i) { + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d))); } } @@ -78,21 +86,13 @@ void Encoder::process_begin () { for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { - _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0))); - } - - vector servers = Config::instance()->servers (); - - for (vector::iterator i = servers.begin(); i != servers.end(); ++i) { - for (int j = 0; j < (*i)->threads (); ++j) { - _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i))); - } + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ()))); } _writer.reset (new Writer (_film, _job)); + ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); } - void Encoder::process_end () { @@ -125,13 +125,13 @@ Encoder::process_end () for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { _film->log()->log (String::compose (N_("Encode left-over frame %1"), (*i)->frame ())); try { - _writer->write ((*i)->encode_locally(), (*i)->frame ()); + _writer->write ((*i)->encode_locally(), (*i)->frame (), (*i)->eyes ()); frame_done (); } catch (std::exception& e) { _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ())); } } - + _writer->finish (); _writer.reset (); } @@ -142,7 +142,7 @@ Encoder::process_end () float Encoder::current_encoding_rate () const { - boost::mutex::scoped_lock lock (_history_mutex); + boost::mutex::scoped_lock lock (_state_mutex); if (int (_time_history.size()) < _history_size) { return 0; } @@ -157,7 +157,7 @@ Encoder::current_encoding_rate () const int Encoder::video_frames_out () const { - boost::mutex::scoped_lock (_history_mutex); + boost::mutex::scoped_lock (_state_mutex); return _video_frames_out; } @@ -167,7 +167,7 @@ Encoder::video_frames_out () const void Encoder::frame_done () { - boost::mutex::scoped_lock lock (_history_mutex); + boost::mutex::scoped_lock lock (_state_mutex); struct timeval tv; gettimeofday (&tv, 0); @@ -178,10 +178,14 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, bool same, shared_ptr sub, Time) +Encoder::process_video (shared_ptr frame) { + _waker.nudge (); + boost::mutex::scoped_lock lock (_mutex); + /* XXX: discard 3D here if required */ + /* Wait until the queue has gone down a bit */ while (_queue.size() >= _threads.size() * 2 && !_terminate) { TIMING ("decoder sleeps with queue of %1", _queue.size()); @@ -193,42 +197,42 @@ Encoder::process_video (shared_ptr image, bool same, shared_ptrthrown ()) { - _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); - _have_a_real_frame = false; - frame_done (); - } else if (same && _have_a_real_frame) { - /* Use the last frame that we encoded. */ - _writer->repeat (_video_frames_out); + _writer->fake_write (_video_frames_out, frame->eyes ()); frame_done (); } else { /* Queue this new frame for encoding */ - pair const s = Filter::ffmpeg_strings (_film->filters()); TIMING ("adding to queue of %1", _queue.size ()); - /* XXX: padding */ _queue.push_back (shared_ptr ( new DCPVideoFrame ( - image, sub, _film->container()->dcp_size(), 0, - _film->subtitle_offset(), _film->subtitle_scale(), - _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(), s.second, - _film->colour_lut(), _film->j2k_bandwidth(), + frame->image(PIX_FMT_RGB24, false), + _video_frames_out, + frame->eyes(), + frame->conversion(), + _film->video_frame_rate(), + _film->j2k_bandwidth(), + _film->resolution(), _film->log() ) )); _condition.notify_all (); - _have_a_real_frame = true; } - ++_video_frames_out; + if (frame->eyes() != EYES_LEFT) { + ++_video_frames_out; + } } void -Encoder::process_audio (shared_ptr data, Time) +Encoder::process_audio (shared_ptr data) { _writer->write (data); } @@ -236,10 +240,11 @@ Encoder::process_audio (shared_ptr data, Time) void Encoder::terminate_threads () { - boost::mutex::scoped_lock lock (_mutex); - _terminate = true; - _condition.notify_all (); - lock.unlock (); + { + boost::mutex::scoped_lock lock (_mutex); + _terminate = true; + _condition.notify_all (); + } for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { if ((*i)->joinable ()) { @@ -247,10 +252,13 @@ Encoder::terminate_threads () } delete *i; } + + _threads.clear (); } void -Encoder::encoder_thread (ServerDescription* server) +Encoder::encoder_thread (optional server) +try { /* Number of seconds that we currently wait between attempts to connect to the server; not relevant for localhost @@ -272,7 +280,7 @@ Encoder::encoder_thread (ServerDescription* 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 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE); + TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ()); _queue.pop_front (); lock.unlock (); @@ -281,7 +289,7 @@ Encoder::encoder_thread (ServerDescription* server) if (server) { try { - encoded = vf->encode_remotely (server); + encoded = vf->encode_remotely (server.get ()); if (remote_backoff > 0) { _film->log()->log (String::compose (N_("%1 was lost, but now she is found; removing backoff"), server->host_name ())); @@ -313,7 +321,7 @@ Encoder::encoder_thread (ServerDescription* server) } if (encoded) { - _writer->write (encoded, vf->frame ()); + _writer->write (encoded, vf->frame (), vf->eyes ()); frame_done (); } else { lock.lock (); @@ -332,3 +340,13 @@ Encoder::encoder_thread (ServerDescription* server) _condition.notify_all (); } } +catch (...) +{ + store_current (); +} + +void +Encoder::server_found (ServerDescription s) +{ + add_worker_threads (s); +}