Merge master; fix crash on new film.

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

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index d8f13dae4b7854afb0b1f4d97c70ab488f78ff2c..2e0d41e7de08f24c4bc83b6fb615cecf9cf9a0de 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,13 +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 "player.h"
 #include "matcher.h"
 #include "delay_line.h"
 #include "gain.h"
@@ -50,58 +47,38 @@ using boost::dynamic_pointer_cast;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (
-       shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
+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 ())
        , _job (j)
-       , _encoder (e)
+       , _encoder (new Encoder (_film_a))
        , _combiner (new Combiner (a->log()))
 {
-       _da = decoder_factory (_film_a, o);
-       _db = decoder_factory (_film_b, o);
-
-       shared_ptr<AudioStream> st = _film_a->audio_stream();
-       if (st) {
-               _matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->source_frame_rate()));
-       }
-       _delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_delay() / 1000.0f));
+       _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_delay() * _film_a->audio_frame_rate() / 1000));
        _gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
 
-       int const sr = st ? st->sample_rate() : 0;
+       _player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
+       _player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
+
        int const trim_start = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_start() : 0;
        int const trim_end = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_end() : 0;
        _trimmer.reset (new Trimmer (
-                               _film_a->log(), trim_start, trim_end, _film_a->length().get(),
-                               sr, _film_a->source_frame_rate(), _film_a->dcp_frame_rate()
+                               _film_a->log(), trim_start, trim_end, _film_a->content_length(),
+                               _film_a->audio_frame_rate(), _film_a->video_frame_rate(), _film_a->dcp_frame_rate()
                                ));
        
-       /* 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 ());
-       if (_film_a->audio_stream ()) {
-               _da.audio->set_audio_stream (_film_a->audio_stream ());
-       }
-
-       _da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
-       _db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
 
        _combiner->connect_video (_delay_line);
-       if (_matcher) {
-               _delay_line->connect_video (_matcher);
-               _matcher->connect_video (_trimmer);
-       } else {
-               _delay_line->connect_video (_trimmer);
-       }
+       _delay_line->connect_video (_matcher);
+       _matcher->connect_video (_trimmer);
        _trimmer->connect_video (_encoder);
        
-       _da.audio->connect_audio (_delay_line);
-       if (_matcher) {
-               _delay_line->connect_audio (_matcher);
-               _matcher->connect_audio (_gain);
-       } else {
-               _delay_line->connect_audio (_gain);
-       }
+       _player_a->connect_audio (_delay_line);
+       _delay_line->connect_audio (_matcher);
+       _matcher->connect_audio (_gain);
        _gain->connect_audio (_trimmer);
        _trimmer->connect_audio (_encoder);
 }
@@ -111,32 +88,25 @@ ABTranscoder::go ()
 {
        _encoder->process_begin ();
 
-       bool done[3] = { false, false, false };
+       bool done[2] = { false, false };
        
        while (1) {
-               done[0] = _da.video->pass ();
-               done[1] = _db.video->pass ();
-               
-               if (!done[2] && _da.audio && dynamic_pointer_cast<Decoder> (_da.audio) != dynamic_pointer_cast<Decoder> (_da.video)) {
-                       done[2] = _da.audio->pass ();
-               } else {
-                       done[2] = true;
-               }
-               
+               done[0] = _player_a->pass ();
+               done[1] = _player_b->pass ();
+
                if (_job) {
-                       _da.video->set_progress (_job);
+                       _player_a->set_progress (_job);
                }
-               
-               if (done[0] && done[1] && done[2]) {
+
+               if (done[0] && done[1]) {
                        break;
                }
        }
                
        _delay_line->process_end ();
-       if (_matcher) {
-               _matcher->process_end ();
-       }
+       _matcher->process_end ();
        _gain->process_end ();
+       _trimmer->process_end ();
        _encoder->process_end ();
 }