Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 2a8ce50448c1ed31dc778767d702561e71d63522..f8fe0c8d5934715844cc1790c789f200a08294ef 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -35,6 +35,8 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "player.h"
+#include "trimmer.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -48,53 +50,47 @@ using boost::dynamic_pointer_cast;
 Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
        : _job (j)
        , _player (f->player ())
-       , _encoder (new Encoder (f))
+       , _encoder (new Encoder (f, j))
 {
-       if (f->has_audio ()) {
-               _matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
-               _delay_line.reset (new DelayLine (f->log(), f->audio_channels(), f->audio_delay() * f->audio_frame_rate() / 1000));
-               _gain.reset (new Gain (f->log(), f->audio_gain()));
-       }
+       _matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+       _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 ();
        }
 
-       if (_matcher) {
-               _player->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
-       } else {
-               _player->connect_video (_encoder);
-       }
+       _player->connect_video (_delay_line);
+       _delay_line->connect_video (_matcher);
+       _matcher->connect_video (_trimmer);
+       _trimmer->connect_video (_encoder);
        
-       if (_matcher && _delay_line && f->has_audio ()) {
-               _player->connect_audio (_delay_line);
-               _delay_line->connect_audio (_matcher);
-               _matcher->connect_audio (_gain);
-               _gain->connect_audio (_encoder);
-       }
+       _player->connect_audio (_delay_line);
+       _delay_line->connect_audio (_matcher);
+       _matcher->connect_audio (_gain);
+       _gain->connect_audio (_trimmer);
+       _trimmer->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       while (1) {
-               if (_player->pass ()) {
-                       break;
-               }
-               _player->set_progress (_job);
-       }
 
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
+       while (!_player->pass ()) {}
+       
+       _delay_line->process_end ();
        if (_matcher) {
                _matcher->process_end ();
        }
-       if (_gain) {
-               _gain->process_end ();
-       }
+       _gain->process_end ();
        _encoder->process_end ();
 }