1 files changed, 23 insertions, 68 deletions

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index d8f13dae4..f75491dce 100644
--- 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,36 @@ 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)
-	: _film_a (a)
-	, _film_b (b)
+ABTranscoder::ABTranscoder (shared_ptr<Film> film_a, shared_ptr<Film> film_b, shared_ptr<Job> j)
+	: _player_a (film_a->player ())
+	, _player_b (film_b->player ())
 	, _job (j)
-	, _encoder (e)
-	, _combiner (new Combiner (a->log()))
+	, _encoder (new Encoder (film_a, j))
+	, _combiner (new Combiner (film_a->log()))
 {
-	_da = decoder_factory (_film_a, o);
-	_db = decoder_factory (_film_b, o);
+	_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()));
 
-	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));
-	_gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
+	_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 sr = st ? st->sample_rate() : 0;
-	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;
+	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 +86,12 @@ ABTranscoder::go ()
 {
 	_encoder->process_begin ();
 
-	bool done[3] = { false, 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;
-		}
-		
-		if (_job) {
-			_da.video->set_progress (_job);
-		}
-		
-		if (done[0] && done[1] && done[2]) {
-			break;
-		}
-	}
+	while (!_player_a->pass () || !_player_b->pass ()) {}
 		
 	_delay_line->process_end ();
-	if (_matcher) {
-		_matcher->process_end ();
-	}
+	_matcher->process_end ();
 	_gain->process_end ();
+	_trimmer->process_end ();
 	_encoder->process_end ();
 }