Merge master.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 5e9e58667864b2dbf533ed7574b5eddb5b68e4ca..0c3b8c37b978b9d5c94c058cfafbde11db552ec0 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -24,12 +24,13 @@
 #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"
+
+#include "i18n.h"
 
 using std::string;
 using std::stringstream;
@@ -38,11 +39,9 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
-       : Job (f, req)
-       , _opt (o)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f)
+       : Job (f)
 {
        
 }
@@ -50,7 +49,7 @@ TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, sha
 string
 TranscodeJob::name () const
 {
-       return String::compose ("Transcode %1", _film->name());
+       return String::compose (_("Transcode %1"), _film->name());
 }
 
 void
@@ -58,22 +57,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"));
+               _film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-               _encoder = encoder_factory (_film, _opt);
-               Transcoder w (_film, _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");
+               _film->log()->log (N_("Transcode job completed successfully"));
 
        } catch (std::exception& e) {
 
                set_progress (1);
                set_state (FINISHED_ERROR);
-               _film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
+               _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
 
                throw;
        }
@@ -82,16 +80,11 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-       if (!_encoder) {
-               return "0%";
+       if (!_transcoder) {
+               return _("0%");
        }
 
-       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 ();
        }
@@ -101,7 +94,7 @@ TranscodeJob::status () const
        s << Job::status ();
 
        if (!finished ()) {
-               s << "; " << fixed << setprecision (1) << fps << " frames per second";
+               s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
        }
        
        return s.str ();
@@ -110,12 +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;
        }
 
-       /* We assume that dcp_length() is valid */
-       SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+       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();
        return left / fps;
 }