X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=350120d9d1ceebe61576204b615224e8a59d8316;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=d23ac76d1059482b48124be30b7e53f7fb566ca6;hpb=0e4a58abdc78f84478031acdc0acb95f5cb9a2a6;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index d23ac76d1..350120d9d 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,7 @@
 #include "cross.h"
 #include "job.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "digester.h"
 #include "font.h"
 #include "compose.hpp"
@@ -37,6 +38,7 @@
 #include <dcp/reel_stereo_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -48,14 +50,10 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING);
-#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-
 using std::list;
 using std::string;
 using std::cout;
+using std::map;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -85,7 +83,7 @@ ReelWriter::ReelWriter (
 	if (_film->three_d ()) {
 		_picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
 	} else {
-		_picture_asset.reset (new   dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
+		_picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
 	}
 
 	_picture_asset->set_size (_film->frame_size ());
@@ -332,6 +330,95 @@ ReelWriter::finish ()
 	}
 }
 
+template <class T>
+shared_ptr<T>
+maybe_add_text (
+	shared_ptr<dcp::SubtitleAsset> asset,
+	int64_t picture_duration,
+	shared_ptr<dcp::Reel> reel,
+	list<ReferencedReelAsset> const & refs,
+	list<shared_ptr<Font> > const & fonts,
+	shared_ptr<const Film> film,
+	DCPTimePeriod period
+	)
+{
+	Frame const period_duration = period.duration().frames_round(film->video_frame_rate());
+
+	shared_ptr<T> reel_asset;
+
+	if (asset) {
+		boost::filesystem::path liberation_normal;
+		try {
+			liberation_normal = shared_path() / "LiberationSans-Regular.ttf";
+			if (!boost::filesystem::exists (liberation_normal)) {
+				/* Hack for unit tests */
+				liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf";
+			}
+		} catch (boost::filesystem::filesystem_error& e) {
+
+		}
+
+		if (!boost::filesystem::exists(liberation_normal)) {
+			liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
+		}
+
+		/* Add all the fonts to the subtitle content */
+		BOOST_FOREACH (shared_ptr<Font> j, fonts) {
+			asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal));
+		}
+
+		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
+			boost::filesystem::path directory = film->dir (film->dcp_name ()) / asset->id ();
+			boost::filesystem::create_directories (directory);
+			asset->write (directory / ("sub_" + asset->id() + ".xml"));
+		} else {
+			/* All our assets should be the same length; use the picture asset length here
+			   as a reference to set the subtitle one.  We'll use the duration rather than
+			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+			   just interested in its presentation length.
+			*/
+			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(asset)->set_intrinsic_duration (picture_duration);
+
+			asset->write (
+				film->dir(film->dcp_name()) / ("sub_" + asset->id() + ".mxf")
+				);
+		}
+
+		reel_asset.reset (
+			new T (
+				asset,
+				dcp::Fraction (film->video_frame_rate(), 1),
+				picture_duration,
+				0
+				)
+			);
+	} else {
+		/* We don't have a subtitle asset of our own; hopefully we have one to reference */
+		BOOST_FOREACH (ReferencedReelAsset j, refs) {
+			shared_ptr<T> k = dynamic_pointer_cast<T> (j.asset);
+			if (k && j.period == period) {
+				reel_asset = k;
+				/* If we have a hash for this asset in the CPL, assume that it is correct */
+				if (k->hash()) {
+					k->asset_ref()->set_hash (k->hash().get());
+				}
+			}
+		}
+	}
+
+	if (reel_asset) {
+		if (reel_asset->duration() != period_duration) {
+			throw ProgrammingError (
+				__FILE__, __LINE__,
+				String::compose ("%1 vs %2", reel_asset->duration(), period_duration)
+				);
+		}
+		reel->add (reel_asset);
+	}
+
+	return reel_asset;
+}
+
 shared_ptr<dcp::Reel>
 ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr<Font> > const & fonts)
 {
@@ -418,80 +505,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 	}
 	reel->add (reel_sound_asset);
 
