Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / butler.cc

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index f7c3c8fd99494e6760b9250c300db6b37800dbde..138ee0fbdeb4630e91adf8717077e2532d177b3e 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -22,10 +22,15 @@
 #include "player.h"
 #include "util.h"
 #include "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;
@@ -44,8 +49,6 @@ using boost::optional;
 /** Minimum audio readahead in frames; should never be reached unless there are bugs in Player */
 #define MAXIMUM_AUDIO_READAHEAD (48000 * MAXIMUM_VIDEO_READAHEAD / 24)
 
-#define LOG_WARNING(...) _log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_WARNING);
-
 Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping audio_mapping, int audio_channels)
        : _player (player)
        , _log (log)
@@ -68,6 +71,8 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
        /* 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) {
                _prepare_pool.create_thread (bind (&boost::asio::io_service::run, &_prepare_service));
        }
@@ -97,6 +102,18 @@ Butler::~Butler ()
 bool
 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()));
+       }
+
+       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()));
+       }
+
        if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 2) {
                LOG_WARNING ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size());
        }
@@ -181,6 +198,7 @@ Butler::get_video ()
        }
 
        pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get ();
+       cout << "BGV " << to_string(r.second) << " " << _video.size() << "\n";
        _summon.notify_all ();
        return r;
 }
@@ -207,13 +225,16 @@ Butler::prepare (weak_ptr<PlayerVideo> weak_video) const
        shared_ptr<PlayerVideo> 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 ();
+               LOG_TIMING("finish-prepare in %1", thread_id());
        }
 }
 
 void
 Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
+       cout << "BV: " << to_string(time) << " " << _video.size() << " " << (float(_video.size()) / 24) << "\n";
        boost::mutex::scoped_lock lm (_mutex);
        if (_pending_seek_position) {
                /* Don't store any video while a seek is pending */
@@ -227,6 +248,7 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 void
 Butler::audio (shared_ptr<AudioBuffers> audio)
 {
+       cout << "BA: " << audio->frames() << " " << _audio.size() << " " << (float(_audio.size()) / 48000) << "\n";
        {
                boost::mutex::scoped_lock lm (_mutex);
                if (_pending_seek_position || _disable_audio) {
@@ -246,6 +268,7 @@ bool
 Butler::get_audio (float* out, Frame frames)
 {
        bool const underrun = _audio.get (out, _audio_channels, frames);
+       cout << "BGA: " << frames << " " << _audio.size() << " " << (float(_audio.size()) / 48000) << "\n";
        _summon.notify_all ();
        return underrun;
 }