X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=d17c6c985b07bd1f5529e75adddae38c78b0fe45;hb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;hp=522f02947ff728c77a487087443e0e72f1c71918;hpb=d8ea1796f34ff894b148a0af78c0a547e0496ee1;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 522f02947..d17c6c985 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,7 +35,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
-#include "subtitle_content.h"
+#include "text_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
@@ -49,6 +49,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
+using namespace dcpomatic;
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.
@@ -56,22 +58,37 @@ using boost::dynamic_pointer_cast;
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: Encoder (film, job)
-	, _writer (new Writer (film, job))
-	, _j2k_encoder (new J2KEncoder (film, _writer))
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
-	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
-		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
-			_non_burnt_subtitles = true;
+	_player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
+	_player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
+	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
+
+	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
+		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+			if (i->use() && !i->burn()) {
+				_non_burnt_subtitles = true;
+			}
 		}
 	}
 }
 
+DCPEncoder::~DCPEncoder ()
+{
+	/* We must stop receiving more video data before we die */
+	_player_video_connection.release ();
+	_player_audio_connection.release ();
+	_player_text_connection.release ();
+}
+
 void
 DCPEncoder::go ()
 {
+	_writer.reset (new Writer (_film, _job));
 	_writer->start ();
+
+	_j2k_encoder.reset (new J2KEncoder (_film, _writer));
 	_j2k_encoder->begin ();
 
 	{
@@ -81,7 +98,18 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		_writer->write (_player->get_subtitle_fonts ());
+		list<shared_ptr<Font> > fonts = _player->get_subtitle_fonts ();
+
+		if (fonts.size() > 1 && _film->interop()) {
+			/* Interop will ignore second and subsequent <LoadFont>s so don't even
+			   write them as they upset some validators.
+			*/
+			shared_ptr<Font> first = fonts.front ();
+			fonts.clear ();
+			fonts.push_back (first);
+		}
+
+		_writer->write (fonts);
 	}
 
 	while (!_player->pass ()) {}
@@ -98,9 +126,14 @@ DCPEncoder::go ()
 void
 DCPEncoder::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);
+	if (!_film->three_d()) {
+		if (data->eyes() == EYES_LEFT) {
+			/* Use left-eye images for both eyes... */
+			data->set_eyes (EYES_BOTH);
+		} else if (data->eyes() == EYES_RIGHT) {
+			/* ...and discard the right */
+			return;
+		}
 	}
 
 	_j2k_encoder->encode (data, time);
@@ -109,7 +142,7 @@ DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	_writer->write (data);
+	_writer->write (data, time);
 
 	shared_ptr<Job> job = _job.lock ();
 	DCPOMATIC_ASSERT (job);
@@ -117,21 +150,29 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (_non_burnt_subtitles) {
-		_writer->write (data, period);
+	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer->write (data, type, track, period);
 	}
 }
 
-float
+optional<float>
 DCPEncoder::current_rate () const
 {
+	if (!_j2k_encoder) {
+		return optional<float>();
+	}
+
 	return _j2k_encoder->current_encoding_rate ();
 }
 
 Frame
 DCPEncoder::frames_done () const
 {
+	if (!_j2k_encoder) {
+		return 0;
+	}
+
 	return _j2k_encoder->video_frames_enqueued ();
 }