X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=15711a79678f368c9e542dec6b58fc1f88b26409;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=79b5b17394468eb19af66ae377d24acfb41d986b;hpb=8c6ba9a92b81689eb192f331fad445cc0ea4b3a0;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 79b5b1739..15711a796 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -23,29 +23,26 @@
  */
 
 #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 <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::fixed;
 using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
 
-/** @param s Film to use.
- */
+/** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 	: Job (film)
 {
@@ -64,6 +61,12 @@ TranscodeJob::json_name () const
 	return N_("transcode");
 }
 
+void
+TranscodeJob::set_encoder (shared_ptr<Encoder> e)
+{
+	_encoder = e;
+}
+
 void
 TranscodeJob::run ()
 {
@@ -72,8 +75,8 @@ TranscodeJob::run ()
 		gettimeofday (&start, 0);
 		LOG_GENERAL_NC (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);
 
@@ -82,19 +85,20 @@ TranscodeJob::run ()
 
 		float fps = 0;
 		if (finish.tv_sec != start.tv_sec) {
-			fps = _transcoder->video_frames_enqueued() / (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);
-		_transcoder.reset ();
+		_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);
 		}
 
 	} catch (...) {
-		_transcoder.reset ();
+		_encoder.reset ();
 		throw;
 	}
 }
@@ -102,23 +106,23 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_transcoder) {
+	if (!_encoder) {
 		return Job::status ();
 	}
 
 
 	char buffer[256];
-	if (finished() || _transcoder->finishing()) {
+	if (finished() || _encoder->finishing()) {
 		strncpy (buffer, Job::status().c_str(), 256);
 	} else {
 		snprintf (
-			buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames",
+			buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
 			Job::status().c_str(),
-			_transcoder->video_frames_enqueued(),
+			_encoder->frames_done(),
 			_film->length().frames_round (_film->video_frame_rate ())
 			);
 
-		float const fps = _transcoder->current_encoding_rate ();
+		float const fps = _encoder->current_rate ();
 		if (fps) {
 			char fps_buffer[64];
 			/// TRANSLATORS: fps here is an abbreviation for frames per second
@@ -134,22 +138,22 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-	/* _transcoder might be destroyed by the job-runner thread */
-	shared_ptr<Transcoder> t = _transcoder;
+	/* _encoder might be destroyed by the job-runner thread */
+	shared_ptr<Encoder> e = _encoder;
 
-	if (!t || t->finishing()) {
+	if (!e || e->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 ();
+	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_round (_film->video_frame_rate ()) - t->video_frames_enqueued()) / fps;
+	return (_film->length().frames_round (_film->video_frame_rate ()) - e->frames_done()) / fps;
 }