X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=3e408c4d52e852e19e853a83087e0f477c9b9c7b;hb=60dc924934e08bf9cba0365fd97b998016a88aba;hp=aee5846542d977586bae2d65f04466deedafc7a8;hpb=54e6f206305d4275808cfce36987edcc61a6a779;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index aee584654..3e408c4d5 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -54,6 +54,7 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud , _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) @@ -63,7 +64,11 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud { _player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2)); _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2)); - _player_changed_connection = _player->Changed.connect (bind (&Butler::player_changed, this, _1)); + _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3, _4)); + /* The butler must here 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"); @@ -123,7 +128,7 @@ Butler::should_run () const LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()); } - if (_stop_thread || _finished || _died) { + if (_stop_thread || _finished || _died || _suspended) { /* Definitely do not run */ return false; } @@ -185,17 +190,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 (); @@ -203,6 +218,13 @@ 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) { @@ -217,15 +239,17 @@ Butler::seek_unlocked (DCPTime position, bool accurate) return; } + _finished = false; + _pending_seek_position = position; + _pending_seek_accurate = accurate; + { - boost::mutex::scoped_lock lm (_video_audio_mutex); + boost::mutex::scoped_lock lm (_buffers_mutex); _video.clear (); _audio.clear (); + _closed_caption.clear (); } - _finished = false; - _pending_seek_position = position; - _pending_seek_accurate = accurate; _summon.notify_all (); } @@ -246,14 +270,14 @@ 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 */ + if (_pending_seek_position || _suspended) { + /* Don't store any video in these cases */ return; } _prepare_service.post (bind (&Butler::prepare, this, weak_ptr(video))); - boost::mutex::scoped_lock lm2 (_video_audio_mutex); + boost::mutex::scoped_lock lm2 (_buffers_mutex); _video.put (video, time); } @@ -262,13 +286,13 @@ 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 */ + if (_pending_seek_position || _disable_audio || _suspended) { + /* Don't store any audio in these cases */ return; } } - boost::mutex::scoped_lock lm2 (_video_audio_mutex); + boost::mutex::scoped_lock lm2 (_buffers_mutex); _audio.put (remap (audio, _audio_channels, _audio_mapping), time); } @@ -299,33 +323,50 @@ Butler::memory_used () const } void -Butler::player_changed (int what) +Butler::player_change (ChangeType type, bool frequent) { boost::mutex::scoped_lock lm (_mutex); - if (_died || _pending_seek_position) { - 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; - } + 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; + } - { - boost::mutex::scoped_lock lm (_video_audio_mutex); - _video.clear (); - _audio.clear (); + 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; } - _finished = false; + lm.unlock (); _summon.notify_all (); +} + +void +Butler::text (PlayerText pt, TextType type, optional track, DCPTimePeriod period) +{ + if (type != TEXT_CLOSED_CAPTION) { + return; + } + + DCPOMATIC_ASSERT (track); - seek_unlocked (seek_to, true); - _awaiting = seek_to; + boost::mutex::scoped_lock lm2 (_buffers_mutex); + _closed_caption.put (pt, *track, period); }