Use encoder frames encoded counts for transcode progress (#2864).

This seems to make more sense than using whatever the player has
produced, which may not be what you want to know about in cases like a
DCP containing no video and only subs.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc
index c66858bac..a818c9b4c 100644
--- a/src/lib/dcp_film_encoder.cc
+++ b/src/lib/dcp_film_encoder.cc
@@ -125,12 +125,14 @@ DCPFilmEncoder::go()
 		_writer->write(_player.get_subtitle_fonts());
 	}
 
+	auto const length = _film->length().frames_round(_film->video_frame_rate());
+
 	int passes = 0;
 	while (!_player.pass()) {
 		if ((++passes % 8) == 0) {
 			auto job = _job.lock();
 			DCPOMATIC_ASSERT(job);
-			job->set_progress(_player.progress());
+			job->set_progress(static_cast<float>(frames_done()) / length);
 		}
 	}
 
@@ -201,5 +203,9 @@ DCPFilmEncoder::current_rate() const
 Frame
 DCPFilmEncoder::frames_done() const
 {
-	return _player.frames_done();
+	if (!_encoder) {
+		return 0;
+	}
+
+	return _encoder->video_frames_encoded();
 }