X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=e9a59c743ad3fc81e12abceb3c320f11a4db485d;hb=dea922bbc1fa2b643140a6b5275e58a1fb0225c9;hp=a4965ba44e63a8067c83bd6a70ba03890e6229ea;hpb=bd8fa9a370f1739952c83107352baa08c79d095e;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a4965ba44..e9a59c743 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -24,22 +24,25 @@
 #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 "encoder.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
+ *  @param o Decode options.
+ *  @param req Job that must be completed before this job is run.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> req)
 	: Job (f, req)
-	, _opt (o)
+	, _decode_opt (o)
 {
 	
 }
@@ -56,14 +59,18 @@ TranscodeJob::run ()
 	try {
 
 		_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);
+		_encoder.reset (new Encoder (_film));
+		Transcoder w (_film, _decode_opt, this, _encoder);
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
 
+		_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
+
 		_film->log()->log ("Transcode job completed successfully");
+		_film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
 
 	} catch (std::exception& e) {
 
@@ -82,11 +89,6 @@ TranscodeJob::status () const
 		return "0%";
 	}
 
-	if (_encoder->skipping () && !finished ()) {
-		return "skipping already-encoded frames";
-	}
-		
-	
 	float const fps = _encoder->current_frames_per_second ();
 	if (fps == 0) {
 		return Job::status ();
@@ -94,7 +96,12 @@ TranscodeJob::status () const
 
 	stringstream s;
 
-	s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
+	s << Job::status ();
+
+	if (!finished ()) {
+		s << "; " << fixed << setprecision (1) << fps << " frames per second";
+	}
+	
 	return s.str ();
 }
 
@@ -106,5 +113,19 @@ TranscodeJob::remaining_time () const
 		return 0;
 	}
 
-	return ((_film->dcp_length() - _encoder->last_frame()) / fps);
+	if (!_film->length()) {
+		return 0;
+	}
+
+	/* Compute approximate proposed length here, as it's only here that we need it */
+	int length = _film->length().get();
+	DCPFrameRate const dfr (_film->frames_per_second ());
+	if (dfr.skip) {
+		length /= 2;
+	}
+	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
+
+	/* We assume that dcp_length() is valid, if it is set */
+	int const left = length - _encoder->video_frames_out();
+	return left / fps;
 }