X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=364d29fbed589228c60b9d304984914e944c1646;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=ef58ca09e6e71b85fb7c0c6e29d192fb3dfb468f;hpb=aac97a7653003ab7032d927eeb236cff4ad726d1;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index ef58ca09e..364d29fbe 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,14 +28,12 @@ #include "log.h" #include "config.h" #include "dcp_video.h" -#include "server.h" #include "cross.h" #include "writer.h" -#include "server_finder.h" +#include "encode_server_finder.h" #include "player.h" #include "player_video.h" -#include "data.h" -#include "server_description.h" +#include "encode_server_description.h" #include "compose.hpp" #include #include @@ -42,28 +41,23 @@ #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); -#define LOG_GENERAL_NC(...) _film->log()->log (__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); +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); +#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); +#define LOG_TIMING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING); using std::list; using std::cout; using boost::shared_ptr; using boost::weak_ptr; using boost::optional; +using dcp::Data; -int const Encoder::_history_size = 25; +int const Encoder::_history_size = 200; /** @param f Film that we are encoding */ -Encoder::Encoder (shared_ptr film, weak_ptr j, shared_ptr writer) +Encoder::Encoder (shared_ptr film, shared_ptr writer) : _film (film) - , _job (j) - , _video_frames_enqueued (0) - , _left_done (false) - , _right_done (false) - , _terminate_enqueue (false) - , _terminate_encoding (false) , _writer (writer) { servers_list_changed (); @@ -71,19 +65,35 @@ Encoder::Encoder (shared_ptr film, weak_ptr j, shared_ptrdisabled ()) { - _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this)); + weak_ptr wp = shared_from_this (); + _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect ( + boost::bind (&Encoder::call_servers_list_changed, wp) + ); +} + +/* We don't want the servers-list-changed callback trying to do things + during destruction of Encoder, and I think this is the neatest way + to achieve that. +*/ +void +Encoder::call_servers_list_changed (weak_ptr encoder) +{ + shared_ptr e = encoder.lock (); + if (e) { + e->servers_list_changed (); } } @@ -150,12 +160,15 @@ Encoder::current_encoding_rate () const return _history_size / (seconds (now) - seconds (_time_history.back ())); } -/** @return Number of video frames that have been sent out */ +/** @return Number of video frames that have been queued for encoding */ int -Encoder::video_frames_out () const +Encoder::video_frames_enqueued () const { - boost::mutex::scoped_lock (_state_mutex); - return _video_frames_enqueued; + if (!_last_player_video) { + return 0; + } + + return _last_player_video->time().frames_floor (_film->video_frame_rate ()); } /** Should be called when a frame has been encoded successfully. @@ -174,11 +187,13 @@ Encoder::frame_done () } } -/** Called in order, so each time this is called the supplied frame is the one - * after the previous one. +/** Called to start encoding of the next video frame in the DCP. This is called in order, + * so each time the supplied frame is the one after the previous one. + * pv represents one video frame, and could be empty if there is nothing to encode + * for this DCP frame. */ void -Encoder::enqueue (shared_ptr pv) +Encoder::encode (shared_ptr pv) { _waker.nudge (); @@ -190,17 +205,13 @@ Encoder::enqueue (shared_ptr pv) boost::mutex::scoped_lock queue_lock (_queue_mutex); - /* XXX: discard 3D here if required */ - - /* Wait until the queue has gone down a bit */ - while (_queue.size() >= threads * 2 && !_terminate_enqueue) { - LOG_TIMING ("decoder-sleep queue=%1", _queue.size()); + /* Wait until the queue has gone down a bit. Allow one thing in the queue even + when there are no threads. + */ + while (_queue.size() >= (threads * 2) + 1) { + LOG_TIMING ("decoder-sleep queue=%1 threads=%2", _queue.size(), threads); _full_condition.wait (queue_lock); - LOG_TIMING ("decoder-wake queue=%1", _queue.size()); - } - - if (_terminate_enqueue) { - return; + LOG_TIMING ("decoder-wake queue=%1 threads=%2", _queue.size(), threads); } _writer->rethrow (); @@ -210,22 +221,24 @@ Encoder::enqueue (shared_ptr pv) */ rethrow (); - if (_writer->can_fake_write (_video_frames_enqueued)) { + Frame const position = pv->time().frames_floor(_film->video_frame_rate()); + + if (_writer->can_fake_write (position)) { /* We can fake-write this frame */ - _writer->fake_write (_video_frames_enqueued, pv->eyes ()); + _writer->fake_write (position, 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 ()); + _writer->write (pv->j2k(), position, pv->eyes ()); + } else if (_last_player_video && _writer->can_repeat(position) && pv->same (_last_player_video)) { + _writer->repeat (position, pv->eyes ()); } else { /* Queue this new frame for encoding */ LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ()); _queue.push_back (shared_ptr ( new DCPVideo ( pv, - _video_frames_enqueued, + position, _film->video_frame_rate(), _film->j2k_bandwidth(), _film->resolution(), @@ -239,53 +252,34 @@ Encoder::enqueue (shared_ptr pv) _empty_condition.notify_all (); } - 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; - } - - if (_left_done && _right_done) { - ++_video_frames_enqueued; - _left_done = _right_done = false; - } - _last_player_video = pv; } void Encoder::terminate_threads () { - { - boost::mutex::scoped_lock queue_lock (_queue_mutex); - _terminate_encoding = true; - _full_condition.notify_all (); - _empty_condition.notify_all (); - } - boost::mutex::scoped_lock threads_lock (_threads_mutex); + int n = 0; for (list::iterator i = _threads.begin(); i != _threads.end(); ++i) { - if ((*i)->joinable ()) { + LOG_GENERAL ("Terminating thread %1 of %2", n + 1, _threads.size ()); + (*i)->interrupt (); + DCPOMATIC_ASSERT ((*i)->joinable ()); + try { (*i)->join (); + } catch (boost::thread_interrupted& e) { + /* This is to be expected */ } delete *i; + LOG_GENERAL_NC ("Thread terminated"); + ++n; } _threads.clear (); - _terminate_encoding = false; } void -Encoder::encoder_thread (optional server) +Encoder::encoder_thread (optional server) try { if (server) { @@ -304,17 +298,13 @@ try LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id()); boost::mutex::scoped_lock lock (_queue_mutex); - while (_queue.empty () && !_terminate_encoding) { + while (_queue.empty ()) { _empty_condition.wait (lock); } - if (_terminate_encoding) { - return; - } - 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 ()); + LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", boost::this_thread::get_id(), vf->index(), (int) vf->eyes ()); _queue.pop_front (); lock.unlock (); @@ -366,7 +356,7 @@ try } if (remote_backoff > 0) { - dcpomatic_sleep (remote_backoff); + boost::this_thread::sleep (boost::posix_time::seconds (remote_backoff)); } /* The queue might not be full any more, so notify anything that is waiting on that */ @@ -374,6 +364,10 @@ try _full_condition.notify_all (); } } +catch (boost::thread_interrupted& e) { + /* Ignore these and just stop the thread */ + _full_condition.notify_all (); +} catch (...) { store_current (); @@ -390,13 +384,29 @@ Encoder::servers_list_changed () boost::mutex::scoped_lock lm (_threads_mutex); +#ifdef BOOST_THREAD_PLATFORM_WIN32 + OSVERSIONINFO info; + info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + GetVersionEx (&info); + bool const windows_xp = (info.dwMajorVersion == 5 && info.dwMinorVersion == 1); + if (windows_xp) { + LOG_GENERAL_NC (N_("Setting thread affinity for Windows XP")); + } +#endif + 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::thread* t = new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional ())); + _threads.push_back (t); +#ifdef BOOST_THREAD_PLATFORM_WIN32 + if (windows_xp) { + SetThreadAffinityMask (t->native_handle(), 1 << i); + } +#endif } } - BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) { + BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::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)));