From 8c6ba9a92b81689eb192f331fad445cc0ea4b3a0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Sep 2016 11:35:41 +0100 Subject: [PATCH] Start reporting frames completed in transcode jobs immediately; don't wait until fps estimates are available. --- src/lib/transcode_job.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 4eb2b1d29..79b5b1739 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -106,23 +106,25 @@ TranscodeJob::status () const return Job::status (); } - float const fps = _transcoder->current_encoding_rate (); - if (fps == 0) { - return Job::status (); - } char buffer[256]; if (finished() || _transcoder->finishing()) { strncpy (buffer, Job::status().c_str(), 256); } else { - /// TRANSLATORS: fps here is an abbreviation for frames per second snprintf ( - buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames; %.1f fps", + buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames", Job::status().c_str(), _transcoder->video_frames_enqueued(), - _film->length().frames_round (_film->video_frame_rate ()), - fps + _film->length().frames_round (_film->video_frame_rate ()) ); + + float const fps = _transcoder->current_encoding_rate (); + if (fps) { + char fps_buffer[64]; + /// TRANSLATORS: fps here is an abbreviation for frames per second + snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), fps); + strncat (buffer, fps_buffer, strlen(buffer) - 1); + } } return buffer; -- 2.30.2