X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=6b1563b9b85da2b30a37f4a09e3b2cbd47a255b6;hp=6aa31af978d1407b4c61bc2f4c8d5f0f8fb91b78;hb=HEAD;hpb=985e727e001e1a92ae035364a9cbf1ff99522ff1 diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 6aa31af97..12b9a2aa3 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,91 +18,128 @@ */ + /** @file src/transcode_job.cc * @brief A job which transcodes from one format to another. */ -#include "transcode_job.h" + +#include "analytics.h" +#include "compose.hpp" +#include "content.h" +#include "config.h" #include "dcp_encoder.h" -#include "upload_job.h" -#include "job_manager.h" -#include "film.h" +#include "dcpomatic_log.h" #include "encoder.h" +#include "examine_content_job.h" +#include "film.h" +#include "job_manager.h" #include "log.h" -#include "dcpomatic_log.h" -#include "compose.hpp" -#include "analytics.h" -#include +#include "transcode_job.h" +#include "upload_job.h" #include +#include #include "i18n.h" -using std::string; + +using std::cout; using std::fixed; +using std::make_shared; using std::setprecision; -using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::string; +using boost::optional; +using std::dynamic_pointer_cast; + /** @param film Film to use */ -TranscodeJob::TranscodeJob (shared_ptr film) +TranscodeJob::TranscodeJob (shared_ptr film, ChangedBehaviour changed) : Job (film) + , _changed (changed) { } + +TranscodeJob::~TranscodeJob () +{ + stop_thread (); +} + + string TranscodeJob::name () const { return String::compose (_("Transcoding %1"), _film->name()); } + string TranscodeJob::json_name () const { return N_("transcode"); } + void TranscodeJob::set_encoder (shared_ptr e) { _encoder = e; } + void TranscodeJob::run () { try { - struct timeval start; - gettimeofday (&start, 0); + auto content = _film->content(); + std::vector> changed; + std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr c) { return c->changed(); }); + + if (!changed.empty()) { + switch (_changed) { + case ChangedBehaviour::EXAMINE_THEN_STOP: + for (auto i: changed) { + JobManager::instance()->add(make_shared(_film, i)); + } + set_progress (1); + set_message (_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings before trying again.")); + set_error (_("Files have changed since they were added to the project."), _("Check their new settings, then try again.")); + set_state (FINISHED_ERROR); + return; + case ChangedBehaviour::STOP: + set_progress (1); + set_error (_("Files have changed since they were added to the project."), _("Open the project in DCP-o-matic, check the settings, then save it before trying again.")); + set_state (FINISHED_ERROR); + return; + default: + LOG_GENERAL_NC (_("Some files have been changed since they were added to the project.")); + break; + } + } + LOG_GENERAL_NC (N_("Transcode job starting")); DCPOMATIC_ASSERT (_encoder); _encoder->go (); + set_progress (1); set_state (FINISHED_OK); - struct timeval finish; - gettimeofday (&finish, 0); - - float fps = 0; - if (finish.tv_sec != start.tv_sec) { - fps = _encoder->frames_done() / (finish.tv_sec - start.tv_sec); - } - - LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps); + LOG_GENERAL(N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert(frames_per_second(), 2, true)); if (dynamic_pointer_cast(_encoder)) { - Analytics::instance()->successful_dcp_encode(); + try { + Analytics::instance()->successful_dcp_encode(); + } catch (FileError& e) { + LOG_WARNING (N_("Failed to write analytics (%1)"), e.what()); + } } - _encoder.reset (); + post_transcode (); - /* XXX: this shouldn't be here */ - if (_film->upload_after_make_dcp ()) { - shared_ptr job (new UploadJob (_film)); - JobManager::instance()->add (job); - } + _encoder.reset (); } catch (...) { _encoder.reset (); @@ -110,6 +147,7 @@ TranscodeJob::run () } } + string TranscodeJob::status () const { @@ -117,36 +155,26 @@ TranscodeJob::status () const return Job::status (); } - - char buffer[256]; if (finished() || _encoder->finishing()) { - strncpy (buffer, Job::status().c_str(), 256); - } else { - snprintf ( - buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames", - Job::status().c_str(), - _encoder->frames_done(), - _film->length().frames_round (_film->video_frame_rate ()) - ); - - float const fps = _encoder->current_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 Job::status(); } - return buffer; + auto status = String::compose(_("%1; %2/%3 frames"), Job::status(), _encoder->frames_done(), _film->length().frames_round(_film->video_frame_rate())); + if (auto const fps = _encoder->current_rate()) { + /// TRANSLATORS: fps here is an abbreviation for frames per second + status += String::compose(_("; %1 fps"), dcp::locale_convert(*fps, 1, true)); + } + + return status; } + /** @return Approximate remaining time in seconds */ int TranscodeJob::remaining_time () const { /* _encoder might be destroyed by the job-runner thread */ - shared_ptr e = _encoder; + auto e = _encoder; if (!e || e->finishing()) { /* We aren't doing any actual encoding so just use the job's guess */ @@ -155,12 +183,24 @@ TranscodeJob::remaining_time () const /* We're encoding so guess based on the current encoding rate */ - float fps = e->current_rate (); + auto fps = e->current_rate (); - if (fps == 0) { + if (!fps) { return 0; } /* 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; + 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; + } } +