Merge master; fix crash on new film.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ea3f27ad8f94f10175e1b6e81237b5e1d6059c12..2e33931bd50872cc5edbb16c274af19e336a5bb1 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -35,6 +35,7 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "player.h"
+#include "trimmer.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -54,18 +55,27 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
        _delay_line.reset (new DelayLine (f->log(), f->audio_delay() * f->audio_frame_rate() / 1000));
        _gain.reset (new Gain (f->log(), f->audio_gain()));
 
+       int const trim_start = f->trim_type() == Film::ENCODE ? f->trim_start() : 0;
+       int const trim_end = f->trim_type() == Film::ENCODE ? f->trim_end() : 0;
+       _trimmer.reset (new Trimmer (
+                               f->log(), trim_start, trim_end, f->content_length(),
+                               f->audio_frame_rate(), f->video_frame_rate(), f->dcp_frame_rate()
+                               ));
+       
        if (!f->with_subtitles ()) {
                _player->disable_subtitles ();
        }
 
        _player->connect_video (_delay_line);
        _delay_line->connect_video (_matcher);
-       _matcher->connect_video (_encoder);
+       _matcher->connect_video (_trimmer);
+       _trimmer->connect_video (_encoder);
        
        _player->connect_audio (_delay_line);
        _delay_line->connect_audio (_matcher);
        _matcher->connect_audio (_gain);
-       _gain->connect_audio (_encoder);
+       _gain->connect_audio (_trimmer);
+       _trimmer->connect_audio (_encoder);
 }
 
 void
@@ -80,7 +90,9 @@ Transcoder::go ()
        }
 
        _delay_line->process_end ();
-       _matcher->process_end ();
+       if (_matcher) {
+               _matcher->process_end ();
+       }
        _gain->process_end ();
        _encoder->process_end ();
 }