Merge branch 'master' of /home/carl/git/dvdomatic

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index dfb9b107192748f7dbe8c6b4f2280cd69fa05057..61fad2e2b3e8df7d0cc137f14ba26fb7c105faea 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -30,6 +30,8 @@
 #include "log.h"
 #include "encoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using std::fixed;
@@ -37,13 +39,11 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
- *  @param req Job that must be completed before this job is run.
+ *  @param o Decode options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
-       : Job (f, req)
-       , _decode_opt (od)
-       , _encode_opt (oe)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+       : Job (f)
+       , _decode_opt (o)
 {
        
 }
@@ -51,7 +51,7 @@ TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions>
 string
 TranscodeJob::name () const
 {
-       return String::compose ("Transcode %1", _film->name());
+       return String::compose (_("Transcode %1"), _film->name());
 }
 
 void
@@ -59,22 +59,25 @@ 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.reset (new Encoder (_film, _encode_opt));
+               _encoder.reset (new Encoder (_film));
                Transcoder w (_film, _decode_opt, this, _encoder);
                w.go ();
                set_progress (1);
                set_state (FINISHED_OK);
 
-               _film->log()->log ("Transcode job completed successfully");
+               _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) {
 
                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;
        }
@@ -84,14 +87,9 @@ string
 TranscodeJob::status () const
 {
        if (!_encoder) {
-               return "0%";
+               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 ();
@@ -102,7 +100,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 ();
@@ -116,11 +114,19 @@ TranscodeJob::remaining_time () const
                return 0;
        }
 
-       if (!_film->dcp_length()) {
+       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 */
-       SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+       int const left = length - _encoder->video_frames_out();
        return left / fps;
 }