X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=94230d0942b7b65dd910766495d94c850cb0392f;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=a127ee9bdeeff61428e19663d7a2c36f875f5288;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e;p=dcpomatic.git

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index a127ee9bd..94230d094 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,15 +22,13 @@
 #include "player.h"
 #include "util.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "cross.h"
 #include "compose.hpp"
 #include "exceptions.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
-#define LOG_TIMING(...)  _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_TIMING);
-#define LOG_WARNING(...) _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_WARNING);
-
 using std::cout;
 using std::pair;
 using std::make_pair;
@@ -39,19 +37,31 @@ using boost::weak_ptr;
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
+using boost::function;
 
 /** 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 */
-#define MAXIMUM_VIDEO_READAHEAD 24
+#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 */
 #define MAXIMUM_AUDIO_READAHEAD (48000 * MAXIMUM_VIDEO_READAHEAD / 24)
 
-Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping audio_mapping, int audio_channels)
+/** @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 fast Same as above for the `fast' flag.
+ */
+Butler::Butler (
+	shared_ptr<Player> player,
+	AudioMapping audio_mapping,
+	int audio_channels,
+	function<AVPixelFormat (AVPixelFormat)> pixel_format,
+	bool aligned,
+	bool fast
+	)
 	: _player (player)
-	, _log (log)
 	, _prepare_work (new boost::asio::io_service::work (_prepare_service))
 	, _pending_seek_accurate (false)
 	, _suspended (0)
@@ -61,11 +71,14 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 	, _audio_mapping (audio_mapping)
 	, _audio_channels (audio_channels)
 	, _disable_audio (false)
+	, _pixel_format (pixel_format)
+	, _aligned (aligned)
+	, _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_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
+	/* 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);
@@ -78,8 +91,9 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 	   multi-thread JPEG2000 decoding.
 	*/
 
-	LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency());
-	for (size_t i = 0; i < boost::thread::hardware_concurrency(); ++i) {
+	LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency() * 2);
+
+	for (size_t i = 0; i < boost::thread::hardware_concurrency() * 2; ++i) {
 		_prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service));
 	}
 }
@@ -190,17 +204,27 @@ try
 }
 
 pair<shared_ptr<PlayerVideo>, 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<PlayerVideo>(), DCPTime());
+	}
+
 	/* Wait for data if we have none */
 	while (_video.empty() && !_finished && !_died) {
 		_arrived.wait (lm);
 	}
 
 	if (_video.empty()) {
-		return make_pair (shared_ptr<PlayerVideo>(), DCPTime());
+		if (e) {
+			*e = NONE;
+		}
+		return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
 	}
 
 	pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get ();
@@ -250,7 +274,7 @@ Butler::prepare (weak_ptr<PlayerVideo> weak_video) const
 	/* 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 ();
+		video->prepare (_pixel_format, _aligned, _fast);
 		LOG_TIMING("finish-prepare in %1", thread_id());
 	}
 }
@@ -260,8 +284,8 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (_pending_seek_position || _suspended) {
-		/* Don't store any video in these cases */
+	if (_pending_seek_position) {
+		/* Don't store any video in this case */
 		return;
 	}
 
@@ -276,7 +300,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		if (_pending_seek_position || _disable_audio || _suspended) {
+		if (_pending_seek_position || _disable_audio) {
 			/* Don't store any audio in these cases */
 			return;
 		}