Update DCP encoder progress on all passe()es, not just when audio is emitted.

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index c7ee180e11f0da9bec17c26b76c1cac7f7656c95..a4bc133f8d781c7509078d8953da7e11f2c841e5 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -107,7 +107,14 @@ DCPEncoder::go ()
                _writer.write(_player.get_subtitle_fonts());
        }
 
-       while (!_player.pass()) {}
+       int passes = 0;
+       while (!_player.pass()) {
+               if ((++passes % 8) == 0) {
+                       auto job = _job.lock();
+                       DCPOMATIC_ASSERT(job);
+                       job->set_progress(_player.progress());
+               }
+       }
 
        for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
                _writer.write(i);
@@ -128,10 +135,6 @@ void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
        _writer.write(data, time);
-
-       auto job = _job.lock ();
-       DCPOMATIC_ASSERT (job);
-       job->set_progress (float(time.get()) / _film->length().get());
 }
 
 void

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 2e96e4bee72b8cb45731dc43b2363e40d0f660cc..91a51c67f305e31e6d39cd2fd0cc8d75b5a0458f 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1671,3 +1671,17 @@ Player::frames_done() const
 
        return earliest_time.get_value_or({}).frames_round(film->video_frame_rate());
 }
+
+
+float
+Player::progress() const
+{
+       auto film = _film.lock();
+       DCPOMATIC_ASSERT(film);
+
+       shared_ptr<Piece> earliest_content;
+       optional<DCPTime> earliest_time;
+       std::tie(earliest_content, earliest_time) = earliest_piece_and_time();
+
+       return static_cast<float>(earliest_time.get_value_or({}).get()) / film->length().get();
+}

diff --git a/src/lib/player.h b/src/lib/player.h
index 43c46945cb4f7fd8057a502ce5b11bc58483de84..48f6f97ca2b6a542cb9d5b39afcde5a657527058 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -91,6 +91,7 @@ public:
        bool pass ();
        void seek (dcpomatic::DCPTime time, bool accurate);
        Frame frames_done() const;
+       float progress() const;
 
        std::vector<std::shared_ptr<dcpomatic::Font>> get_subtitle_fonts ();