X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=0c3b8c37b978b9d5c94c058cfafbde11db552ec0;hb=cd4a82d90677cec80e891ac190000cb70767446f;hp=61fad2e2b3e8df7d0cc137f14ba26fb7c105faea;hpb=dd7cf1ef6e860243b80f4c47a99393244f63a3d5;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 61fad2e2b..0c3b8c37b 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -39,11 +39,9 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Decode options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f)
 	: Job (f)
-	, _decode_opt (o)
 {
 	
 }
@@ -62,16 +60,12 @@ TranscodeJob::run ()
 		_film->log()->log (N_("Transcode job starting"));
 		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-		_encoder.reset (new Encoder (_film));
-		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->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
-
 		_film->log()->log (N_("Transcode job completed successfully"));
-		_film->log()->log (String::compose (N_("DCP intrinsic duration is %1"), _encoder->video_frames_out()));
 
 	} catch (std::exception& e) {
 
@@ -86,11 +80,11 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_encoder) {
+	if (!_transcoder) {
 		return _("0%");
 	}
 
-	float const fps = _encoder->current_frames_per_second ();
+	float const fps = _transcoder->current_encoding_rate ();
 	if (fps == 0) {
 		return Job::status ();
 	}
@@ -109,24 +103,28 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-	float fps = _encoder->current_frames_per_second ();
+	if (!_transcoder) {
+		return 0;
+	}
+	
+	float fps = _transcoder->current_encoding_rate ();
+
 	if (fps == 0) {
 		return 0;
 	}
 
-	if (!_film->length()) {
+	if (!_film->video_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) {
+	int length = _film->video_length();
+	FrameRateConversion const frc (_film->video_frame_rate(), _film->dcp_frame_rate());
+	if (frc.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();
+	int const left = length - _transcoder->video_frames_out();
 	return left / fps;
 }