From d759f6003067e8376899b50e5692b2bbb4e870cc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Nov 2018 00:01:26 +0000 Subject: Add some code to help with profiling the player. --- src/lib/butler.cc | 21 +++++++++++++++------ src/lib/ffmpeg_file_encoder.cc | 2 +- src/lib/player_video.cc | 2 +- src/lib/player_video.h | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) (limited to 'src/lib') diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 191bb0a5b..d50c461c8 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -65,7 +65,7 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud _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,7 +78,10 @@ Butler::Butler (shared_ptr player, shared_ptr log, AudioMapping aud multi-thread JPEG2000 decoding. */ - LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency()); + if (_log) { + LOG_TIMING("start-prepare-threads %1", boost::thread::hardware_concurrency()); + } + for (size_t i = 0; i < boost::thread::hardware_concurrency(); ++i) { _prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service)); } @@ -120,11 +123,11 @@ Butler::should_run () const (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size())); } - if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) { + if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2 && _log) { LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size()); } - if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2) { + if (_audio.size() >= MAXIMUM_AUDIO_READAHEAD * 2 && _log) { LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size()); } @@ -259,9 +262,15 @@ Butler::prepare (weak_ptr weak_video) const 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()); + if (_log) { + LOG_TIMING("start-prepare in %1", thread_id()); + } + video->prepare (); - LOG_TIMING("finish-prepare in %1", thread_id()); + + if (_log) { + LOG_TIMING("finish-prepare in %1", thread_id()); + } } } diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 97a342e29..99c974d3e 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -230,7 +230,7 @@ void FFmpegFileEncoder::video (shared_ptr video, DCPTime time) { shared_ptr image = video->image ( - bind (&Log::dcp_log, _log.get(), _1, _2), + boost::optional(bind(&Log::dcp_log, _log.get(), _1, _2)), bind (&force_pixel_format, _1, _pixel_format), true, false diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 12ec96a32..ec8dd16d4 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -111,7 +111,7 @@ PlayerVideo::set_text (PositionImage image) * @param fast true to be fast at the expense of quality. */ shared_ptr -PlayerVideo::image (dcp::NoteHandler note, function pixel_format, bool aligned, bool fast) const +PlayerVideo::image (optional note, function pixel_format, bool aligned, bool fast) const { pair, int> prox = _in->image (optional (note), _inter_size); shared_ptr im = prox.first; diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 11b2c8833..55a3566f0 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -63,7 +63,7 @@ public: void set_text (PositionImage); void prepare (); - boost::shared_ptr image (dcp::NoteHandler note, boost::function pixel_format, bool aligned, bool fast) const; + boost::shared_ptr image (boost::optional note, boost::function pixel_format, bool aligned, bool fast) const; static AVPixelFormat always_rgb (AVPixelFormat); static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat); -- cgit v1.2.3