X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=fb586b0825631da9e9a9efc79038103733735791;hp=b442d8035a800cd6e8769dc845fba8d06774f675;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=0725fcaf8dd25dda1afbf5791a8375611036c0bf diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index b442d8035..fb586b082 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,38 +23,44 @@ */ #include "transcode_job.h" +#include "dcp_encoder.h" +#include "upload_job.h" +#include "job_manager.h" #include "film.h" -#include "transcoder.h" +#include "encoder.h" #include "log.h" -#include "safe_stringstream.h" +#include "dcpomatic_log.h" #include "compose.hpp" +#include "analytics.h" #include #include #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); -#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); -#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR); - using std::string; using std::fixed; using std::setprecision; using std::cout; using boost::shared_ptr; +using boost::optional; +using boost::dynamic_pointer_cast; -/** @param s Film to use. - */ +/** @param film Film to use */ TranscodeJob::TranscodeJob (shared_ptr film) : Job (film) { } +TranscodeJob::~TranscodeJob () +{ + stop_thread (); +} + string TranscodeJob::name () const { - return String::compose (_("Transcode %1"), _film->name()); + return String::compose (_("Transcoding %1"), _film->name()); } string @@ -62,6 +69,12 @@ TranscodeJob::json_name () const return N_("transcode"); } +void +TranscodeJob::set_encoder (shared_ptr e) +{ + _encoder = e; +} + void TranscodeJob::run () { @@ -70,24 +83,36 @@ TranscodeJob::run () gettimeofday (&start, 0); LOG_GENERAL_NC (N_("Transcode job starting")); - _transcoder.reset (new Transcoder (_film, shared_from_this ())); - _transcoder->go (); - set_progress (1); - set_state (FINISHED_OK); + DCPOMATIC_ASSERT (_encoder); + _encoder->go (); struct timeval finish; gettimeofday (&finish, 0); float fps = 0; if (finish.tv_sec != start.tv_sec) { - fps = _transcoder->video_frames_out() / (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); - _transcoder.reset (); + + if (dynamic_pointer_cast(_encoder)) { + Analytics::instance()->successful_dcp_encode(); + } + + /* XXX: this shouldn't be here */ + if (_film->upload_after_make_dcp() && dynamic_pointer_cast(_encoder)) { + shared_ptr job (new UploadJob (_film)); + JobManager::instance()->add (job); + } + + _encoder.reset (); + + set_progress (1); + set_state (FINISHED_OK); } catch (...) { - _transcoder.reset (); + _encoder.reset (); throw; } } @@ -95,46 +120,55 @@ TranscodeJob::run () string TranscodeJob::status () const { - if (!_transcoder) { + if (!_encoder) { return Job::status (); } - float const fps = _transcoder->current_encoding_rate (); - if (fps == 0) { - return Job::status (); - } - - SafeStringStream s; - - s << Job::status (); - if (!finished () && !_transcoder->finishing ()) { - /// TRANSLATORS: fps here is an abbreviation for frames per second - s << "; " << _transcoder->video_frames_out() << "/" - << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; " - << fixed << setprecision (1) << fps << " " << _("fps"); + char buffer[256]; + if (finished() || _encoder->finishing()) { + strncpy (buffer, Job::status().c_str(), 255); + buffer[255] = '\0'; + } else { + snprintf ( + buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames", + Job::status().c_str(), + _encoder->frames_done(), + _film->length().frames_round (_film->video_frame_rate ()) + ); + + optional 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 s.str (); + return buffer; } /** @return Approximate remaining time in seconds */ int TranscodeJob::remaining_time () const { - /* _transcoder might be destroyed by the job-runner thread */ - shared_ptr t = _transcoder; + /* _encoder might be destroyed by the job-runner thread */ + shared_ptr e = _encoder; - if (!t) { - return 0; + if (!e || e->finishing()) { + /* We aren't doing any actual encoding so just use the job's guess */ + return Job::remaining_time (); } - float fps = t->current_encoding_rate (); + /* We're encoding so guess based on the current encoding rate */ + + optional 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 ()) - t->video_frames_out()) / fps; + return (_film->length().frames_round(_film->video_frame_rate()) - e->frames_done()) / *fps; }