X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=d50c461c8a1275ab1102665623a45270faa3d434;hb=d759f6003067e8376899b50e5692b2bbb4e870cc;hp=fde8e459b5372777cccc72f3330f155d11cddc55;hpb=3c86d70cf46ca11212ae2e2f4d711db0f478c2f5;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index fde8e459b..d50c461c8 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -21,26 +21,40 @@ #include "butler.h" #include "player.h" #include "util.h" +#include "log.h" +#include "cross.h" +#include "compose.hpp" +#include "exceptions.h" #include #include +#define LOG_TIMING(...) _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_TIMING); +#define LOG_WARNING(...) _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_WARNING); + using std::cout; using std::pair; using std::make_pair; +using std::string; using boost::weak_ptr; using boost::shared_ptr; using boost::bind; using boost::optional; -/** Video readahead in frames */ -#define VIDEO_READAHEAD 10 -/** Audio readahead in frames */ -#define AUDIO_READAHEAD (48000*5) +/** Minimum video readahead in frames */ +#define MINIMUM_VIDEO_READAHEAD 10 +/** Maximum video readahead in frames; should never be reached unless there are bugs in Player */ +#define MAXIMUM_VIDEO_READAHEAD 24 +/** Minimum audio readahead in frames */ +#define MINIMUM_AUDIO_READAHEAD (48000 * MINIMUM_VIDEO_READAHEAD / 24) +/** Minimum audio readahead in frames; should never be reached unless there are bugs in Player */ +#define MAXIMUM_AUDIO_READAHEAD (48000 * MAXIMUM_VIDEO_READAHEAD / 24) -Butler::Butler (weak_ptr film, shared_ptr player, AudioMapping audio_mapping, int audio_channels) - : _film (film) - , _player (player) +Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping audio_mapping, int audio_channels) + : _player (player) + , _log (log) + , _prepare_work (new boost::asio::io_service::work (_prepare_service)) , _pending_seek_accurate (false) + , _suspended (0) , _finished (false) , _died (false) , _stop_thread (false) @@ -49,9 +63,28 @@ Butler::Butler (weak_ptr film, shared_ptr player, AudioMappi , _disable_audio (false) { _player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2)); - _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1)); - _player_changed_connection = _player->Changed.connect (bind (&Butler::player_changed, this)); + _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2)); + _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3, _4)); + /* The butler must hear about things first, otherwise it might not sort out suspensions in time for + get_video() to be called in response to this signal. + */ + _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3), boost::signals2::at_front); _thread = new boost::thread (bind (&Butler::thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_thread->native_handle(), "butler"); +#endif + + /* Create some threads to do work on the PlayerVideos we are creating; at present this is used to + multi-thread JPEG2000 decoding. + */ + + if (_log) { + LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency()); + } + + for (size_t i = 0; i < boost::thread::hardware_concurrency(); ++i) { + _prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service)); + } } Butler::~Butler () @@ -61,6 +94,10 @@ Butler::~Butler () _stop_thread = true; } + _prepare_work.reset (); + _prepare_pool.join_all (); + _prepare_service.stop (); + _thread->interrupt (); try { _thread->join (); @@ -74,7 +111,38 @@ Butler::~Butler () bool Butler::should_run () const { - return (_video.size() < VIDEO_READAHEAD || (!_disable_audio && _audio.size() < AUDIO_READAHEAD)) && !_stop_thread && !_finished && !_died; + if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 10) { + /* This is way too big */ + throw ProgrammingError + (__FILE__, __LINE__, String::compose ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size())); + } + + if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 10) { + /* This is way too big */ + throw ProgrammingError + (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size())); + } + + if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2 && _log) { + LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size()); + } + + if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2 && _log) { + LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()); + } + + if (_stop_thread || _finished || _died || _suspended) { + /* Definitely do not run */ + return false; + } + + if (_video.size() < MINIMUM_VIDEO_READAHEAD || (!_disable_audio && _audio.size() < MINIMUM_AUDIO_READAHEAD)) { + /* Definitely do run: we need data */ + return true; + } + + /* Run if we aren't full of video or audio */ + return (_video.size() < MAXIMUM_VIDEO_READAHEAD) && (_audio.size() < MAXIMUM_AUDIO_READAHEAD); } void @@ -125,17 +193,27 @@ try } pair, DCPTime> -Butler::get_video () +Butler::get_video (Error* e) { boost::mutex::scoped_lock lm (_mutex); + if (_suspended) { + if (e) { + *e = AGAIN; + } + return make_pair(shared_ptr(), DCPTime()); + } + /* Wait for data if we have none */ while (_video.empty() && !_finished && !_died) { _arrived.wait (lm); } if (_video.empty()) { - return make_pair (shared_ptr(), DCPTime()); + if (e) { + *e = NONE; + } + return make_pair(shared_ptr(), DCPTime()); } pair, DCPTime> const r = _video.get (); @@ -143,78 +221,161 @@ Butler::get_video () return r; } +optional +Butler::get_closed_caption () +{ + boost::mutex::scoped_lock lm (_mutex); + return _closed_caption.get (); +} + void Butler::seek (DCPTime position, bool accurate) { boost::mutex::scoped_lock lm (_mutex); + seek_unlocked (position, accurate); +} + +void +Butler::seek_unlocked (DCPTime position, bool accurate) +{ if (_died) { return; } - _video.clear (); - _audio.clear (); _finished = false; _pending_seek_position = position; _pending_seek_accurate = accurate; + + { + boost::mutex::scoped_lock lm (_buffers_mutex); + _video.clear (); + _audio.clear (); + _closed_caption.clear (); + } + _summon.notify_all (); } void -Butler::video (shared_ptr video, DCPTime time) +Butler::prepare (weak_ptr weak_video) const { - { - boost::mutex::scoped_lock lm (_mutex); - if (_pending_seek_position) { - /* Don't store any video while a seek is pending */ - return; + shared_ptr video = weak_video.lock (); + /* If the weak_ptr cannot be locked the video obviously no longer requires any work */ + if (video) { + if (_log) { + LOG_TIMING("start-prepare in %1", thread_id()); + } + + video->prepare (); + + if (_log) { + LOG_TIMING("finish-prepare in %1", thread_id()); } } +} + +void +Butler::video (shared_ptr video, DCPTime time) +{ + boost::mutex::scoped_lock lm (_mutex); + if (_pending_seek_position) { + /* Don't store any video in this case */ + return; + } + + _prepare_service.post (bind (&Butler::prepare, this, weak_ptr(video))); + + boost::mutex::scoped_lock lm2 (_buffers_mutex); _video.put (video, time); } void -Butler::audio (shared_ptr audio) +Butler::audio (shared_ptr audio, DCPTime time) { { boost::mutex::scoped_lock lm (_mutex); if (_pending_seek_position || _disable_audio) { - /* Don't store any audio while a seek is pending, or if audio is disabled */ + /* Don't store any audio in these cases */ return; } } - _audio.put (remap (audio, _audio_channels, _audio_mapping)); + boost::mutex::scoped_lock lm2 (_buffers_mutex); + _audio.put (remap (audio, _audio_channels, _audio_mapping), time); } -void -Butler::player_changed () +/** Try to get `frames' frames of audio and copy it into `out'. Silence + * will be filled if no audio is available. + * @return time of this audio, or unset if there was a buffer underrun. + */ +optional +Butler::get_audio (float* out, Frame frames) { - optional t; + optional t = _audio.get (out, _audio_channels, frames); + _summon.notify_all (); + return t; +} - { - boost::mutex::scoped_lock lm (_mutex); - t = _video.earliest (); - } +void +Butler::disable_audio () +{ + boost::mutex::scoped_lock lm (_mutex); + _disable_audio = true; +} - if (t) { - seek (*t, true); - } else { - _video.clear (); - _audio.clear (); - } +pair +Butler::memory_used () const +{ + /* XXX: should also look at _audio.memory_used() */ + return _video.memory_used(); } void -Butler::get_audio (float* out, Frame frames) +Butler::player_change (ChangeType type, bool frequent) { - _audio.get (out, _audio_channels, frames); + boost::mutex::scoped_lock lm (_mutex); + + if (type == CHANGE_TYPE_PENDING) { + ++_suspended; + } else if (type == CHANGE_TYPE_DONE) { + --_suspended; + if (_died || _pending_seek_position || frequent) { + lm.unlock (); + _summon.notify_all (); + return; + } + + DCPTime seek_to; + DCPTime next = _video.get().second; + if (_awaiting && _awaiting > next) { + /* We have recently done a player_changed seek and our buffers haven't been refilled yet, + so assume that we're seeking to the same place as last time. + */ + seek_to = *_awaiting; + } else { + seek_to = next; + } + + seek_unlocked (seek_to, true); + _awaiting = seek_to; + } else if (type == CHANGE_TYPE_CANCELLED) { + --_suspended; + } + + lm.unlock (); _summon.notify_all (); } void -Butler::disable_audio () +Butler::text (PlayerText pt, TextType type, optional track, DCPTimePeriod period) { - boost::mutex::scoped_lock lm (_mutex); - _disable_audio = true; + if (type != TEXT_CLOSED_CAPTION) { + return; + } + + DCPOMATIC_ASSERT (track); + + boost::mutex::scoped_lock lm2 (_buffers_mutex); + _closed_caption.put (pt, *track, period); }