Runs.

1 files changed, 16 insertions, 32 deletions

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 3a1cd83d7..0c687008d 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,13 +21,11 @@
 #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 "playlist.h"
 #include "matcher.h"
 #include "delay_line.h"
 #include "gain.h"
@@ -49,31 +47,23 @@ 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)
+ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
+	, _playlist_a (_film_a->playlist ())
+	, _playlist_b (_film_b->playlist ())
 	, _job (j)
-	, _encoder (e)
+	, _encoder (new Encoder (_film_a, _playlist_a))
 	, _combiner (new Combiner (a->log()))
 {
-	_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->source_frame_rate()));
-		_delay_line.reset (new DelayLine (_film_a->log(), st->channels(), _film_a->audio_delay() * st->sample_rate() / 1000));
+	if (_playlist_a->has_audio ()) {
+		_matcher.reset (new Matcher (_film_a->log(), _playlist_a->audio_frame_rate(), _playlist_a->video_frame_rate()));
+		_delay_line.reset (new DelayLine (_film_a->log(), _playlist_a->audio_channels(), _film_a->audio_delay() * _playlist_a->audio_frame_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.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.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
-	_db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
+	_playlist_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+	_playlist_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
 	if (_matcher) {
 		_combiner->connect_video (_matcher);
@@ -83,7 +73,7 @@ ABTranscoder::ABTranscoder (
 	}
 	
 	if (_matcher && _delay_line) {
-		_da.audio->connect_audio (_delay_line);
+		_playlist_a->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -95,23 +85,17 @@ ABTranscoder::go ()
 {
 	_encoder->process_begin ();
 
-	bool done[3] = { false, false, false };
+	bool done[2] = { 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;
-		}
+		done[0] = _playlist_a->pass ();
+		done[1] = _playlist_b->pass ();
 
 		if (_job) {
-			_da.video->set_progress (_job);
+			_playlist_a->set_progress (_job);
 		}
 
-		if (done[0] && done[1] && done[2]) {
+		if (done[0] && done[1]) {
 			break;
 		}
 	}