Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

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

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 6bf092feed60a0854cce6b2131217d5eb9d38623..a5659b22f555d9c97734ba808b6f0b79c7bfe479 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -24,10 +24,7 @@
 #include "encoder.h"
 #include "job.h"
 #include "image.h"
-#include "playlist.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "gain.h"
+#include "player.h"
 #include "combiner.h"
 
 /** @file src/ab_transcoder.cc
@@ -46,68 +43,24 @@ using boost::dynamic_pointer_cast;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<Job> j)
-       : _film_a (a)
-       , _film_b (b)
-       , _player_a (_film_a->player ())
-       , _player_b (_film_b->player ())
+ABTranscoder::ABTranscoder (shared_ptr<Film> film_a, shared_ptr<Film> film_b, shared_ptr<Job> j)
+       : _player_a (film_a->player ())
+       , _player_b (film_b->player ())
        , _job (j)
-       , _encoder (new Encoder (_film_a))
-       , _combiner (new Combiner (a->log()))
+       , _encoder (new Encoder (film_a, j))
+       , _combiner (new Combiner)
 {
-       if (_film_a->has_audio ()) {
-               _matcher.reset (new Matcher (_film_a->log(), _film_a->audio_frame_rate(), _film_a->video_frame_rate()));
-               _delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_channels(), _film_a->audio_delay() * _film_a->audio_frame_rate() / 1000));
-               _gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
-       }
-
        _player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
        _player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
-       if (_matcher) {
-               _combiner->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
-       } else {
-               _combiner->connect_video (_encoder);
-       }
-       
-       if (_matcher && _delay_line) {
-               _player_a->connect_audio (_delay_line);
-               _delay_line->connect_audio (_matcher);
-               _matcher->connect_audio (_gain);
-               _gain->connect_audio (_encoder);
-       }
+       _combiner->connect_video (_encoder);
+       _player_a->connect_audio (_encoder);
 }
 
 void
 ABTranscoder::go ()
 {
        _encoder->process_begin ();
-
-       bool done[2] = { false, false };
-       
-       while (1) {
-               done[0] = _player_a->pass ();
-               done[1] = _player_b->pass ();
-
-               if (_job) {
-                       _player_a->set_progress (_job);
-               }
-
-               if (done[0] && done[1]) {
-                       break;
-               }
-       }
-
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
-       if (_matcher) {
-               _matcher->process_end ();
-       }
-       if (_gain) {
-               _gain->process_end ();
-       }
+       while (!_player_a->pass () || !_player_b->pass ()) {}
        _encoder->process_end ();
 }
-