X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=79e5c8c3695dccf9e23d3726889a267004509725;hb=14b8b29e6660f5a7fb21135fb5f90b4c1ce51a4b;hp=cd5b6d7e06d36da2fa7b5e1a41f311dcd10f7913;hpb=576b7e8eee6c17a5a7f0f4c3bfb1787768f4f276;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index cd5b6d7e0..79e5c8c36 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,7 @@
 #include "film.h"
 #include "ratio.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "dcp_video.h"
 #include "dcp_content_type.h"
 #include "audio_mapping.h"
@@ -34,6 +35,7 @@
 #include "font.h"
 #include "util.h"
 #include "reel_writer.h"
+#include "text_content.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
@@ -44,14 +46,6 @@
 
 #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_DEBUG_ENCODE(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE);
-#define LOG_TIMING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING);
-#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING);
-#define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING);
-#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-
 /* OS X strikes again */
 #undef set_key
 
@@ -63,9 +57,11 @@ using std::cout;
 using std::map;
 using std::min;
 using std::max;
+using std::vector;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 using dcp::Data;
 
 Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
@@ -91,11 +87,14 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 		_reels.push_back (ReelWriter (film, p, job, reel_index++, reels.size(), _film->content_summary(p)));
 	}
 
-	/* We can keep track of the current audio and subtitle reels easily because audio
-	   and subs arrive to the Writer in sequence.  This is not so for video.
+	/* We can keep track of the current audio, subtitle and closed caption reels easily because audio
+	   and captions arrive to the Writer in sequence.  This is not so for video.
 	*/
 	_audio_reel = _reels.begin ();
 	_subtitle_reel = _reels.begin ();
+	BOOST_FOREACH (DCPTextTrack i, _film->closed_caption_tracks()) {
+		_caption_reels[i] = _reels.begin ();
+	}
 
 	/* Check that the signer is OK if we need one */
 	string reason;
@@ -433,7 +432,7 @@ try
 			DCPOMATIC_ASSERT (i != _queue.rend());
 			++_pushed_to_disk;
 			/* For the log message below */
-			int const awaiting = _reels[_queue.front().reel].last_written_video_frame();
+			int const awaiting = _reels[_queue.front().reel].last_written_video_frame() + 1;
 			lock.unlock ();
 
 			/* i is valid here, even though we don't hold a lock on the mutex,
@@ -559,6 +558,7 @@ Writer::finish ()
 	meta.set_issue_date_now ();
 
 	cpl->set_metadata (meta);
+	cpl->set_ratings (vector_to_list(_film->ratings()));
 
 	shared_ptr<const dcp::CertificateChain> signer;
 	if (_film->is_signed ()) {
@@ -593,7 +593,16 @@ Writer::write_cover_sheet ()
 	boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name());
 	boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->container_nickname());
 	boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language);
-	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language);
+
+	optional<string> subtitle_language;
+	BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+		BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+			if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
+				subtitle_language = j->language ();
+			}
+		}
+	}
+	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_language.get_value_or("None"));
 
 	boost::uintmax_t size = 0;
 	for (
@@ -636,7 +645,7 @@ Writer::write_cover_sheet ()
 
 	boost::algorithm::replace_all (text, "$LENGTH", length);
 
-	fwrite (text.c_str(), 1, text.length(), f);
+	checked_fwrite (text.c_str(), text.length(), f, cover);
 	fclose (f);
 }
 
@@ -662,21 +671,32 @@ Writer::can_fake_write (Frame frame) const
 	return (frame != 0 && frame < reel.first_nonexistant_frame());
 }
 
+/** @param track Closed caption track if type == TEXT_CLOSED_CAPTION */
 void
-Writer::write (PlayerSubtitles subs, DCPTimePeriod period)
+Writer::write (PlayerText text, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (subs.text.empty ()) {
-		return;
-	}
+	vector<ReelWriter>::iterator* reel = 0;
 
-	while (_subtitle_reel->period().to <= period.from) {
-		++_subtitle_reel;
-		DCPOMATIC_ASSERT (_subtitle_reel != _reels.end());
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		reel = &_subtitle_reel;
+		break;
+	case TEXT_CLOSED_CAPTION:
+		DCPOMATIC_ASSERT (track);
+		DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end());
+		reel = &_caption_reels[*track];
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
 	}
 
-	DCPOMATIC_ASSERT (_subtitle_reel != _reels.end());
+	DCPOMATIC_ASSERT (*reel != _reels.end());
+	while ((*reel)->period().to <= period.from) {
+		++(*reel);
+		DCPOMATIC_ASSERT (*reel != _reels.end());
+	}
 
-	_subtitle_reel->write (subs);
+	(*reel)->write (text, type, track, period);
 }
 
 void