/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
* @brief A job which transcodes from one format to another.
*/
+#include "config.h"
#include "transcode_job.h"
#include "dcp_encoder.h"
#include "upload_job.h"
using std::fixed;
using std::setprecision;
using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using boost::optional;
+using std::dynamic_pointer_cast;
/** @param film Film to use */
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
}
+TranscodeJob::~TranscodeJob ()
+{
+ stop_thread ();
+}
+
string
TranscodeJob::name () const
{
DCPOMATIC_ASSERT (_encoder);
_encoder->go ();
- set_progress (1);
- set_state (FINISHED_OK);
struct timeval finish;
gettimeofday (&finish, 0);
Analytics::instance()->successful_dcp_encode();
}
- _encoder.reset ();
-
/* XXX: this shouldn't be here */
- if (_film->upload_after_make_dcp ()) {
+ if (Config::instance()->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
+ _encoder.reset ();
+
+ set_progress (1);
+ set_state (FINISHED_OK);
+
} catch (...) {
_encoder.reset ();
throw;
char buffer[256];
if (finished() || _encoder->finishing()) {
- strncpy (buffer, Job::status().c_str(), 256);
+ strncpy (buffer, Job::status().c_str(), 255);
+ buffer[255] = '\0';
} else {
snprintf (
buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
_film->length().frames_round (_film->video_frame_rate ())
);
- float const fps = _encoder->current_rate ();
+ optional<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);
+ snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), *fps);
strncat (buffer, fps_buffer, strlen(buffer) - 1);
}
}
/* We're encoding so guess based on the current encoding rate */
- float fps = e->current_rate ();
+ optional<float> 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;
}