X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=2b1f1d9b3bab37236f1bb69462d658e598216540;hb=15f23b356b757a9697bf1a9ec30c243ab8070404;hp=718ae55a4570773be52426e07e43230cb77e9bb8;hpb=5f1046a2164fff00a6fc74aecf4cacbca531d415;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 718ae55a4..2b1f1d9b3 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,18 +22,27 @@ */ #include +#include +#include #include "encoder.h" #include "util.h" #include "film.h" #include "log.h" #include "config.h" -#include "dcp_video_frame.h" +#include "dcp_video.h" #include "server.h" #include "cross.h" #include "writer.h" +#include "server_finder.h" +#include "player.h" +#include "player_video.h" #include "i18n.h" +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); +#define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); + using std::pair; using std::string; using std::stringstream; @@ -43,26 +52,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) - , _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) +{ + LOG_GENERAL (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))); } } @@ -70,40 +90,31 @@ 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 () { boost::mutex::scoped_lock lock (_mutex); - _film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ())); + LOG_GENERAL (N_("Clearing queue of %1"), _queue.size ()); /* Keep waking workers until the queue is empty */ while (!_queue.empty ()) { - _film->log()->log (String::compose (N_("Waking with %1"), _queue.size ()), Log::VERBOSE); - _condition.notify_all (); - _condition.wait (lock); + _empty_condition.notify_all (); + _full_condition.wait (lock); } lock.unlock (); terminate_threads (); - _film->log()->log (String::compose (N_("Mopping up %1"), _queue.size())); + LOG_GENERAL (N_("Mopping up %1"), _queue.size()); /* The following sequence of events can occur in the above code: 1. a remote worker takes the last image off the queue @@ -114,16 +125,16 @@ Encoder::process_end () So just mop up anything left in the queue here. */ - for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { - _film->log()->log (String::compose (N_("Encode left-over frame %1"), (*i)->frame ())); + for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { + LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index ()); try { - _writer->write ((*i)->encode_locally(), (*i)->frame ()); + _writer->write ((*i)->encode_locally(), (*i)->index (), (*i)->eyes ()); frame_done (); } catch (std::exception& e) { - _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ())); + LOG_ERROR (N_("Local encode failed (%1)"), e.what ()); } } - + _writer->finish (); _writer.reset (); } @@ -134,7 +145,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; } @@ -149,7 +160,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; } @@ -159,7 +170,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); @@ -170,48 +181,58 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, bool same) +Encoder::process_video (shared_ptr pvf) { + _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()); - _condition.wait (lock); - TIMING ("decoder wakes with queue of %1", _queue.size()); + LOG_TIMING ("decoder sleeps with queue of %1", _queue.size()); + _full_condition.wait (lock); + LOG_TIMING ("decoder wakes with queue of %1", _queue.size()); } if (_terminate) { 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); - _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, pvf->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, _film->dcp_video_frame_rate(), - _film->j2k_bandwidth(), _film->log() + LOG_TIMING ("adding to queue of %1", _queue.size ()); + _queue.push_back (shared_ptr ( + new DCPVideo ( + pvf, + _video_frames_out, + _film->video_frame_rate(), + _film->j2k_bandwidth(), + _film->resolution(), + _film->log() ) )); - - _condition.notify_all (); - _have_a_real_frame = true; + + /* The queue might not be empty any more, so notify anything which is + waiting on that. + */ + _empty_condition.notify_all (); } - ++_video_frames_out; + if (pvf->eyes() != EYES_LEFT) { + ++_video_frames_out; + } } void @@ -223,10 +244,12 @@ 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; + _full_condition.notify_all (); + _empty_condition.notify_all (); + } for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { if ((*i)->joinable ()) { @@ -239,7 +262,8 @@ Encoder::terminate_threads () } 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 @@ -247,21 +271,21 @@ Encoder::encoder_thread (ServerDescription* server) */ int remote_backoff = 0; - while (1) { + while (true) { - TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id()); + LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id()); boost::mutex::scoped_lock lock (_mutex); while (_queue.empty () && !_terminate) { - _condition.wait (lock); + _empty_condition.wait (lock); } if (_terminate) { return; } - 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); + LOG_TIMING ("[%1] encoder thread wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); + shared_ptr vf = _queue.front (); + LOG_TIMING ("[%1] encoder thread pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->index(), vf->eyes ()); _queue.pop_front (); lock.unlock (); @@ -270,10 +294,10 @@ 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 ())); + LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ()); } /* This job succeeded, so remove any backoff */ @@ -284,31 +308,28 @@ Encoder::encoder_thread (ServerDescription* server) /* back off more */ remote_backoff += 10; } - _film->log()->log ( - String::compose ( - N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"), - vf->frame(), server->host_name(), e.what(), remote_backoff) + LOG_ERROR ( + N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"), + vf->index(), server->host_name(), e.what(), remote_backoff ); } } else { try { - TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame()); + LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index()); encoded = vf->encode_locally (); - TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame()); + LOG_TIMING ("[%1] encoder thread finishes local encode of %2", boost::this_thread::get_id(), vf->index()); } catch (std::exception& e) { - _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ())); + LOG_ERROR (N_("Local encode failed (%1)"), e.what ()); } } if (encoded) { - _writer->write (encoded, vf->frame ()); + _writer->write (encoded, vf->index (), vf->eyes ()); frame_done (); } else { lock.lock (); - _film->log()->log ( - String::compose (N_("Encoder thread %1 pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->frame()) - ); + LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->index()); _queue.push_front (vf); lock.unlock (); } @@ -317,7 +338,18 @@ Encoder::encoder_thread (ServerDescription* server) dcpomatic_sleep (remote_backoff); } + /* The queue might not be full any more, so notify anything that is waiting on that */ lock.lock (); - _condition.notify_all (); + _full_condition.notify_all (); } } +catch (...) +{ + store_current (); +} + +void +Encoder::server_found (ServerDescription s) +{ + add_worker_threads (s); +}