X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.cc;h=d85f078a5aa0e1601f01a90b8582fcdb1a95815f;hb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;hp=e9277a96fe05a11ad05f803d791748b73cc58859;hpb=40532d61ea4909b3f8b12dd7024de217dbdfec6d;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index e9277a96f..d85f078a5 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -43,16 +43,15 @@ using boost::shared_ptr;
 
 /** @param a Film to use for the left half of the screen.
  *  @param b Film to use for the right half of the screen.
- *  @param o Options.
+ *  @param o Decoder options.
  *  @param j Job that we are associated with.
  *  @param e Encoder to use.
  */
 
 ABTranscoder::ABTranscoder (
-	shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
+	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)
-	, _opt (o)
 	, _job (j)
 	, _encoder (e)
 {
@@ -60,19 +59,19 @@ ABTranscoder::ABTranscoder (
 	_db = decoder_factory (_film_b, o, j);
 
 	if (_film_a->audio_stream()) {
-		AudioStream st = _film_a->audio_stream().get();
-		_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));
+		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.first->set_subtitle_stream (_film_a->subtitle_stream ());
-	_db.first->set_subtitle_stream (_film_a->subtitle_stream ());
-	_da.second->set_audio_stream (_film_a->audio_stream ());
+	_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.first->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2));
-	_db.first->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2));
+	_da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2));
+	_db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2));
 
 	if (_matcher) {
 		_combiner->connect_video (_matcher);
@@ -82,7 +81,7 @@ ABTranscoder::ABTranscoder (
 	}
 	
 	if (_matcher && _delay_line) {
-		_da.second->connect_audio (_delay_line);
+		_da.audio->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -95,17 +94,26 @@ ABTranscoder::go ()
 	_encoder->process_begin ();
 	
 	while (1) {
-		bool const va = _da.first->pass ();
-		bool const vb = _db.first->pass ();
-		bool const a = _da.first->pass ();
+		bool const va = _da.video->pass ();
+		bool const vb = _db.video->pass ();
+		bool const a = _da.audio->pass ();
 
-		_da.first->set_progress ();
+		_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 ();
+	}
 	_encoder->process_end ();
 }