X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=541c23b6cb4576c86009014014b5b1539df59bfe;hb=27b83475435dda4e84a90cf59a52f150905c4ab1;hp=a3708040596c3c3aa9173f5e7e317fc03b094560;hpb=666d0b238f32c0383068d3d8f3936f46c4e67a14;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index a37080405..541c23b6c 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -35,7 +35,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
-#include "subtitle_content.h"
+#include "caption_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
@@ -56,13 +56,15 @@ 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()) {
+	_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));
+
+	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
+		if (c->caption && c->caption->use() && !c->caption->burn()) {
 			_non_burnt_subtitles = true;
 		}
 	}
@@ -73,13 +75,16 @@ DCPEncoder::~DCPEncoder ()
 	/* We must stop receiving more video data before we die */
 	_player_video_connection.release ();
 	_player_audio_connection.release ();
-	_player_subtitle_connection.release ();
+	_player_caption_connection.release ();
 }
 
 void
 DCPEncoder::go ()
 {
+	_writer.reset (new Writer (_film, _job));
 	_writer->start ();
+
+	_j2k_encoder.reset (new J2KEncoder (_film, _writer));
 	_j2k_encoder->begin ();
 
 	{
@@ -89,7 +94,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 ()) {}
@@ -117,7 +133,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);
@@ -125,21 +141,29 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::caption (PlayerCaption data, CaptionType type, DCPTimePeriod period)
 {
-	if (_non_burnt_subtitles) {
-		_writer->write (data, period);
+	if (type == CAPTION_CLOSED || _non_burnt_subtitles) {
+		_writer->write (data, type, period);
 	}
 }
 
 float
 DCPEncoder::current_rate () const
 {
+	if (!_j2k_encoder) {
+		return 0;
+	}
+
 	return _j2k_encoder->current_encoding_rate ();
 }
 
 Frame
 DCPEncoder::frames_done () const
 {
+	if (!_j2k_encoder) {
+		return 0;
+	}
+
 	return _j2k_encoder->video_frames_enqueued ();
 }