X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=f7c3c8fd99494e6760b9250c300db6b37800dbde;hb=6e6ebf3122333b38333482bce64df3e6e61e64c4;hp=54c1acc4dc083cee67f3e535fe97b11d5779e6b8;hpb=e288d710b46d090739d107664106e19287128cf5;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 54c1acc4d..f7c3c8fd9 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -29,6 +29,7 @@ using std::cout; using std::pair; using std::make_pair; +using std::string; using boost::weak_ptr; using boost::shared_ptr; using boost::bind; @@ -37,17 +38,18 @@ using boost::optional; /** 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 240 +#define MAXIMUM_VIDEO_READAHEAD 24 /** Minimum audio readahead in frames */ -#define MINIMUM_AUDIO_READAHEAD (48000*5) +#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*60) +#define MAXIMUM_AUDIO_READAHEAD (48000 * MAXIMUM_VIDEO_READAHEAD / 24) -#define LOG_WARNING(...) _film.lock()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING); +#define LOG_WARNING(...) _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_WARNING); -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) , _finished (false) , _died (false) @@ -58,8 +60,17 @@ Butler::Butler (weak_ptr film, shared_ptr player, AudioMappi { _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)); _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. + */ + 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 () @@ -69,6 +80,10 @@ Butler::~Butler () _stop_thread = true; } + _prepare_work.reset (); + _prepare_pool.join_all (); + _prepare_service.stop (); + _thread->interrupt (); try { _thread->join (); @@ -82,20 +97,26 @@ Butler::~Butler () bool Butler::should_run () const { - if (_video.size() >= MAXIMUM_VIDEO_READAHEAD) { - LOG_WARNING ("Butler video buffers reached %1 frames", _video.size()); + if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) { + LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size()); } - if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD) { - LOG_WARNING ("Butler audio buffers reached %1 frames", _audio.size()); + if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2) { + LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()); } - return (_video.size() < MINIMUM_VIDEO_READAHEAD || (!_disable_audio && _audio.size() < MINIMUM_AUDIO_READAHEAD)) - && (_video.size() < MAXIMUM_VIDEO_READAHEAD) - && (_audio.size() < MAXIMUM_AUDIO_READAHEAD) - && !_stop_thread - && !_finished - && !_died; + if (_stop_thread || _finished || _died) { + /* 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 @@ -180,17 +201,26 @@ Butler::seek (DCPTime position, bool accurate) _summon.notify_all (); } +void +Butler::prepare (weak_ptr weak_video) const +{ + shared_ptr video = weak_video.lock (); + /* If the weak_ptr cannot be locked the video obviously no longer requires any work */ + if (video) { + video->prepare (); + } +} + void Butler::video (shared_ptr video, DCPTime time) { - { - boost::mutex::scoped_lock lm (_mutex); - if (_pending_seek_position) { - /* Don't store any video while a seek is pending */ - return; - } + boost::mutex::scoped_lock lm (_mutex); + if (_pending_seek_position) { + /* Don't store any video while a seek is pending */ + return; } + _prepare_service.post (bind (&Butler::prepare, this, weak_ptr(video))); _video.put (video, time); } @@ -208,29 +238,16 @@ Butler::audio (shared_ptr audio) _audio.put (remap (audio, _audio_channels, _audio_mapping)); } -void -Butler::player_changed () -{ - optional t; - - { - boost::mutex::scoped_lock lm (_mutex); - t = _video.earliest (); - } - - if (t) { - seek (*t, true); - } else { - _video.clear (); - _audio.clear (); - } -} - -void +/** Try to get `frames' frames of audio and copy it into `out'. Silence + * will be filled if no audio is available. + * @return true if there was a buffer underrun, otherwise false. + */ +bool Butler::get_audio (float* out, Frame frames) { - _audio.get (out, _audio_channels, frames); + bool const underrun = _audio.get (out, _audio_channels, frames); _summon.notify_all (); + return underrun; } void @@ -239,3 +256,10 @@ Butler::disable_audio () boost::mutex::scoped_lock lm (_mutex); _disable_audio = true; } + +pair +Butler::memory_used () const +{ + /* XXX: should also look at _audio.memory_used() */ + return _video.memory_used(); +}