/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
* @brief A job which transcodes from one format to another.
*/
-#include <iostream>
-#include <iomanip>
#include "transcode_job.h"
-#include "j2k_wav_encoder.h"
+#include "upload_job.h"
+#include "job_manager.h"
#include "film.h"
-#include "format.h"
#include "transcoder.h"
#include "log.h"
-#include "encoder_factory.h"
+#include <locked_sstream.h>
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
+
+#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 Options.
*/
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
- : Job (f, req)
- , _opt (o)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
+ : Job (film)
{
-
+
}
string
TranscodeJob::name () const
{
- return String::compose ("Transcode %1", _film->name());
+ 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 ("Transcode job starting");
- _film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
-
- _encoder = encoder_factory (_film, _opt);
- Transcoder w (_film, _opt, this, _encoder);
- w.go ();
+ _transcoder.reset (new Transcoder (_film, shared_from_this ()));
+ _transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
- _film->log()->log ("Transcode job completed successfully");
+ struct timeval finish;
+ gettimeofday (&finish, 0);
- } catch (std::exception& e) {
+ float fps = 0;
+ if (finish.tv_sec != start.tv_sec) {
+ fps = _transcoder->video_frames_enqueued() / (finish.tv_sec - start.tv_sec);
+ }
- set_progress (1);
- set_state (FINISHED_ERROR);
- _film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
+ LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
+ _transcoder.reset ();
+
+ if (_film->upload_after_make_dcp ()) {
+ shared_ptr<Job> job (new UploadJob (_film));
+ JobManager::instance()->add (job);
+ }
+ } catch (...) {
+ _transcoder.reset ();
throw;
}
}
string
TranscodeJob::status () const
{
- if (!_encoder) {
- return "0%";
+ if (!_transcoder) {
+ return Job::status ();
}
- if (_encoder->skipping () && !finished ()) {
- return "skipping already-encoded frames";
- }
-
-
- 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 () && !_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");
+ }
- s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
return s.str ();
}
+/** @return Approximate remaining time in seconds */
int
TranscodeJob::remaining_time () const
{
- float fps = _encoder->current_frames_per_second ();
+ /* _transcoder might be destroyed by the job-runner thread */
+ shared_ptr<Transcoder> t = _transcoder;
+
+ if (!t || t->finishing()) {
+ /* We aren't doing any actual encoding so just use the job's guess */
+ return Job::remaining_time ();
+ }
+
+ /* We're encoding so guess based on the current encoding rate */
+
+ float fps = t->current_encoding_rate ();
+
if (fps == 0) {
return 0;
}
- /* We assume that dcp_length() is valid */
- SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->last_frame();
- return left / fps;
+ /* 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_enqueued()) / fps;
}
projects / dcpomatic.git / blobdiff