X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=5dc9e47c772cb7ec0e7c13a91b332c54bce63307;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=a442e64d07fffdea9efbb8320d537a3f4a8908e6;hpb=e8a6e330570b817c6c5fdfef0f508f2cbe0168ef;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index a442e64d0..5dc9e47c7 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 @@ -33,9 +33,16 @@ #include "server.h" #include "cross.h" #include "writer.h" +#include "server_finder.h" +#include "player.h" +#include "player_video_frame.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; @@ -45,31 +52,25 @@ 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; - _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 @@ -79,10 +80,9 @@ Encoder::~Encoder () 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 ( - make_pair (d, new boost::thread (boost::bind (&Encoder::encoder_thread, this, d))) - ); + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d))); } } @@ -90,37 +90,22 @@ 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) { - add_worker_threads (*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 () { 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); } @@ -129,7 +114,7 @@ Encoder::process_end () 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 @@ -141,12 +126,12 @@ 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 ())); + LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index ()); try { - _writer->write ((*i)->encode_locally(), (*i)->frame (), (*i)->eyes ()); + _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 ()); } } @@ -196,50 +181,53 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, 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()); + LOG_TIMING ("decoder sleeps with queue of %1", _queue.size()); _condition.wait (lock); - TIMING ("decoder wakes with queue of %1", _queue.size()); + 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, 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, pvf->eyes ()); frame_done (); } else { /* Queue this new frame for encoding */ - TIMING ("adding to queue of %1", _queue.size ()); + LOG_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() + pvf, + _video_frames_out, + _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 (pvf->eyes() != EYES_LEFT) { ++_video_frames_out; } } @@ -259,28 +247,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 @@ -290,7 +269,7 @@ Encoder::encoder_thread (optional server) while (1) { - 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); @@ -300,9 +279,9 @@ Encoder::encoder_thread (optional server) return; } - TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); + LOG_TIMING ("[%1] encoder thread 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 ())); + 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 (); @@ -314,7 +293,7 @@ Encoder::encoder_thread (optional 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 */ @@ -325,31 +304,28 @@ Encoder::encoder_thread (optional 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 (), vf->eyes ()); + _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 (); } @@ -362,78 +338,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 ()) { - add_worker_threads (ServerDescription (ip, xml->number_child ("Threads"))); - } - } - } + add_worker_threads (s); }