X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=4b4785cc6e362021cab8c4ba6c8cada370810c23;hp=9766aad337e0cea449bc7ba7c262bf7f82ae7ca4;hb=9b946fc5250eff5a5dd4a661896916fcd5d9bd4b;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 9766aad33..4b4785cc6 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.
 
@@ -38,7 +38,6 @@
 #include "text_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -46,9 +45,16 @@
 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 std::make_shared;
+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,11 +67,14 @@ 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_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3));
-
-	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
-			_non_burnt_subtitles = true;
+	_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));
+
+	for (auto c: film->content ()) {
+		for (auto i: c->text) {
+			if (i->use() && !i->burn()) {
+				_non_burnt_subtitles = true;
+			}
 		}
 	}
 }
@@ -76,31 +85,32 @@ DCPEncoder::~DCPEncoder ()
 	_player_video_connection.release ();
 	_player_audio_connection.release ();
 	_player_text_connection.release ();
+	_player_atmos_connection.release ();
 }
 
 void
 DCPEncoder::go ()
 {
-	_writer.reset (new Writer (_film, _job));
+	_writer = make_shared<Writer>(_film, _job);
 	_writer->start ();
 
-	_j2k_encoder.reset (new J2KEncoder (_film, _writer));
+	_j2k_encoder = make_shared<J2KEncoder>(_film, _writer);
 	_j2k_encoder->begin ();
 
 	{
-		shared_ptr<Job> job = _job.lock ();
+		auto job = _job.lock ();
 		DCPOMATIC_ASSERT (job);
 		job->sub (_("Encoding"));
 	}
 
 	if (_non_burnt_subtitles) {
-		list<shared_ptr<Font> > fonts = _player->get_subtitle_fonts ();
+		auto 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 ();
+			auto first = fonts.front();
 			fonts.clear ();
 			fonts.push_back (first);
 		}
@@ -110,21 +120,26 @@ DCPEncoder::go ()
 
 	while (!_player->pass ()) {}
 
-	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+	for (auto i: _player->get_reel_assets()) {
 		_writer->write (i);
 	}
 
 	_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);
@@ -135,24 +150,32 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
 	_writer->write (data, time);
 
-	shared_ptr<Job> job = _job.lock ();
+	auto job = _job.lock ();
 	DCPOMATIC_ASSERT (job);
 	job->set_progress (float(time.get()) / _film->length().get());
 }
 
 void
-DCPEncoder::text (PlayerCaption data, TextType type, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
 	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
-		_writer->write (data, type, period);
+		_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 {};
 	}
 
 	return _j2k_encoder->current_encoding_rate ();