X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=b35f49a1b9460372d8cd1b458b40ad41edae8f1c;hp=5dc9e47c772cb7ec0e7c13a91b332c54bce63307;hb=dbf43f9113d88245f27493fd5d6950ba142b7f1f;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 5dc9e47c7..b35f49a1b 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -21,21 +21,24 @@ * @brief Parent class for classes which can encode video and audio frames. */ -#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_frame.h" +#include "player_video.h" +#include "data.h" +#include "server_description.h" +#include "compose.hpp" +#include +#include +#include #include "i18n.h" @@ -43,29 +46,25 @@ #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; -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, weak_ptr j) - : _film (f) +Encoder::Encoder (shared_ptr film, weak_ptr j, shared_ptr writer) + : _film (film) , _job (j) - , _video_frames_out (0) + , _video_frames_enqueued (0) + , _left_done (false) + , _right_done (false) , _terminate (false) + , _writer (writer) { - + servers_list_changed (); } Encoder::~Encoder () @@ -73,32 +72,16 @@ Encoder::~Encoder () terminate_threads (); } -/** 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))); - } -} - void -Encoder::process_begin () +Encoder::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, optional ()))); + if (!ServerFinder::instance()->disabled ()) { + _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this)); } - - _writer.reset (new Writer (_film, _job)); - ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1)); } void -Encoder::process_end () +Encoder::end () { boost::mutex::scoped_lock lock (_mutex); @@ -106,12 +89,12 @@ Encoder::process_end () /* Keep waking workers until the queue is empty */ while (!_queue.empty ()) { - _condition.notify_all (); - _condition.wait (lock); + _empty_condition.notify_all (); + _full_condition.wait (lock); } lock.unlock (); - + terminate_threads (); LOG_GENERAL (N_("Mopping up %1"), _queue.size()); @@ -125,19 +108,20 @@ Encoder::process_end () So just mop up anything left in the queue here. */ - for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { + 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)->index (), (*i)->eyes ()); + _writer->write ( + (*i)->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)), + (*i)->index (), + (*i)->eyes () + ); frame_done (); } catch (std::exception& e) { LOG_ERROR (N_("Local encode failed (%1)"), e.what ()); } } - - _writer->finish (); - _writer.reset (); -} +} /** @return an estimate of the current number of frames we are encoding per second, * or 0 if not known. @@ -161,7 +145,7 @@ int Encoder::video_frames_out () const { boost::mutex::scoped_lock (_state_mutex); - return _video_frames_out; + return _video_frames_enqueued; } /** Should be called when a frame has been encoded successfully. @@ -171,7 +155,7 @@ void Encoder::frame_done () { boost::mutex::scoped_lock lock (_state_mutex); - + struct timeval tv; gettimeofday (&tv, 0); _time_history.push_front (tv); @@ -180,20 +164,23 @@ Encoder::frame_done () } } +/** Called in order, so each time this is called the supplied frame is the one + * after the previous one. + */ void -Encoder::process_video (shared_ptr pvf) +Encoder::enqueue (shared_ptr pv) { _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) { - LOG_TIMING ("decoder sleeps with queue of %1", _queue.size()); - _condition.wait (lock); - LOG_TIMING ("decoder wakes with queue of %1", _queue.size()); + LOG_TIMING ("decoder-sleep queue=%1", _queue.size()); + _full_condition.wait (lock); + LOG_TIMING ("decoder-wake queue=%1", _queue.size()); } if (_terminate) { @@ -207,35 +194,55 @@ Encoder::process_video (shared_ptr pvf) */ rethrow (); - if (_writer->can_fake_write (_video_frames_out)) { - _writer->fake_write (_video_frames_out, pvf->eyes ()); + if (_writer->can_fake_write (_video_frames_enqueued)) { + /* We can fake-write this frame */ + _writer->fake_write (_video_frames_enqueued, pv->eyes ()); frame_done (); + } else if (pv->has_j2k ()) { + /* This frame already has JPEG2000 data, so just write it */ + _writer->write (pv->j2k(), _video_frames_enqueued, pv->eyes ()); + } else if (_last_player_video && pv->same (_last_player_video)) { + _writer->repeat (_video_frames_enqueued, pv->eyes ()); } else { /* Queue this new frame for encoding */ - LOG_TIMING ("adding to queue of %1", _queue.size ()); - _queue.push_back (shared_ptr ( - new DCPVideoFrame ( - pvf, - _video_frames_out, + LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ()); + _queue.push_back (shared_ptr ( + new DCPVideo ( + pv, + _video_frames_enqueued, _film->video_frame_rate(), _film->j2k_bandwidth(), _film->resolution(), _film->log() ) )); - - _condition.notify_all (); + + /* The queue might not be empty any more, so notify anything which is + waiting on that. + */ + _empty_condition.notify_all (); } - if (pvf->eyes() != EYES_LEFT) { - ++_video_frames_out; + switch (pv->eyes ()) { + case EYES_BOTH: + ++_video_frames_enqueued; + break; + case EYES_LEFT: + _left_done = true; + break; + case EYES_RIGHT: + _right_done = true; + break; + default: + break; } -} -void -Encoder::process_audio (shared_ptr data) -{ - _writer->write (data); + if (_left_done && _right_done) { + ++_video_frames_enqueued; + _left_done = _right_done = false; + } + + _last_player_video = pv; } void @@ -244,7 +251,8 @@ Encoder::terminate_threads () { boost::mutex::scoped_lock lock (_mutex); _terminate = true; - _condition.notify_all (); + _full_condition.notify_all (); + _empty_condition.notify_all (); } for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { @@ -255,39 +263,47 @@ Encoder::terminate_threads () } _threads.clear (); + _terminate = false; } void Encoder::encoder_thread (optional server) try { + if (server) { + LOG_TIMING ("start-encoder-thread thread=%1 server=%2", boost::this_thread::get_id (), server->host_name ()); + } else { + LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", boost::this_thread::get_id ()); + } + /* Number of seconds that we currently wait between attempts to connect to the server; not relevant for localhost encodings. */ int remote_backoff = 0; - - while (1) { - LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id()); + while (true) { + + LOG_TIMING ("encoder-sleep thread=%1", 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; } - 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 ()); + LOG_TIMING ("encoder-wake thread=%1 queue=%2", boost::this_thread::get_id(), _queue.size()); + shared_ptr vf = _queue.front (); + LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", boost::this_thread::get_id(), vf->index(), vf->eyes ()); _queue.pop_front (); - + lock.unlock (); - shared_ptr encoded; + optional encoded; + /* We need to encode this input */ if (server) { try { encoded = vf->encode_remotely (server.get ()); @@ -295,10 +311,10 @@ try if (remote_backoff > 0) { LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ()); } - + /* This job succeeded, so remove any backoff */ remote_backoff = 0; - + } catch (std::exception& e) { if (remote_backoff < 60) { /* back off more */ @@ -309,19 +325,19 @@ try vf->index(), server->host_name(), e.what(), remote_backoff ); } - + } else { try { - LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index()); - encoded = vf->encode_locally (); - LOG_TIMING ("[%1] encoder thread finishes local encode of %2", boost::this_thread::get_id(), vf->index()); + LOG_TIMING ("start-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index()); + encoded = vf->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + LOG_TIMING ("finish-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index()); } catch (std::exception& e) { LOG_ERROR (N_("Local encode failed (%1)"), e.what ()); } } if (encoded) { - _writer->write (encoded, vf->index (), vf->eyes ()); + _writer->write (encoded.get(), vf->index (), vf->eyes ()); frame_done (); } else { lock.lock (); @@ -334,8 +350,9 @@ try 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 (...) @@ -344,7 +361,24 @@ catch (...) } void -Encoder::server_found (ServerDescription s) +Encoder::servers_list_changed () { - add_worker_threads (s); + terminate_threads (); + + /* XXX: could re-use threads */ + + if (!Config::instance()->only_servers_encode ()) { + for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) { + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ()))); + } + } + + BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) { + LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), i.threads(), i.host_name ()); + for (int j = 0; j < i.threads(); ++j) { + _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, i))); + } + } + + _writer->set_encoder_threads (_threads.size ()); }