Merge branch 'master' into trimming

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

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index d85f078a5aa0e1601f01a90b8582fcdb1a95815f..3a1cd83d77473ccfed80da473c39244e50ff80c6 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -40,6 +40,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.
@@ -49,18 +50,19 @@ using boost::shared_ptr;
  */
 
 ABTranscoder::ABTranscoder (
-       shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<const DecodeOptions> o, Job* j, shared_ptr<Encoder> e)
+       shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
        : _film_a (a)
        , _film_b (b)
        , _job (j)
        , _encoder (e)
+       , _combiner (new Combiner (a->log()))
 {
-       _da = decoder_factory (_film_a, o, j);
-       _db = decoder_factory (_film_b, o, j);
+       _da = decoder_factory (_film_a, o);
+       _db = decoder_factory (_film_b, o);
 
        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()));
+               _matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->source_frame_rate()));
                _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()));
        }
@@ -70,8 +72,8 @@ ABTranscoder::ABTranscoder (
        _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));
-       _db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2));
+       _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);
@@ -92,15 +94,24 @@ void
 ABTranscoder::go ()
 {
        _encoder->process_begin ();
+
+       bool done[3] = { false, false, false };
        
        while (1) {
-               bool const va = _da.video->pass ();
-               bool const vb = _db.video->pass ();
-               bool const a = _da.audio->pass ();
+               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;
+               }
 
-               _da.video->set_progress ();
+               if (_job) {
+                       _da.video->set_progress (_job);
+               }
 
-               if (va && vb && a) {
+               if (done[0] && done[1] && done[2]) {
                        break;
                }
        }