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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index d17c6c985..f1c412539 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 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,10 +45,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 std::make_shared;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 /** Construct a DCP encoder.
@@ -64,9 +68,10 @@ 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, _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->text) {
+	for (auto c: film->content ()) {
+		for (auto i: c->text) {
 			if (i->use() && !i->burn()) {
 				_non_burnt_subtitles = true;
 			}
@@ -80,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);
 		}
@@ -114,28 +120,18 @@ 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()) {
-		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);
 }
 
@@ -144,7 +140,7 @@ 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());
 }
@@ -152,16 +148,24 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 void
 DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+	if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
 		_writer->write (data, type, track, period);
 	}
 }
 
+
+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 optional<float>();
+		return {};
 	}
 
 	return _j2k_encoder->current_encoding_rate ();