X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.cc;h=a5659b22f555d9c97734ba808b6f0b79c7bfe479;hb=f385ef03e5ea27519a31c0839447735a7fba0602;hp=c40c0916e6f1ee474ca3b3ea2b35152fee827d7a;hpb=ca4d051ceafb77c281583c4e50b391f230544313;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index c40c0916e..a5659b22f 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,12 +21,11 @@
 #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 "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 +34,33 @@
 
 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)
-	: _film_a (a)
-	, _film_b (b)
-	, _opt (o)
+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)
-	, _last_frame (0)
+	, _encoder (new Encoder (film_a, j))
+	, _combiner (new Combiner)
 {
-	_da = decoder_factory (_film_a, o, j);
-	_db = decoder_factory (_film_b, o, j);
+	_player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+	_player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
-	_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, _2));
+	_combiner->connect_video (_encoder);
+	_player_a->connect_audio (_encoder);
 }
 
-ABTranscoder::~ABTranscoder ()
-{
-
-}
-
-void
-ABTranscoder::process_video (shared_ptr<Image> yuv, SourceFrame 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 ();
-	}
-	
-	_last_frame = frame;
-}
-
-
 void
 ABTranscoder::go ()
 {
-	_encoder->process_begin (_da->audio_channel_layout());
-	_da->process_begin ();
-	_db->process_begin ();
-	
-	while (1) {
-		bool const a = _da->pass ();
-		bool const b = _db->pass ();
-
-		if (a && b) {
-			break;
-		}
-	}
-
+	_encoder->process_begin ();
+	while (!_player_a->pass () || !_player_b->pass ()) {}
 	_encoder->process_end ();
-	_da->process_end ();
-	_db->process_end ();
 }
-