X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=ce35b1f39aff61da043aa71e0a3d5fad0e963f11;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hp=b2128efdb28f0b9cb7660d7ff42d94c94c6648ee;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index b2128efdb..ce35b1f39 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,33 @@
 
 */
 
+
 #include "butler.h"
-#include "player.h"
-#include "util.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "cross.h"
 #include "compose.hpp"
+#include "cross.h"
+#include "dcpomatic_log.h"
 #include "exceptions.h"
+#include "log.h"
+#include "player.h"
+#include "util.h"
 #include "video_content.h"
 
 
 using std::cout;
-using std::pair;
+using std::function;
 using std::make_pair;
+using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
-using std::shared_ptr;
 using boost::bind;
 using boost::optional;
-using std::function;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
+
 /** Minimum video readahead in frames */
 #define MINIMUM_VIDEO_READAHEAD 10
 /** Maximum video readahead in frames; should never be exceeded (by much) unless there are bugs in Player */
@@ -52,9 +54,10 @@ using namespace boost::placeholders;
 /** 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.
- *  @param aligned Same as above for the `aligned' flag.
+ *  @param alignment Same as above for the `alignment' value.
  *  @param fast Same as above for the `fast' flag.
  */
 Butler::Butler (
@@ -64,12 +67,14 @@ Butler::Butler (
 	int audio_channels,
 	function<AVPixelFormat (AVPixelFormat)> pixel_format,
 	VideoRange video_range,
-	bool aligned,
-	bool fast
+	Image::Alignment alignment,
+	bool fast,
+	bool prepare_only_proxy,
+	Audio audio
 	)
 	: _film (film)
 	, _player (player)
-	, _prepare_work (new boost::asio::io_service::work (_prepare_service))
+	, _prepare_work (new boost::asio::io_service::work(_prepare_service))
 	, _pending_seek_accurate (false)
 	, _suspended (0)
 	, _finished (false)
@@ -77,11 +82,12 @@ Butler::Butler (
 	, _stop_thread (false)
 	, _audio_mapping (audio_mapping)
 	, _audio_channels (audio_channels)
-	, _disable_audio (false)
+	, _disable_audio (audio == Audio::DISABLED)
 	, _pixel_format (pixel_format)
 	, _video_range (video_range)
-	, _aligned (aligned)
+	, _alignment (alignment)
 	, _fast (fast)
+	, _prepare_only_proxy (prepare_only_proxy)
 {
 	_player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
 	_player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2, _3));
@@ -106,6 +112,7 @@ Butler::Butler (
 	}
 }
 
+
 Butler::~Butler ()
 {
 	boost::this_thread::disable_interruption dis;
@@ -143,7 +150,7 @@ Butler::should_run () const
 
 	if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 10) {
 		/* This is way too big */
-		optional<DCPTime> pos = _audio.peek();
+		auto 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()));
@@ -175,6 +182,7 @@ Butler::should_run () const
 	return (_video.size() < MAXIMUM_VIDEO_READAHEAD) && (_audio.size() < MAXIMUM_AUDIO_READAHEAD);
 }
 
+
 void
 Butler::thread ()
 try
@@ -230,30 +238,31 @@ try
 	_arrived.notify_all ();
 }
 
