X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=2d6c46c7eea0b04f7cc880e0819fad7bb1badf4c;hb=7c730205e50014347bd96ab9735346d0b5922798;hp=94230d0942b7b65dd910766495d94c850cb0392f;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;p=dcpomatic.git diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 94230d094..2d6c46c7e 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -38,18 +38,19 @@ using boost::shared_ptr; using boost::bind; using boost::optional; using boost::function; +using namespace dcpomatic; /** 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 */ +/** Maximum video readahead in frames; should never be exceeded (by much) unless there are bugs in Player */ #define MAXIMUM_VIDEO_READAHEAD 48 /** 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 */ +/** Maximum audio readahead in frames; should never be exceeded (by much) unless there are bugs in Player */ #define MAXIMUM_AUDIO_READAHEAD (48000 * MAXIMUM_VIDEO_READAHEAD / 24) /** @param pixel_format Pixel format functor that will be used when calling ::image on PlayerVideos coming out of this - * butler. This will be used (where possible) to prepare the PlayerVideos so that calling image() on them is quick(). + * butler. This will be used (where possible) to prepare the PlayerVideos so that calling image() on them is quick. * @param aligned Same as above for the `aligned' flag. * @param fast Same as above for the `fast' flag. */ @@ -76,12 +77,12 @@ Butler::Butler ( , _fast (fast) { _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_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2, _3)); _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); + _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1), boost::signals2::at_front); _thread = new boost::thread (bind (&Butler::thread, this)); #ifdef DCPOMATIC_LINUX pthread_setname_np (_thread->native_handle(), "butler"); @@ -124,14 +125,26 @@ Butler::should_run () const { 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())); + optional pos = _audio.peek(); + if (pos) { + throw ProgrammingError + (__FILE__, __LINE__, String::compose ("Butler video buffers reached %1 frames (audio is %2 at %3)", _video.size(), _audio.size(), pos->get())); + } else { + 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())); + optional pos = _audio.peek(); + if (pos) { + throw ProgrammingError + (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames at %2 (video is %3)", _audio.size(), pos->get(), _video.size())); + } else { + throw ProgrammingError + (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %3)", _audio.size(), _video.size())); + } } if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) { @@ -203,12 +216,16 @@ try _arrived.notify_all (); } +/** @param blocking true if we should block until video is available. If blocking is false + * and no video is immediately available the method will return a 0 PlayerVideo and the error AGAIN. + * @param e if non-0 this is filled with an error code (if an error occurs) or is untouched if no error occurs. + */ pair, DCPTime> -Butler::get_video (Error* e) +Butler::get_video (bool blocking, Error* e) { boost::mutex::scoped_lock lm (_mutex); - if (_suspended) { + if (_suspended || (_video.empty() && !blocking)) { if (e) { *e = AGAIN; } @@ -243,6 +260,7 @@ void Butler::seek (DCPTime position, bool accurate) { boost::mutex::scoped_lock lm (_mutex); + _awaiting = optional(); seek_unlocked (position, accurate); } @@ -268,7 +286,8 @@ Butler::seek_unlocked (DCPTime position, bool accurate) } void -Butler::prepare (weak_ptr weak_video) const +Butler::prepare (weak_ptr weak_video) +try { shared_ptr video = weak_video.lock (); /* If the weak_ptr cannot be locked the video obviously no longer requires any work */ @@ -278,6 +297,12 @@ Butler::prepare (weak_ptr weak_video) const LOG_TIMING("finish-prepare in %1", thread_id()); } } +catch (...) +{ + store_current (); + boost::mutex::scoped_lock lm (_mutex); + _died = true; +} void Butler::video (shared_ptr video, DCPTime time) @@ -296,7 +321,7 @@ Butler::video (shared_ptr video, DCPTime time) } void -Butler::audio (shared_ptr audio, DCPTime time) +Butler::audio (shared_ptr audio, DCPTime time, int frame_rate) { { boost::mutex::scoped_lock lm (_mutex); @@ -307,7 +332,7 @@ Butler::audio (shared_ptr audio, DCPTime time) } boost::mutex::scoped_lock lm2 (_buffers_mutex); - _audio.put (remap (audio, _audio_channels, _audio_mapping), time); + _audio.put (remap (audio, _audio_channels, _audio_mapping), time, frame_rate); } /** Try to get `frames' frames of audio and copy it into `out'. Silence @@ -337,7 +362,7 @@ Butler::memory_used () const } void -Butler::player_change (ChangeType type, bool frequent) +Butler::player_change (ChangeType type) { boost::mutex::scoped_lock lm (_mutex); @@ -345,7 +370,7 @@ Butler::player_change (ChangeType type, bool frequent) ++_suspended; } else if (type == CHANGE_TYPE_DONE) { --_suspended; - if (_died || _pending_seek_position || frequent) { + if (_died || _pending_seek_position) { lm.unlock (); _summon.notify_all (); return;