X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=8f31b596eb8f4d972f38eb95c3b9e84c8e9d921f;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=35ebfb52e1fc089d88383e5d0558b6719fa4f3c9;hpb=9e124e8ce2eb7a9faeb91b33169ab1ae4912afb0;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 35ebfb52e..8f31b596e 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -22,6 +22,8 @@ */ #include +#include +#include #include "encoder.h" #include "util.h" #include "film.h" @@ -31,6 +33,9 @@ #include "server.h" #include "cross.h" #include "writer.h" +#include "server_finder.h" +#include "player.h" +#include "dcp_video.h" #include "i18n.h" @@ -43,28 +48,37 @@ 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) - , _state (TRANSCODING) , _terminate (false) { - _have_a_real_frame[EYES_BOTH] = false; - _have_a_real_frame[EYES_LEFT] = false; - _have_a_real_frame[EYES_RIGHT] = 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))); } } @@ -75,18 +89,10 @@ Encoder::process_begin () _threads.push_back (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) { - _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i))); - } - } - _writer.reset (new Writer (_film, _job)); + ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); } - void Encoder::process_end () { @@ -125,11 +131,6 @@ Encoder::process_end () _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ())); } } - - { - boost::mutex::scoped_lock lm (_state_mutex); - _state = HASHING; - } _writer->finish (); _writer.reset (); @@ -177,8 +178,10 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, bool same) +Encoder::process_video (shared_ptr frame) { + _waker.nudge (); + boost::mutex::scoped_lock lock (_mutex); /* XXX: discard 3D here if required */ @@ -194,33 +197,36 @@ 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); - _have_a_real_frame[eyes] = false; - frame_done (); - } else if (same && _have_a_real_frame[eyes]) { - /* Use the last frame that we encoded. */ - _writer->repeat (_video_frames_out, eyes); + _writer->fake_write (_video_frames_out, frame->eyes ()); frame_done (); } else { /* Queue this new frame for encoding */ 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() + 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[eyes] = true; } - if (eyes != EYES_LEFT) { + if (frame->eyes() != EYES_LEFT) { ++_video_frames_out; } } @@ -234,10 +240,11 @@ Encoder::process_audio (shared_ptr data) 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 ()) { @@ -251,6 +258,7 @@ Encoder::terminate_threads () 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 @@ -272,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 (); @@ -332,3 +340,13 @@ Encoder::encoder_thread (optional server) _condition.notify_all (); } } +catch (...) +{ + store_current (); +} + +void +Encoder::server_found (ServerDescription s) +{ + add_worker_threads (s); +}