Merge master.

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

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index d85f078a5aa0e1601f01a90b8582fcdb1a95815f..4ed5d02ca7018e3f90048448c49114dd2106253c 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -49,18 +49,18 @@ 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)
 {
-       _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 +70,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);
@@ -98,7 +98,9 @@ ABTranscoder::go ()
                bool const vb = _db.video->pass ();
                bool const a = _da.audio->pass ();
 
-               _da.video->set_progress ();
+               if (_job) {
+                       _da.video->set_progress (_job);
+               }
 
                if (va && vb && a) {
                        break;