Try to fix up paths for video MXFs, hashes and temporarily-stored frames.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fe34867b250123a8722f5fe83c15ac74f403c2ab..e9a59c743ad3fc81e12abceb3c320f11a4db485d 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -24,24 +24,25 @@
 #include <iostream>
 #include <iomanip>
 #include "transcode_job.h"
-#include "j2k_wav_encoder.h"
 #include "film.h"
 #include "format.h"
 #include "transcoder.h"
-#include "film_state.h"
 #include "log.h"
-#include "encoder_factory.h"
+#include "encoder.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
 
-/** @param s FilmState to use.
- *  @param o Options.
- *  @param l A log that we can write to.
+/** @param s Film to use.
+ *  @param o Decode options.
+ *  @param req Job that must be completed before this job is run.
  */
-TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
-       : Job (s, l, req)
-       , _opt (o)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> req)
+       : Job (f, req)
+       , _decode_opt (o)
 {
        
 }
@@ -49,7 +50,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Opti
 string
 TranscodeJob::name () const
 {
-       return String::compose ("Transcode %1", _fs->name());
+       return String::compose ("Transcode %1", _film->name());
 }
 
 void
@@ -57,21 +58,25 @@ TranscodeJob::run ()
 {
        try {
 
-               _log->log ("Transcode job starting");
+               _film->log()->log ("Transcode job starting");
+               _film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
 
-               _encoder = encoder_factory (_fs, _opt, _log);
-               Transcoder w (_fs, _opt, this, _log, _encoder);
+               _encoder.reset (new Encoder (_film));
+               Transcoder w (_film, _decode_opt, this, _encoder);
                w.go ();
                set_progress (1);
                set_state (FINISHED_OK);
 
-               _log->log ("Transcode job completed successfully");
+               _film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
+
+               _film->log()->log ("Transcode job completed successfully");
+               _film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
 
        } catch (std::exception& e) {
 
                set_progress (1);
                set_state (FINISHED_ERROR);
-               _log->log (String::compose ("Transcode job failed (%1)", e.what()));
+               _film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
 
                throw;
        }
@@ -84,11 +89,6 @@ TranscodeJob::status () const
                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 ();
@@ -96,7 +96,12 @@ TranscodeJob::status () const
 
        stringstream s;
 
-       s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
+       s << Job::status ();
+
+       if (!finished ()) {
+               s << "; " << fixed << setprecision (1) << fps << " frames per second";
+       }
+       
        return s.str ();
 }
 
@@ -108,5 +113,19 @@ TranscodeJob::remaining_time () const
                return 0;
        }
 
-       return ((_fs->dcp_length() - _encoder->last_frame()) / fps);
+       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 */
+       int const left = length - _encoder->video_frames_out();
+       return left / fps;
 }