X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=d50c461c8a1275ab1102665623a45270faa3d434;hb=d759f6003067e8376899b50e5692b2bbb4e870cc;hp=386e7f9db78a90b723bb6b5463f5bed802ab20b9;hpb=e65d31fbccad80c80f743516ecdd8269826d2114;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 386e7f9db..d50c461c8 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,9 +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_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3)); - _player_changed_connection = _player->Changed.connect (bind (&Butler::return_seek, this, _2)); - _player_not_changed_connection = _player->NotChanged.connect (bind (&Butler::return_seek, this, false)); + _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"); @@ -75,7 +78,10 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud multi-thread JPEG2000 decoding. */ - LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency()); + 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)); } @@ -117,15 +123,15 @@ Butler::should_run () const (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size())); } - if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) { + 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) { + 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) { + if (_stop_thread || _finished || _died || _suspended) { /* Definitely do not run */ return false; } @@ -187,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 (); @@ -205,7 +221,7 @@ Butler::get_video () return r; } -optional > +optional Butler::get_closed_caption () { boost::mutex::scoped_lock lm (_mutex); @@ -246,9 +262,15 @@ 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) { - LOG_TIMING("start-prepare in %1", thread_id()); + if (_log) { + LOG_TIMING("start-prepare in %1", thread_id()); + } + video->prepare (); - LOG_TIMING("finish-prepare in %1", thread_id()); + + if (_log) { + LOG_TIMING("finish-prepare in %1", thread_id()); + } } } @@ -258,7 +280,7 @@ 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 */ + /* Don't store any video in this case */ return; } @@ -274,7 +296,7 @@ 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; } } @@ -310,35 +332,50 @@ Butler::memory_used () const } void -Butler::return_seek (bool frequent) +Butler::player_change (ChangeType type, bool frequent) { boost::mutex::scoped_lock lm (_mutex); - if (_died || _pending_seek_position || frequent) { - 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; + } + + 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; } - seek_unlocked (seek_to, true); - _awaiting = seek_to; + lm.unlock (); + _summon.notify_all (); } void -Butler::text (PlayerText pt, TextType type, DCPTimePeriod period) +Butler::text (PlayerText pt, TextType type, optional track, DCPTimePeriod period) { if (type != TEXT_CLOSED_CAPTION) { return; } + DCPOMATIC_ASSERT (track); + boost::mutex::scoped_lock lm2 (_buffers_mutex); - _closed_caption.put (make_pair(pt, period)); + _closed_caption.put (pt, *track, period); }