From a54c86b47987d753151fbea831c99a0fef811110 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 26 Aug 2023 01:43:22 +0200 Subject: Cleanup: extract TranscodeJob::frames_per_second(). --- src/lib/transcode_job.cc | 19 +++++++++++++------ src/lib/transcode_job.h | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 653040f4c..1b2d2ddd5 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -124,12 +124,7 @@ TranscodeJob::run () DCPOMATIC_ASSERT (_encoder); _encoder->go (); - float fps = 0; - if (_finish_time != _start_time) { - fps = _encoder->frames_done() / (_finish_time - _start_time); - } - - LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert(fps, 2, true)); + LOG_GENERAL(N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert(frames_per_second(), 2, true)); if (dynamic_pointer_cast(_encoder)) { try { @@ -197,3 +192,15 @@ TranscodeJob::remaining_time () const /* Compute approximate proposed length here, as it's only here that we need it */ return (_film->length().frames_round(_film->video_frame_rate()) - e->frames_done()) / *fps; } + + +float +TranscodeJob::frames_per_second() const +{ + if (_finish_time != _start_time) { + return _encoder->frames_done() / (_finish_time - _start_time); + } else { + return 0; + } +} + diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h index 8b145e362..b05b20a16 100644 --- a/src/lib/transcode_job.h +++ b/src/lib/transcode_job.h @@ -65,6 +65,7 @@ public: private: virtual void post_transcode () {} + float frames_per_second() const; int remaining_time () const override; -- cgit v1.2.3