X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=9a840c8ab916b6a594f4e6881f223ad20346f4f5;hb=HEAD;hp=c530492cf2275e98aae571f7908ae57e91516d52;hpb=ddcd4f3ba0af3e9d49dbb68127317cd0d871a248;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index c530492cf..a4bc133f8 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -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"
@@ -47,31 +46,35 @@ using std::string;
 using std::cout;
 using std::list;
 using std::vector;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+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.
  *  @param job Job that this encoder is being used in.
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: Encoder (film, job)
+	, _writer(film, job)
+	, _j2k_encoder(film, _writer)
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
-	_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));
+	_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;
 			}
@@ -91,75 +94,54 @@ DCPEncoder::~DCPEncoder ()
 void
 DCPEncoder::go ()
 {
-	_writer.reset (new Writer (_film, _job));
-	_writer->start ();
-
-	_j2k_encoder.reset (new J2KEncoder (_film, _writer));
-	_j2k_encoder->begin ();
+	_writer.start();
+	_j2k_encoder.begin();
 
 	{
-		shared_ptr<Job> job = _job.lock ();
+		auto job = _job.lock ();
 		DCPOMATIC_ASSERT (job);
 		job->sub (_("Encoding"));
 	}
 
 	if (_non_burnt_subtitles) {
-		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.
-			*/
-			FontData first = fonts.front ();
-			fonts.clear ();
-			fonts.push_back (first);
-		}
-
-		_writer->write (fonts);
+		_writer.write(_player.get_subtitle_fonts());
 	}
 
-	while (!_player->pass ()) {}
+	int passes = 0;
+	while (!_player.pass()) {
+		if ((++passes % 8) == 0) {
+			auto job = _job.lock();
+			DCPOMATIC_ASSERT(job);
+			job->set_progress(_player.progress());
+		}
+	}
 
-	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
-		_writer->write (i);
+	for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
+		_writer.write(i);
 	}
 
 	_finishing = true;
-	_j2k_encoder->end ();
-	_writer->finish (_film->dir(_film->dcp_name()));
+	_j2k_encoder.end();
+	_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);
+	_j2k_encoder.encode(data, time);
 }
 
 void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	_writer->write (data, time);
-
-	shared_ptr<Job> job = _job.lock ();
-	DCPOMATIC_ASSERT (job);
-	job->set_progress (float(time.get()) / _film->length().get());
+	_writer.write(data, time);
 }
 
 void
 DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
-		_writer->write (data, type, track, period);
+	if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer.write(data, type, track, period);
 	}
 }
 
@@ -167,26 +149,18 @@ DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track,
 void
 DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
 {
-	_writer->write (data, time, metadata);
+	_writer.write(data, time, metadata);
 }
 
 
 optional<float>
 DCPEncoder::current_rate () const
 {
-	if (!_j2k_encoder) {
-		return optional<float>();
-	}
-
-	return _j2k_encoder->current_encoding_rate ();
+	return _j2k_encoder.current_encoding_rate();
 }
 
 Frame
 DCPEncoder::frames_done () const
 {
-	if (!_j2k_encoder) {
-		return 0;
-	}
-
-	return _j2k_encoder->video_frames_enqueued ();
+	return _player.frames_done();
 }