X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=1db37e3708b27748ada7455763a2c753e63e30f6;hp=fd4dfcef6dfc10c89b699777514377b1b47820b2;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index fd4dfcef6..1db37e370 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 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 . */ @@ -21,33 +22,39 @@ * @brief A job which transcodes from one format to another. */ -#include -#include #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 "dcpomatic_log.h" +#include "compose.hpp" +#include "analytics.h" +#include +#include #include "i18n.h" using std::string; -using std::stringstream; using std::fixed; using std::setprecision; +using std::cout; using boost::shared_ptr; +using boost::dynamic_pointer_cast; -/** @param s Film to use. - */ -TranscodeJob::TranscodeJob (shared_ptr f) - : Job (f) +/** @param film Film to use */ +TranscodeJob::TranscodeJob (shared_ptr film) + : Job (film) { - + } string TranscodeJob::name () const { - return String::compose (_("Transcode %1"), _film->name()); + return String::compose (_("Transcoding %1"), _film->name()); } string @@ -56,26 +63,49 @@ 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); + LOG_GENERAL_NC (N_("Transcode job starting")); - _film->log()->log (N_("Transcode job starting")); - - _transcoder.reset (new Transcoder (_film, shared_from_this ())); - _transcoder->go (); + DCPOMATIC_ASSERT (_encoder); + _encoder->go (); set_progress (1); set_state (FINISHED_OK); - _film->log()->log (N_("Transcode job completed successfully")); - _transcoder.reset (); + 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); + + 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 (); } catch (...) { - set_progress (1); - set_state (FINISHED_ERROR); - _film->log()->log (N_("Transcode job failed or cancelled")); - _transcoder.reset (); + _encoder.reset (); throw; } } @@ -83,43 +113,54 @@ TranscodeJob::run () string TranscodeJob::status () const { - if (!_transcoder) { - return Job::status (); - } - - float const fps = _transcoder->current_encoding_rate (); - if (fps == 0) { + if (!_encoder) { return Job::status (); } - stringstream s; - - s << Job::status (); - if (!finished () && !_transcoder->finishing ()) { - s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second"); + 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 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; - - if (!t) { - return 0; + /* _encoder might be destroyed by the job-runner thread */ + shared_ptr e = _encoder; + + 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 */ + + float fps = e->current_rate (); if (fps == 0) { return 0; } /* 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 ()) - e->frames_done()) / fps; }