X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fbutler.cc;h=20180330e5f68d2a048402328ccc32d7da64fd7b;hp=de9ed4ed0d9e43f0a0de0a62a327d9d072e8f440;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hpb=43b8c87f18793d57a9752f360614a5640dad9810 diff --git a/src/lib/butler.cc b/src/lib/butler.cc index de9ed4ed0..20180330e 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Carl Hetherington + Copyright (C) 2016-2018 Carl Hetherington 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 #include -#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,32 @@ using boost::weak_ptr; 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 */ -#define MAXIMUM_VIDEO_READAHEAD 24 +/** 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) -Butler::Butler (shared_ptr player, shared_ptr 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, + AudioMapping audio_mapping, + int audio_channels, + function 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,25 +72,29 @@ Butler::Butler (shared_ptr player, shared_ptr 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)); - /* The butler must here about things first, otherwise it might not sort out suspensions in time for + _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); - _thread = new boost::thread (bind (&Butler::thread, this)); + _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1), boost::signals2::at_front); + _thread = boost::thread (bind(&Butler::thread, this)); #ifdef DCPOMATIC_LINUX - pthread_setname_np (_thread->native_handle(), "butler"); + pthread_setname_np (_thread.native_handle(), "butler"); #endif /* Create some threads to do work on the PlayerVideos we are creating; at present this is used to 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)); } } @@ -95,13 +110,12 @@ Butler::~Butler () _prepare_pool.join_all (); _prepare_service.stop (); - _thread->interrupt (); + _thread.interrupt (); try { - _thread->join (); - } catch (boost::thread_interrupted& e) { - /* No problem */ + _thread.join (); + } catch (...) { + } - delete _thread; } /** Caller must hold a lock on _mutex */ @@ -110,14 +124,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) { @@ -189,18 +215,32 @@ 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 () +Butler::get_video (bool blocking, Error* e) { boost::mutex::scoped_lock lm (_mutex); + if (_suspended || (_video.empty() && !blocking)) { + 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 (); @@ -208,7 +248,7 @@ Butler::get_video () return r; } -optional > +optional Butler::get_closed_caption () { boost::mutex::scoped_lock lm (_mutex); @@ -219,6 +259,7 @@ void Butler::seek (DCPTime position, bool accurate) { boost::mutex::scoped_lock lm (_mutex); + _awaiting = optional(); seek_unlocked (position, accurate); } @@ -233,57 +274,57 @@ Butler::seek_unlocked (DCPTime position, bool accurate) _pending_seek_position = position; _pending_seek_accurate = accurate; - { - boost::mutex::scoped_lock lm (_buffers_mutex); - _video.clear (); - _audio.clear (); - _closed_caption.clear (); - } + _video.clear (); + _audio.clear (); + _closed_caption.clear (); _summon.notify_all (); } 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 */ 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()); } } +catch (...) +{ + store_current (); + boost::mutex::scoped_lock lm (_mutex); + _died = true; +} void Butler::video (shared_ptr 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; } _prepare_service.post (bind (&Butler::prepare, this, weak_ptr(video))); - boost::mutex::scoped_lock lm2 (_buffers_mutex); _video.put (video, 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); - if (_pending_seek_position || _disable_audio || _suspended) { - /* Don't store any audio in these cases */ - return; - } + boost::mutex::scoped_lock lm (_mutex); + if (_pending_seek_position || _disable_audio) { + /* Don't store any audio in these cases */ + return; } - 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 @@ -313,7 +354,7 @@ Butler::memory_used () const } void -Butler::player_change (ChangeType type, bool frequent) +Butler::player_change (ChangeType type) { boost::mutex::scoped_lock lm (_mutex); @@ -321,7 +362,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; @@ -349,12 +390,13 @@ Butler::player_change (ChangeType type, bool frequent) } 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; } - boost::mutex::scoped_lock lm2 (_buffers_mutex); - _closed_caption.put (make_pair(pt, period)); + DCPOMATIC_ASSERT (track); + + _closed_caption.put (pt, *track, period); }