Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 2a8ce50448c1ed31dc778767d702561e71d63522..ba4d3b040baa432812cfe85e972ea9f6c9d052c1 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -29,73 +29,58 @@
 #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 "job.h"
 
 using std::string;
 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))
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
 {
-       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()));
+       shared_ptr<Encoder> e = encoder.lock ();
+       if (e) {
+               e->process_video (image, eyes, conversion, same);
        }
+}
 
-       if (!f->with_subtitles ()) {
-               _player->disable_subtitles ();
+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);
        }
+}
 
-       if (_matcher) {
-               _player->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
-       } else {
-               _player->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);
-       }
+/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
+ *  @param f Film that we are transcoding.
+ *  @param e Encoder to use.
+ */
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+       : _film (f)
+       , _player (f->make_player ())
+       , _encoder (new Encoder (f, j))
+       , _finishing (false)
+{
+       _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 (1) {
-               if (_player->pass ()) {
-                       break;
-               }
-               _player->set_progress (_job);
-       }
+       while (!_player->pass ()) {}
 
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
-       if (_matcher) {
-               _matcher->process_end ();
-       }
-       if (_gain) {
-               _gain->process_end ();
-       }
+       _finishing = true;
        _encoder->process_end ();
+
+       _player->statistics().dump (_film->log ());
 }
 
 float
@@ -109,3 +94,4 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
+