X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.cc;h=0c687008d91f18546fd2871a788b7b33905f9663;hb=127672223cca569986e35c91265e269ed5a6561c;hp=f280ab48c339c2b5689b5dcfe8f485f657b54d8e;hpb=cafa76a2b52449ce3c9eecfd0ea53b7318814951;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index f280ab48c..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"
@@ -40,39 +38,32 @@
 
 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.
- *  @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)
+ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
-	, _opt (o)
+	, _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, 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));
+	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.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.first->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2));
-	_db.first->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2));
+	_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);
@@ -82,7 +73,7 @@ ABTranscoder::ABTranscoder (
 	}
 	
 	if (_matcher && _delay_line) {
-		_da.second->connect_audio (_delay_line);
+		_playlist_a->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -93,19 +84,31 @@ void
 ABTranscoder::go ()
 {
 	_encoder->process_begin ();
+
+	bool done[2] = { false, false };
 	
 	while (1) {
-		bool const va = _da.first->pass ();
-		bool const vb = _db.first->pass ();
-		bool const a = _da.first->pass ();
+		done[0] = _playlist_a->pass ();
+		done[1] = _playlist_b->pass ();
 
-		_da.first->set_progress ();
+		if (_job) {
+			_playlist_a->set_progress (_job);
+		}
 
-		if (va && vb && a) {
+		if (done[0] && done[1]) {
 			break;
 		}
 	}
 
+	if (_delay_line) {
+		_delay_line->process_end ();
+	}
+	if (_matcher) {
+		_matcher->process_end ();
+	}
+	if (_gain) {
+		_gain->process_end ();
+	}
 	_encoder->process_end ();
 }