Merge master.

[dcpomatic.git] / src / lib / transcode_job.cc

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 0c3b8c37b978b9d5c94c058cfafbde11db552ec0..ce02fa57e7d302c0b7fc392a98f366bb38b639d9 100644 (file)
--- 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"
 
@@ -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;
 }