diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:59:50 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:59:50 +0200 |
| commit | eb6f689b8e9d982d73612af2ba5ddc7ab021aec8 (patch) | |
| tree | ac58fbabe3e13fa656d19543320b4a42206073dd /src/lib/dcp_film_encoder.cc | |
| parent | 8aa25e2ec75dada5f07a3860d668241821056f61 (diff) | |
| parent | 7a9cadc6fe86c74035dd971685b1acdc8f32d3fc (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src/lib/dcp_film_encoder.cc')
| -rw-r--r-- | src/lib/dcp_film_encoder.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc index 878ef3c6f..83da57756 100644 --- a/src/lib/dcp_film_encoder.cc +++ b/src/lib/dcp_film_encoder.cc @@ -124,7 +124,14 @@ DCPFilmEncoder::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); @@ -159,10 +166,6 @@ void DCPFilmEncoder::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 @@ -190,5 +193,5 @@ DCPFilmEncoder::current_rate() const Frame DCPFilmEncoder::frames_done() const { - return _encoder->video_frames_enqueued(); + return _player.frames_done(); } |