-/** @param blocking true if we should block until video is available.  If blocking is false
+
+/** @param behaviour BLOCKING if we should block until video is available.  If behaviour is NON_BLOCKING
  *  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 (bool blocking, Error* e)
+Butler::get_video (Behaviour behaviour, Error* e)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	auto setup_error = [this](Error* e, Error::Code fallback) {
 		if (e) {
 			if (_died) {
-				e->code = Error::DIED;
+				e->code = Error::Code::DIED;
 				e->message = _died_message;
 			} else if (_finished) {
-				e->code = Error::FINISHED;
+				e->code = Error::Code::FINISHED;
 			} else {
 				e->code = fallback;
 			}
 		}
 	};
 
-	if (_video.empty() && (_finished || _died || (_suspended && !blocking))) {
-		setup_error (e, Error::AGAIN);
+	if (_video.empty() && (_finished || _died || (_suspended && behaviour == Behaviour::NON_BLOCKING))) {
+		setup_error (e, Error::Code::AGAIN);
 		return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
 	}
 
@@ -263,7 +272,7 @@ Butler::get_video (bool blocking, Error* e)
 	}
 
 	if (_video.empty()) {
-		setup_error (e, Error::NONE);
+		setup_error (e, Error::Code::NONE);
 		return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
 	}
 
@@ -272,6 +281,7 @@ Butler::get_video (bool blocking, Error* e)
 	return r;
 }
 
+
 optional<TextRingBuffers::Data>
 Butler::get_closed_caption ()
 {
@@ -279,6 +289,7 @@ Butler::get_closed_caption ()
 	return _closed_caption.get ();
 }
 
+
 void
 Butler::seek (DCPTime position, bool accurate)
 {
@@ -287,6 +298,7 @@ Butler::seek (DCPTime position, bool accurate)
 	seek_unlocked (position, accurate);
 }
 
+
 void
 Butler::seek_unlocked (DCPTime position, bool accurate)
 {
@@ -305,6 +317,7 @@ Butler::seek_unlocked (DCPTime position, bool accurate)
 	_summon.notify_all ();
 }
 
+
 void
 Butler::prepare (weak_ptr<PlayerVideo> weak_video)
 try
@@ -313,7 +326,7 @@ try
 	/* 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());
-		video->prepare (_pixel_format, _video_range, _aligned, _fast);
+		video->prepare (_pixel_format, _video_range, _alignment, _fast, _prepare_only_proxy);
 		LOG_TIMING("finish-prepare in %1", thread_id());
 	}
 }
@@ -331,6 +344,7 @@ catch (...)
 	_died = true;
 }
 
+
 void
 Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
@@ -341,11 +355,12 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 		return;
 	}
 
-	_prepare_service.post (bind (&Butler::prepare, this, weak_ptr<PlayerVideo>(video)));
+	_prepare_service.post (bind(&Butler::prepare, this, weak_ptr<PlayerVideo>(video)));
 
 	_video.put (video, time);
 }
 
+
 void
 Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate)
 {
@@ -355,27 +370,30 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate)
 		return;
 	}
 
-	_audio.put (remap (audio, _audio_channels, _audio_mapping), time, frame_rate);
+	_audio.put (remap(audio, _audio_channels, _audio_mapping), time, frame_rate);
 }
 
-/** Try to get `frames' frames of audio and copy it into `out'.  Silence
- *  will be filled if no audio is available.
- *  @return time of this audio, or unset if there was a buffer underrun.
+
+/** Try to get `frames' frames of audio and copy it into `out'.
+ *  @param behaviour BLOCKING if we should block until audio is available.  If behaviour is NON_BLOCKING
+ *  and no audio is immediately available the buffer will be filled with silence and boost::none
+ *  will be returned.
+ *  @return time of this audio, or unset if blocking was false and no data was available.
  */
 optional<DCPTime>
-Butler::get_audio (float* out, Frame frames)
+Butler::get_audio (Behaviour behaviour, float* out, Frame frames)
 {
+	boost::mutex::scoped_lock lm (_mutex);
+
+	while (behaviour == Behaviour::BLOCKING && !_finished && !_died && _audio.size() < frames) {
+		_arrived.wait (lm);
+	}
+
 	auto t = _audio.get (out, _audio_channels, frames);
 	_summon.notify_all ();
 	return t;
 }
 
-void
-Butler::disable_audio ()
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	_disable_audio = true;
-}
 
 pair<size_t, string>
 Butler::memory_used () const
@@ -384,6 +402,7 @@ Butler::memory_used () const
 	return _video.memory_used();
 }
 
+
 void
 Butler::player_change (ChangeType type, int property)
 {
@@ -430,6 +449,7 @@ Butler::player_change (ChangeType type, int property)
 	_summon.notify_all ();
 }
 
+
 void
 Butler::text (PlayerText pt, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
@@ -442,18 +462,19 @@ Butler::text (PlayerText pt, TextType type, optional<DCPTextTrack> track, DCPTim
 	_closed_caption.put (pt, *track, period);
 }
 
+
 string
 Butler::Error::summary () const
 {
 	switch (code)
 	{
-		case Error::NONE:
+		case Error::Code::NONE:
 			return "No error registered";
-		case Error::AGAIN:
+		case Error::Code::AGAIN:
 			return "Butler not ready";
-		case Error::DIED:
+		case Error::Code::DIED:
 			return String::compose("Butler died (%1)", message);
-		case Error::FINISHED:
+		case Error::Code::FINISHED:
 			return "Butler finished";
 	}