X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=21ef60b79d754609ba7256d5d1a8519bfb2a2f7a;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=c667a1486e61ee4fd8e70337ce416ffa422c67f9;hpb=0b6f2d7b04819711228ed5fbc5d299b58cef997e;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index c667a1486..21ef60b79 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -51,18 +51,27 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder.
- *  @param f Film that we are transcoding.
- *  @param j Job that this transcoder is being used in.
+ *  @param film Film that we are transcoding.
+ *  @param job Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: _film (film)
-	, _job (j)
+	, _job (job)
 	, _player (new Player (film, film->playlist ()))
-	, _writer (new Writer (film, j))
+	, _writer (new Writer (film, job))
 	, _encoder (new Encoder (film, _writer))
 	, _finishing (false)
+	, _non_burnt_subtitles (false)
 {
+	_player->Video.connect (bind (&Transcoder::video, this, _1, _2));
+	_player->Audio.connect (bind (&Transcoder::audio, this, _1, _2));
+	_player->Subtitle.connect (bind (&Transcoder::subtitle, this, _1, _2));
 
+	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
+			_non_burnt_subtitles = true;
+		}
+	}
 }
 
 void
@@ -74,57 +83,14 @@ Transcoder::go ()
 	{
 		shared_ptr<Job> job = _job.lock ();
 		DCPOMATIC_ASSERT (job);
-		job->sub (_("Encoding picture and sound"));
-	}
-
-	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-	DCPTime const length = _film->length ();
-
-	int burnt_subtitles = 0;
-	int non_burnt_subtitles = 0;
-	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
-		if (c->subtitle && c->subtitle->use()) {
-			if (c->subtitle->burn()) {
-				++burnt_subtitles;
-			} else {
-				++non_burnt_subtitles;
-			}
-		}
+		job->sub (_("Encoding"));
 	}
 
-	if (non_burnt_subtitles) {
+	if (_non_burnt_subtitles) {
 		_writer->write (_player->get_subtitle_fonts ());
 	}
 
-	for (DCPTime t; t < length; t += frame) {
-
-		BOOST_FOREACH (shared_ptr<PlayerVideo> i, _player->get_video (t, true)) {
-			if (!_film->three_d()) {
-				/* 2D DCP */
-				if (i->eyes() == EYES_RIGHT) {
-					/* Discard right-eye images */
-					continue;
-				} else if (i->eyes() == EYES_LEFT) {
-					/* Use left-eye images for both eyes */
-					i->set_eyes (EYES_BOTH);
-				}
-			}
-
-			_encoder->encode (i);
-		}
-
-		_writer->write (_player->get_audio (t, frame, true));
-
-		if (non_burnt_subtitles) {
-			_writer->write (_player->get_subtitles (t, frame, true, false, true));
-		}
-
-		{
-			shared_ptr<Job> job = _job.lock ();
-			DCPOMATIC_ASSERT (job);
-			job->set_progress (float(t.get()) / length.get());
-		}
-	}
+	while (!_player->pass ()) {}
 
 	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
 		_writer->write (i);
@@ -135,6 +101,35 @@ Transcoder::go ()
 	_writer->finish ();
 }
 
+void
+Transcoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
+{
+	if (!_film->three_d() && data->eyes() == EYES_LEFT) {
+		/* Use left-eye images for both eyes */
+		data->set_eyes (EYES_BOTH);
+	}
+
+	_encoder->encode (data, time);
+}
+
+void
+Transcoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
+{
+	_writer->write (data);
+
+	shared_ptr<Job> job = _job.lock ();
+	DCPOMATIC_ASSERT (job);
+	job->set_progress (float(time.get()) / _film->length().get());
+}
+
+void
+Transcoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+{
+	if (_non_burnt_subtitles) {
+		_writer->write (data, period);
+	}
+}
+
 float
 Transcoder::current_encoding_rate () const
 {