X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=8e56603302e1200382197965d51b8c0cbf0f1ee1;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=61fad2e2b3e8df7d0cc137f14ba26fb7c105faea;hpb=5121d13ded51a70169f5b5d649067c9b26456705;p=dcpomatic.git diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 61fad2e2b..8e5660330 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,31 +22,35 @@ * @brief A job which transcodes from one format to another. */ -#include -#include #include "transcode_job.h" +#include "upload_job.h" +#include "job_manager.h" #include "film.h" -#include "format.h" #include "transcoder.h" #include "log.h" -#include "encoder.h" +#include +#include "compose.hpp" +#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::stringstream; using std::fixed; using std::setprecision; +using std::cout; using boost::shared_ptr; /** @param s Film to use. - * @param o Decode options. */ -TranscodeJob::TranscodeJob (shared_ptr f, DecodeOptions o) - : Job (f) - , _decode_opt (o) +TranscodeJob::TranscodeJob (shared_ptr film) + : Job (film) { - + } string @@ -54,31 +59,43 @@ TranscodeJob::name () const return String::compose (_("Transcode %1"), _film->name()); } +string +TranscodeJob::json_name () const +{ + return N_("transcode"); +} + void TranscodeJob::run () { try { + struct timeval start; + gettimeofday (&start, 0); + LOG_GENERAL_NC (N_("Transcode job starting")); - _film->log()->log (N_("Transcode job starting")); - _film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay())); - - _encoder.reset (new Encoder (_film)); - Transcoder w (_film, _decode_opt, this, _encoder); - w.go (); + _transcoder.reset (new Transcoder (_film, shared_from_this ())); + _transcoder->go (); set_progress (1); set_state (FINISHED_OK); - _film->set_dcp_intrinsic_duration (_encoder->video_frames_out ()); + struct timeval finish; + gettimeofday (&finish, 0); - _film->log()->log (N_("Transcode job completed successfully")); - _film->log()->log (String::compose (N_("DCP intrinsic duration is %1"), _encoder->video_frames_out())); + float fps = 0; + if (finish.tv_sec != start.tv_sec) { + fps = _transcoder->video_frames_enqueued() / (finish.tv_sec - start.tv_sec); + } - } catch (std::exception& e) { + LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps); + _transcoder.reset (); - set_progress (1); - set_state (FINISHED_ERROR); - _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what())); + if (_film->upload_after_make_dcp ()) { + shared_ptr job (new UploadJob (_film)); + JobManager::instance()->add (job); + } + } catch (...) { + _transcoder.reset (); throw; } } @@ -86,47 +103,49 @@ TranscodeJob::run () string TranscodeJob::status () const { - if (!_encoder) { - return _("0%"); + if (!_transcoder) { + return Job::status (); } - float const fps = _encoder->current_frames_per_second (); + float const fps = _transcoder->current_encoding_rate (); if (fps == 0) { return Job::status (); } - stringstream s; + locked_stringstream s; s << Job::status (); - if (!finished ()) { - s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second"); + if (!finished () && !_transcoder->finishing ()) { + /// TRANSLATORS: fps here is an abbreviation for frames per second + s << "; " << _transcoder->video_frames_enqueued() << "/" + << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; " + << fixed << setprecision (1) << fps << " " << _("fps"); } - + return s.str (); } +/** @return Approximate remaining time in seconds */ int TranscodeJob::remaining_time () const { - float fps = _encoder->current_frames_per_second (); - if (fps == 0) { - return 0; + /* _transcoder might be destroyed by the job-runner thread */ + shared_ptr t = _transcoder; + + if (!t || t->finishing()) { + /* We aren't doing any actual encoding so just use the job's guess */ + return Job::remaining_time (); } - if (!_film->length()) { + /* We're encoding so guess based on the current encoding rate */ + + float fps = t->current_encoding_rate (); + + if (fps == 0) { return 0; } /* Compute approximate proposed length here, as it's only here that we need it */ - int length = _film->length().get(); - DCPFrameRate const dfr (_film->frames_per_second ()); - if (dfr.skip) { - length /= 2; - } - /* If we are repeating it shouldn't affect transcode time, so don't take it into account */ - - /* We assume that dcp_length() is valid, if it is set */ - int const left = length - _encoder->video_frames_out(); - return left / fps; + return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_enqueued()) / fps; }