Merge 1.0 in.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index f8fe0c8d5934715844cc1790c789f200a08294ef..63ba77939f2cf7ca033286c6ee88a575fa698aa4 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -29,68 +29,53 @@
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "player.h"
-#include "trimmer.h"
 #include "job.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
+{
+       shared_ptr<Encoder> e = encoder.lock ();
+       if (e) {
+               e->process_video (image, eyes, conversion, same);
+       }
+}
+
+static void
+audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
+{
+       shared_ptr<Encoder> e = encoder.lock ();
+       if (e) {
+               e->process_audio (audio);
+       }
+}
+
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
        : _job (j)
-       , _player (f->player ())
+       , _player (f->make_player ())
        , _encoder (new Encoder (f, j))
 {
-       _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 ();
-       }
-
-       _player->connect_video (_delay_line);
-       _delay_line->connect_video (_matcher);
-       _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 (_trimmer);
-       _trimmer->connect_audio (_encoder);
+       _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
+       _player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
 void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-
        while (!_player->pass ()) {}
-       
-       _delay_line->process_end ();
-       if (_matcher) {
-               _matcher->process_end ();
-       }
-       _gain->process_end ();
        _encoder->process_end ();
 }
 
@@ -105,3 +90,9 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
+
+Encoder::State
+Transcoder::state () const
+{
+       return _encoder->state ();
+}