X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=a4bc133f8d781c7509078d8953da7e11f2c841e5;hb=HEAD;hp=9a840c8ab916b6a594f4e6881f223ad20346f4f5;hpb=7d8d78c183656191ff44c9464e06b843bfadc54d;p=dcpomatic.git diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index 9a840c8ab..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 data, DCPTime time) { _writer.write(data, time); - - auto job = _job.lock (); - DCPOMATIC_ASSERT (job); - job->set_progress (float(time.get()) / _film->length().get()); } void @@ -159,5 +162,5 @@ DCPEncoder::current_rate () const Frame DCPEncoder::frames_done () const { - return _j2k_encoder.video_frames_enqueued(); + return _player.frames_done(); }