Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 2e33931bd50872cc5edbb16c274af19e336a5bb1..a4cd36a4fb509f17ba6f58eae2729e0bb2901060 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,72 +29,49 @@
 #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 std::cout;
+using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 /** 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)
-       : _job (j)
-       , _player (f->player ())
-       , _encoder (new Encoder (f))
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+       : _film (f)
+       , _player (f->make_player ())
+       , _encoder (new Encoder (f, j))
+       , _finishing (false)
 {
-       _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);
 }
 
 void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       while (1) {
-               if (_player->pass ()) {
-                       break;
+
+       DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+       for (DCPTime t; t < _film->length(); t += frame) {
+               list<shared_ptr<PlayerVideoFrame> > v = _player->get_video (t, true);
+               for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = v.begin(); i != v.end(); ++i) {
+                       _encoder->process_video (*i);
                }
-               _player->set_progress (_job);
+               _encoder->process_audio (_player->get_audio (t, frame, true));
        }
 
-       _delay_line->process_end ();
-       if (_matcher) {
-               _matcher->process_end ();
-       }
-       _gain->process_end ();
+       _finishing = true;
        _encoder->process_end ();
+
+       _player->statistics().dump (_film->log ());
 }
 
 float
@@ -108,3 +85,4 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
+