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 53af43b5d91a2be5f259bad4d1d725fb3f18c067..a5659b22f555d9c97734ba808b6f0b79c7bfe479 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,16 +21,10 @@
 #include <boost/shared_ptr.hpp>
 #include "ab_transcoder.h"
 #include "film.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
 #include "encoder.h"
 #include "job.h"
-#include "options.h"
 #include "image.h"
-#include "decoder_factory.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "gain.h"
+#include "player.h"
 #include "combiner.h"
 
 /** @file src/ab_transcoder.cc
@@ -40,6 +34,7 @@
 
 using std::string;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** @param a Film to use for the left half of the screen.
  *  @param b Film to use for the right half of the screen.
@@ -48,72 +43,24 @@ using boost::shared_ptr;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (
-       shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<const DecodeOptions> o, Job* j, shared_ptr<Encoder> e)
-       : _film_a (a)
-       , _film_b (b)
+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 (e)
+       , _encoder (new Encoder (film_a, j))
+       , _combiner (new Combiner)
 {
-       _da = decoder_factory (_film_a, o, j);
-       _db = decoder_factory (_film_b, o, j);
+       _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 (_film_a->audio_stream()) {
-               shared_ptr<AudioStream> st = _film_a->audio_stream();
-               _matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->frames_per_second()));
-               _delay_line.reset (new DelayLine (_film_a->log(), st->channels(), _film_a->audio_delay() * st->sample_rate() / 1000));
-               _gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
-       }
-
-       /* Set up the decoder to use the film's set streams */
-       _da.video->set_subtitle_stream (_film_a->subtitle_stream ());
-       _db.video->set_subtitle_stream (_film_a->subtitle_stream ());
-       _da.audio->set_audio_stream (_film_a->audio_stream ());
-
-       _da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
-       _db.video->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) {
-               _da.audio->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 ();
-       
-       while (1) {
-               bool const va = _da.video->pass ();
-               bool const vb = _db.video->pass ();
-               bool const a = _da.audio->pass ();
-
-               _da.video->set_progress ();
-
-               if (va && vb && a) {
-                       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 ();
 }
-