X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.cc;h=c6ccfdc67e268492a9cae8eca5de06f53c7b3daf;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hp=beedd478ffac18235d9d21e2e662dbad8133e799;hpb=63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index beedd478f..c6ccfdc67 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,12 +21,14 @@
 #include <boost/shared_ptr.hpp>
 #include "ab_transcoder.h"
 #include "film.h"
-#include "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"
+#include "combiner.h"
 
 /** @file src/ab_transcoder.cc
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -35,86 +37,70 @@
 
 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, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
-	, _opt (o)
+	, _player_a (_film_a->player ())
+	, _player_b (_film_b->player ())
 	, _job (j)
-	, _encoder (e)
-	, _last_frame (0)
+	, _encoder (new Encoder (_film_a))
+	, _combiner (new Combiner (a->log()))
 {
-	_da = decoder_factory (_film_a, o, j);
-	_db = decoder_factory (_film_b, o, j);
+	_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()));
 
-	_da->Video.connect (bind (&ABTranscoder::process_video, this, _1, _2, _3, 0));
-	_db->Video.connect (bind (&ABTranscoder::process_video, this, _1, _2, _3, 1));
-	_da->Audio.connect (bind (&Encoder::process_audio, e, _1));
-}
-
-ABTranscoder::~ABTranscoder ()
-{
-
-}
+	_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));
 
-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;
-	} 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 (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->connect_video (_encoder);
 	
-	_last_frame = frame;
+	_player_a->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->process_begin ();
-	_db->process_begin ();
+	_encoder->process_begin ();
+
+	bool done[2] = { false, false };
 	
 	while (1) {
-		bool const a = _da->pass ();
-		bool const b = _db->pass ();
+		done[0] = _player_a->pass ();
+		done[1] = _player_b->pass ();
+
+		if (_job) {
+			_player_a->set_progress (_job);
+		}
 
-		if (a && b) {
+		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 ();
-	_da->process_end ();
-	_db->process_end ();
 }