X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=3502c3346c48072824f04f22936dba0fcc04ba83;hb=3ff1586aad2fa5ba7e5fd95e178614aae12496e6;hp=6aa31af978d1407b4c61bc2f4c8d5f0f8fb91b78;hpb=985e727e001e1a92ae035364a9cbf1ff99522ff1;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6aa31af97..3502c3346 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,38 @@
 
 */
 
+
 /** @file src/transcode_job.cc
  *  @brief A job which transcodes from one format to another.
  */
 
-#include "transcode_job.h"
+
+#include "analytics.h"
+#include "compose.hpp"
+#include "config.h"
 #include "dcp_encoder.h"
-#include "upload_job.h"
-#include "job_manager.h"
-#include "film.h"
+#include "dcpomatic_log.h"
 #include "encoder.h"
+#include "film.h"
+#include "job_manager.h"
 #include "log.h"
-#include "dcpomatic_log.h"
-#include "compose.hpp"
-#include "analytics.h"
-#include <iostream>
+#include "transcode_job.h"
+#include "upload_job.h"
 #include <iomanip>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
+using std::cout;
 using std::fixed;
+using std::make_shared;
 using std::setprecision;
-using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::string;
+using boost::optional;
+using std::dynamic_pointer_cast;
+
 
 /** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@ -51,24 +58,34 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 
 }
 
+
+TranscodeJob::~TranscodeJob ()
+{
+	stop_thread ();
+}
+
+
 string
 TranscodeJob::name () const
 {
 	return String::compose (_("Transcoding %1"), _film->name());
 }
 
+
 string
 TranscodeJob::json_name () const
 {
 	return N_("transcode");
 }
 
+
 void
 TranscodeJob::set_encoder (shared_ptr<Encoder> e)
 {
 	_encoder = e;
 }
 
+
 void
 TranscodeJob::run ()
 {
@@ -79,8 +96,6 @@ TranscodeJob::run ()
 
 		DCPOMATIC_ASSERT (_encoder);
 		_encoder->go ();
-		set_progress (1);
-		set_state (FINISHED_OK);
 
 		struct timeval finish;
 		gettimeofday (&finish, 0);
@@ -96,20 +111,23 @@ TranscodeJob::run ()
 			Analytics::instance()->successful_dcp_encode();
 		}
 
-		_encoder.reset ();
-
 		/* XXX: this shouldn't be here */
-		if (_film->upload_after_make_dcp ()) {
-			shared_ptr<Job> job (new UploadJob (_film));
-			JobManager::instance()->add (job);
+		if (Config::instance()->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+			JobManager::instance()->add(make_shared<UploadJob>(_film));
 		}
 
+		_encoder.reset ();
+
+		set_progress (1);
+		set_state (FINISHED_OK);
+
 	} catch (...) {
 		_encoder.reset ();
 		throw;
 	}
 }
 
+
 string
 TranscodeJob::status () const
 {
@@ -120,7 +138,8 @@ TranscodeJob::status () const
 
 	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",
@@ -129,11 +148,11 @@ TranscodeJob::status () const
 			_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);
 		}
 	}
@@ -141,12 +160,13 @@ TranscodeJob::status () const
 	return buffer;
 }
 
+
 /** @return Approximate remaining time in seconds */
 int
 TranscodeJob::remaining_time () const
 {
 	/* _encoder might be destroyed by the job-runner thread */
-	shared_ptr<Encoder> e = _encoder;
+	auto e = _encoder;
 
 	if (!e || e->finishing()) {
 		/* We aren't doing any actual encoding so just use the job's guess */
@@ -155,12 +175,12 @@ TranscodeJob::remaining_time () const
 
 	/* We're encoding so guess based on the current encoding rate */
 
-	float fps = e->current_rate ();
+	auto 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;
 }