X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=6d5edd7c060c662dc404445c1e3ed1a1175d4ace;hb=872557b0261c0daf2206a24e38f33b1c9871c8a3;hp=0c3b8c37b978b9d5c94c058cfafbde11db552ec0;hpb=e94cd129dcd66a76210880bfdf19d27f7992651b;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 0c3b8c37b..6d5edd7c0 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -25,10 +25,8 @@
 #include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder.h"
 
 #include "i18n.h"
 
@@ -40,7 +38,7 @@ using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
 	: Job (f)
 {
 	
@@ -58,7 +56,6 @@ TranscodeJob::run ()
 	try {
 
 		_film->log()->log (N_("Transcode job starting"));
-		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
 		_transcoder.reset (new Transcoder (_film, shared_from_this ()));
 		_transcoder->go ();
@@ -113,18 +110,7 @@ TranscodeJob::remaining_time () const
 		return 0;
 	}
 
-	if (!_film->video_length()) {
-		return 0;
-	}
-
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	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 */
-
-	int const left = length - _transcoder->video_frames_out();
+	OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
 	return left / fps;
 }