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

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 54153ec76..d85f078a5 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -19,110 +19,101 @@
 
 #include <iostream>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/bind.h>
 #include "ab_transcoder.h"
 #include "film.h"
-#include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
 #include "encoder.h"
 #include "job.h"
-#include "film_state.h"
 #include "options.h"
 #include "image.h"
 #include "decoder_factory.h"
+#include "matcher.h"
+#include "delay_line.h"
+#include "gain.h"
+#include "combiner.h"
 
 /** @file src/ab_transcoder.cc
- *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
  *  for the right half (to facilitate A/B comparisons of settings)
  */
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 
-/** @param a FilmState to use for the left half of the screen.
- *  @param b FilmState to use for the right half of the screen.
- *  @param o Options.
+/** @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 Decoder options.
  *  @param j Job that we are associated with.
- *  @param l Log.
  *  @param e Encoder to use.
  */
 
 ABTranscoder::ABTranscoder (
-	shared_ptr<const FilmState> a, shared_ptr<const FilmState> b, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
-	: _fs_a (a)
-	, _fs_b (b)
-	, _opt (o)
+	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)
 	, _job (j)
-	, _log (l)
 	, _encoder (e)
-	, _last_frame (0)
 {
-	_da = decoder_factory (_fs_a, o, j, _log);
-	_db = decoder_factory (_fs_b, o, j, _log);
-
-	_da->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 0));
-	_db->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 1));
-	_da->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
-}
+	_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()));
+	}
 
-ABTranscoder::~ABTranscoder ()
-{
+	/* 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));
+	_db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2));
 
-void
-ABTranscoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Subtitle> sub, int index)
-{
-	if (index == 0) {
-		/* Keep this image around until we get the other half */
-		_image = yuv;
+	if (_matcher) {
+		_combiner->connect_video (_matcher);
+		_matcher->connect_video (_encoder);
 	} else {
-		/* Copy the right half of yuv into _image */
-		for (int i = 0; i < yuv->components(); ++i) {
-			int const line_size = yuv->line_size()[i];
-			int const half_line_size = line_size / 2;
-			int const stride = yuv->stride()[i];
-
-			uint8_t* p = _image->data()[i];
-			uint8_t* q = yuv->data()[i];
-			
-			for (int j = 0; j < yuv->lines (i); ++j) {
-				memcpy (p + half_line_size, q + half_line_size, half_line_size);
-				p += stride;
-				q += stride;
-			}
-		}
-			
-		/* And pass it to the encoder */
-		_encoder->process_video (_image, frame, sub);
-		_image.reset ();
+		_combiner->connect_video (_encoder);
 	}
 	
-	_last_frame = frame;
+	if (_matcher && _delay_line) {
+		_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 (_da->audio_channel_layout(), _da->audio_sample_format());
-	_da->process_begin ();
-	_db->process_begin ();
+	_encoder->process_begin ();
 	
 	while (1) {
-		bool const a = _da->pass ();
-		bool const b = _db->pass ();
+		bool const va = _da.video->pass ();
+		bool const vb = _db.video->pass ();
+		bool const a = _da.audio->pass ();
 
-		if (_job) {
-			_job->set_progress (float (_last_frame) / _fs_a->dcp_length());
-		}
-		
-		if (a && b) {
+		_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 ();
-	_da->process_end ();
-	_db->process_end ();
 }