From 61130610f6d01fe6b1682d91933eb7dbbb1eac76 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 May 2024 15:38:31 +0200
Subject: Update DCP encoder progress on all passe()es, not just when audio is
 emitted.

---
 src/lib/dcp_encoder.cc | 13 ++++++++-----
 src/lib/player.cc      | 14 ++++++++++++++
 src/lib/player.h       |  1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index c7ee180e1..a4bc133f8 100644
--- 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 2e96e4bee..91a51c67f 100644
--- 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 43c46945c..48f6f97ca 100644
--- 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 ();
 
-- 
cgit v1.2.3