-	shared_ptr<dcp::ReelSubtitleAsset> reel_subtitle_asset;
-
-	if (_subtitle_asset) {
-
-		boost::filesystem::path liberation_normal;
-		try {
-			liberation_normal = shared_path() / "LiberationSans-Regular.ttf";
-			if (!boost::filesystem::exists (liberation_normal)) {
-				/* Hack for unit tests */
-				liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf";
-			}
-		} catch (boost::filesystem::filesystem_error& e) {
-
-		}
-
-		if (!boost::filesystem::exists(liberation_normal)) {
-			liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
-		}
-
-		/* Add all the fonts to the subtitle content */
-		BOOST_FOREACH (shared_ptr<Font> j, fonts) {
-			_subtitle_asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal));
-		}
-
-		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (_subtitle_asset)) {
-			boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id ();
-			boost::filesystem::create_directories (directory);
-			_subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml"));
-		} else {
-
-			/* All our assets should be the same length; use the picture asset length here
-			   as a reference to set the subtitle one.  We'll use the duration rather than
-			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
-			   just interested in its presentation length.
-			*/
-			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
-				reel_picture_asset->duration ()
-				);
-
-			_subtitle_asset->write (
-				_film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf")
-				);
-		}
-
-		reel_subtitle_asset.reset (
-			new dcp::ReelSubtitleAsset (
-				_subtitle_asset,
-				dcp::Fraction (_film->video_frame_rate(), 1),
-				reel_picture_asset->duration(),
-				0
-				)
+	maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+	for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
+		shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+			i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period
 			);
-	} else {
-		/* We don't have a subtitle asset of our own; hopefully we have one to reference */
-		BOOST_FOREACH (ReferencedReelAsset j, refs) {
-			shared_ptr<dcp::ReelSubtitleAsset> k = dynamic_pointer_cast<dcp::ReelSubtitleAsset> (j.asset);
-			if (k && j.period == _period) {
-				reel_subtitle_asset = k;
-				/* If we have a hash for this asset in the CPL, assume that it is correct */
-				if (k->hash()) {
-					k->asset_ref()->set_hash (k->hash().get());
-				}
-			}
-		}
-	}
-
-	if (reel_subtitle_asset) {
-		if (reel_subtitle_asset->duration() != period_duration) {
-			throw ProgrammingError (
-				__FILE__, __LINE__,
-				String::compose ("%1 vs %2", reel_subtitle_asset->duration(), period_duration)
-				);
-		}
-		reel->add (reel_subtitle_asset);
+		a->set_annotation_text (i->first.name);
+		a->set_language (i->first.language);
 	}
 
 	return reel;
@@ -528,9 +548,23 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio)
 }
 
 void
-ReelWriter::write (PlayerText subs, DCPTimePeriod period)
+ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (!_subtitle_asset) {
+	shared_ptr<dcp::SubtitleAsset> asset;
+
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		asset = _subtitle_asset;
+		break;
+	case TEXT_CLOSED_CAPTION:
+		DCPOMATIC_ASSERT (track);
+		asset = _closed_caption_assets[*track];
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	if (!asset) {
 		string lang = _film->subtitle_language ();
 		if (lang.empty ()) {
 			lang = "Unknown";
@@ -540,7 +574,7 @@ ReelWriter::write (PlayerText subs, DCPTimePeriod period)
 			s->set_movie_title (_film->name ());
 			s->set_language (lang);
 			s->set_reel_number (raw_convert<string> (_reel_index + 1));
-			_subtitle_asset = s;
+			asset = s;
 		} else {
 			shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
 			s->set_content_title_text (_film->name ());
@@ -552,19 +586,31 @@ ReelWriter::write (PlayerText subs, DCPTimePeriod period)
 			if (_film->encrypted ()) {
 				s->set_key (_film->key ());
 			}
-			_subtitle_asset = s;
+			asset = s;
 		}
 	}
 
-	BOOST_FOREACH (PlainText i, subs.text) {
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		_subtitle_asset = asset;
+		break;
+	case TEXT_CLOSED_CAPTION:
+		DCPOMATIC_ASSERT (track);
+		_closed_caption_assets[*track] = asset;
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	BOOST_FOREACH (StringText i, subs.string) {
 		/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
 		i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
 		i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
-		_subtitle_asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+		asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
 	}
 
-	BOOST_FOREACH (BitmapText i, subs.image) {
-		_subtitle_asset->add (
+	BOOST_FOREACH (BitmapText i, subs.bitmap) {
+		asset->add (
 			shared_ptr<dcp::Subtitle>(
 				new dcp::SubtitleImage(
 					i.image->as_png(),