X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=2d6c46c7eea0b04f7cc880e0819fad7bb1badf4c;hb=dfd42d2a546d14c32057a34002543877ea2f99cb;hp=444090fd46d1b047fe31acfd6b6f4dec5e32dd2f;hpb=9272a124c0cac0f9e60f2de132808efffb8b8665;p=dcpomatic.git

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 444090fd4..2d6c46c7e 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -38,14 +38,15 @@ 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
@@ -81,7 +82,7 @@ Butler::Butler (
 	/* 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<DCPTime> 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<DCPTime> 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<shared_ptr<PlayerVideo>, 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<DCPTime>();
 	seek_unlocked (position, accurate);
 }
 
@@ -268,7 +286,8 @@ Butler::seek_unlocked (DCPTime position, bool accurate)
 }
 
 void
-Butler::prepare (weak_ptr<PlayerVideo> weak_video) const
+Butler::prepare (weak_ptr<PlayerVideo> weak_video)
+try
 {
 	shared_ptr<PlayerVideo> 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<PlayerVideo> 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<PlayerVideo> video, DCPTime time)
@@ -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;