X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=eb1991297dbd8b1659fe40ba8943b26f74c6fd6f;hb=0df83d7ba261cdbb5be62db34dae7b972e05ddd9;hp=d16287111edaf098f3df86e7d7b86b472efc18cd;hpb=53eea12d3e0d7925d5949de92859bc358ee0adcc;p=dcpomatic.git diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index d16287111..eb1991297 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -21,13 +21,14 @@ * @brief A job which transcodes from one format to another. */ -#include -#include #include "transcode_job.h" #include "film.h" #include "transcoder.h" #include "log.h" #include "safe_stringstream.h" +#include "compose.hpp" +#include +#include #include "i18n.h" @@ -45,7 +46,7 @@ using boost::shared_ptr; TranscodeJob::TranscodeJob (shared_ptr film) : Job (film) { - + } string @@ -101,7 +102,7 @@ TranscodeJob::status () const /// TRANSLATORS: fps here is an abbreviation for frames per second s << "; " << fixed << setprecision (1) << fps << " " << _("fps"); } - + return s.str (); } @@ -111,11 +112,11 @@ TranscodeJob::remaining_time () const { /* _transcoder might be destroyed by the job-runner thread */ shared_ptr t = _transcoder; - + if (!t) { return 0; } - + float fps = t->current_encoding_rate (); if (fps == 0) { @@ -123,5 +124,5 @@ TranscodeJob::remaining_time () const } /* Compute approximate proposed length here, as it's only here that we need it */ - return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps; + return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps; }