X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=46fc97fb31b74bdf14f6093dd0d973e34fa78709;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=477c73c753a686a889982f6b700efde3fa41483e;hpb=2587f29e54bac098296dbef6557b9bf9bcdc2406;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 477c73c75..46fc97fb3 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -24,12 +24,11 @@
 #include <iostream>
 #include <iomanip>
 #include "transcode_job.h"
-#include "j2k_wav_encoder.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder_factory.h"
+
+#include "i18n.h"
 
 using std::string;
 using std::stringstream;
@@ -38,13 +37,9 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
- *  @param req Job that must be completed before this job is run.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
-	: Job (f, req)
-	, _decode_opt (od)
-	, _encode_opt (oe)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
+	: Job (f)
 {
 	
 }
@@ -52,7 +47,7 @@ TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions>
 string
 TranscodeJob::name () const
 {
-	return String::compose ("Transcode %1", _film->name());
+	return String::compose (_("Transcode %1"), _film->name());
 }
 
 void
@@ -60,23 +55,21 @@ TranscodeJob::run ()
 {
 	try {
 
-		_film->log()->log ("Transcode job starting");
-		_film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
+		_film->log()->log (N_("Transcode job starting"));
 
-		_encoder = encoder_factory (_film, _encode_opt);
-		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->log()->log ("Transcode job completed successfully");
-
-	} catch (std::exception& e) {
+		_film->log()->log (N_("Transcode job completed successfully"));
+		_transcoder.reset ();
 
+	} catch (...) {
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		_film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
-
+		_film->log()->log (N_("Transcode job failed or cancelled"));
+		_transcoder.reset ();
 		throw;
 	}
 }
@@ -84,16 +77,11 @@ TranscodeJob::run ()
 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 ();
 	}
@@ -102,8 +90,8 @@ TranscodeJob::status () const
 
 	s << Job::status ();
 
-	if (!finished ()) {
-		s << "; " << fixed << setprecision (1) << fps << " frames per second";
+	if (!finished () && !_transcoder->finishing ()) {
+		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
 	}
 	
 	return s.str ();
@@ -112,16 +100,20 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-	float fps = _encoder->current_frames_per_second ();
-	if (fps == 0) {
+	/* _transcoder might be destroyed by the job-runner thread */
+	shared_ptr<Transcoder> t = _transcoder;
+	
+	if (!t) {
 		return 0;
 	}
+	
+	float fps = t->current_encoding_rate ();
 
-	if (!_film->dcp_length()) {
+	if (fps == 0) {
 		return 0;
 	}
 
-	/* We assume that dcp_length() is valid, if it is set */
-	SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+	/* Compute approximate proposed length here, as it's only here that we need it */
+	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
 	return left / fps;
 }