X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=dfd8ed8d741bda0e75e75f777bf2002628c66ad0;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=42984887daa029dc48e6f06c766d6809ddcc8c95;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 42984887d..dfd8ed8d7 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -46,9 +46,15 @@
 using std::string;
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.
@@ -61,10 +67,11 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 {
 	_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_caption_connection = _player->Caption.connect (bind (&DCPEncoder::caption, this, _1, _2, _3));
+	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
+	_player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
 
 	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-		BOOST_FOREACH (shared_ptr<TextContent> i, c->caption) {
+		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
 			if (i->use() && !i->burn()) {
 				_non_burnt_subtitles = true;
 			}
@@ -77,7 +84,8 @@ DCPEncoder::~DCPEncoder ()
 	/* We must stop receiving more video data before we die */
 	_player_video_connection.release ();
 	_player_audio_connection.release ();
-	_player_caption_connection.release ();
+	_player_text_connection.release ();
+	_player_atmos_connection.release ();
 }
 
 void
@@ -96,13 +104,13 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		list<shared_ptr<Font> > fonts = _player->get_subtitle_fonts ();
+		vector<FontData> 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 ();
+			FontData first = fonts.front ();
 			fonts.clear ();
 			fonts.push_back (first);
 		}
@@ -118,15 +126,20 @@ DCPEncoder::go ()
 
 	_finishing = true;
 	_j2k_encoder->end ();
-	_writer->finish ();
+	_writer->finish (_film->dir(_film->dcp_name()));
 }
 
 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);
@@ -143,18 +156,26 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::caption (PlayerText data, TextType type, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (type == CAPTION_CLOSED || _non_burnt_subtitles) {
-		_writer->write (data, type, period);
+	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer->write (data, type, track, period);
 	}
 }
 
-float
+
+void
+DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
+{
+	_writer->write (data, time, metadata);
+}
+
+
+optional<float>
 DCPEncoder::current_rate () const
 {
 	if (!_j2k_encoder) {
-		return 0;
+		return optional<float>();
 	}
 
 	return _j2k_encoder->current_encoding_rate ();