X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=de2fb1d3388b73d94b1b5889c8b91b7d153083be;hb=a78b741c43830c84bcb4d18e3147746f13a668e5;hp=eb787dee82c52ca3795cb5a145170710e6d1cd85;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index eb787dee8..de2fb1d33 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,10 +36,13 @@
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
 #include "subtitle_content.h"
+#include "player_video.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
+#include "i18n.h"
+
 using std::string;
 using std::cout;
 using std::list;
@@ -51,14 +54,24 @@ using boost::dynamic_pointer_cast;
  *  @param f Film that we are transcoding.
  *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
 	: _film (film)
+	, _job (j)
 	, _player (new Player (film, film->playlist ()))
 	, _writer (new Writer (film, j))
 	, _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
@@ -67,33 +80,17 @@ Transcoder::go ()
 	_writer->start ();
 	_encoder->begin ();
 
-	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;
-			}
-		}
+	{
+		shared_ptr<Job> job = _job.lock ();
+		DCPOMATIC_ASSERT (job);
+		job->sub (_("Encoding"));
 	}
 
-	if (non_burnt_subtitles) {
+	if (_non_burnt_subtitles) {
 		_writer->write (_player->get_subtitle_fonts ());
 	}
 
-	for (DCPTime t; t < length; t += frame) {
-		_encoder->encode (_player->get_video (t, true));
-		_writer->write (_player->get_audio (t, frame, true));
-
-		if (non_burnt_subtitles) {
-			_writer->write (_player->get_subtitles (t, frame, true, false, true));
-		}
-	}
+	while (!_player->pass ()) {}
 
 	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
 		_writer->write (i);
@@ -104,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
 {
@@ -111,7 +137,7 @@ Transcoder::current_encoding_rate () const
 }
 
 int
-Transcoder::video_frames_out () const
+Transcoder::video_frames_enqueued () const
 {
-	return _encoder->video_frames_out ();
+	return _encoder->video_frames_enqueued ();
 }