X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.cc;h=7db13afcc0c0ae491b5abf54b91890140d2f587b;hb=a00ebbc68438e84076c65e99d0e70403afb4407d;hp=fc4fb8daa44c96105f11ea14a5562bc847344ca9;hpb=32fc1ddb0ee004d18c36155ddcf4d9b3998a7061;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index fc4fb8daa..7db13afcc 100644
--- 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.
@@ -54,16 +55,15 @@ ABTranscoder::ABTranscoder (
 	, _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);
-
-	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()));
-	}
+	_da = decoder_factory (_film_a, o);
+	_db = decoder_factory (_film_b, o);
+
+	shared_ptr<AudioStream> st = _film_a->audio_stream();
+	_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));
+	_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 ());
@@ -73,34 +73,38 @@ ABTranscoder::ABTranscoder (
 	_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);
-	}
+	_combiner->connect_video (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->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);
-	}
+	_da.audio->connect_audio (_delay_line);
+	_delay_line->connect_audio (_matcher);
+	_matcher->connect_audio (_gain);
+	_gain->connect_audio (_encoder);
 }
 
 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;
 		}
 	}