X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsmpte_subtitle_asset.cc;h=00a9299aacf7957cff023375267dac1ba83a84da;hb=c4db5b5396c6401c63d80777a812e8adc642ce02;hp=8c0ce11115ff1612c012a345fa4a929160ae3892;hpb=93d06f01683ec7ad351db329627b02d4fb23f4fa;p=libdcp.git

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 8c0ce111..00a9299a 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "AS_DCP.h"
 #include "KM_util.h"
+#include "compose.hpp"
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -49,36 +50,46 @@ using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 SMPTESubtitleAsset::SMPTESubtitleAsset ()
-	: _edit_rate (24, 1)
+	: _intrinsic_duration (0)
+	, _edit_rate (24, 1)
 	, _time_code_rate (24)
 {
 
 }
 
-/** Construct a SMPTESubtitleAsset by reading an MXF file.
+/** Construct a SMPTESubtitleAsset by reading an MXF or XML file.
  *  @param file Filename.
  */
 SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 	: SubtitleAsset (file)
 {
-	ASDCP::TimedText::MXFReader reader;
-	Kumu::Result_t r = reader.OpenRead (file.string().c_str ());
-	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (MXFFileError ("could not open MXF file for reading", file, r));
-	}
-
-	/* Read the subtitle XML */
-
-	string s;
-	reader.ReadTimedTextResource (s, 0, 0);
-	stringstream t;
-	t << s;
 	shared_ptr<cxml::Document> xml (new cxml::Document ("SubtitleReel"));
-	xml->read_stream (t);
 
-	ASDCP::WriterInfo info;
-	reader.FillWriterInfo (info);
-	_id = read_writer_info (info);
+	shared_ptr<ASDCP::TimedText::MXFReader> reader (new ASDCP::TimedText::MXFReader ());
+	Kumu::Result_t r = reader->OpenRead (file.string().c_str ());
+
+	if (!ASDCP_FAILURE (r)) {
+		string s;
+		reader->ReadTimedTextResource (s, 0, 0);
+		stringstream t;
+		t << s;
+		xml->read_stream (t);
+		ASDCP::WriterInfo info;
+		reader->FillWriterInfo (info);
+		_id = read_writer_info (info);
+	} else {
+		reader.reset ();
+		try {
+			xml->read_file (file);
+			_id = xml->string_child ("Id").substr (9);
+		} catch (cxml::Error& e) {
+			boost::throw_exception (
+				DCPReadError (
+					String::compose ("could not read subtitles from %1; MXF failed with %2, XML failed with %3", file, static_cast<int> (r), e.what ())
+					)
+				);
+		}
+	}
 
 	_load_font_nodes = type_children<dcp::SMPTELoadFontNode> (xml, "LoadFont");
 
@@ -107,49 +118,57 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 
 	shared_ptr<cxml::Node> subtitle_list = xml->optional_node_child ("SubtitleList");
 
-	list<cxml::NodePtr> f = subtitle_list->node_children ("Font");
 	list<shared_ptr<dcp::FontNode> > font_nodes;
-	BOOST_FOREACH (cxml::NodePtr& i, f) {
-		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate)));
+	BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Font")) {
+		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate, "ID")));
 	}
 
-	parse_subtitles (xml, font_nodes);
+	list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes;
+	BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Subtitle")) {
+		subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, _time_code_rate, "ID")));
+	}
 
-	/* Read fonts */
+	parse_subtitles (xml, font_nodes, subtitle_nodes);
 
-	ASDCP::TimedText::TimedTextDescriptor text_descriptor;
-	reader.FillTimedTextDescriptor (text_descriptor);
-	for (
-		ASDCP::TimedText::ResourceList_t::const_iterator i = text_descriptor.ResourceList.begin();
-		i != text_descriptor.ResourceList.end();
-		++i) {
+	if (reader) {
+		ASDCP::TimedText::TimedTextDescriptor descriptor;
+		reader->FillTimedTextDescriptor (descriptor);
 
-		if (i->Type == ASDCP::TimedText::MT_OPENTYPE) {
-			ASDCP::TimedText::FrameBuffer buffer;
-			buffer.Capacity (10 * 1024 * 1024);
-			reader.ReadAncillaryResource (i->ResourceID, buffer);
+		/* Load fonts */
 
-			char id[64];
-			Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id));
+		for (
+			ASDCP::TimedText::ResourceList_t::const_iterator i = descriptor.ResourceList.begin();
+			i != descriptor.ResourceList.end();
+			++i) {
 
-			shared_array<uint8_t> data (new uint8_t[buffer.Size()]);
-			memcpy (data.get(), buffer.RoData(), buffer.Size());
+			if (i->Type == ASDCP::TimedText::MT_OPENTYPE) {
+				ASDCP::TimedText::FrameBuffer buffer;
+				buffer.Capacity (10 * 1024 * 1024);
+				reader->ReadAncillaryResource (i->ResourceID, buffer);
 
-			/* The IDs in the MXF have a 9 character prefix of unknown origin and meaning... */
-			string check_id = string (id).substr (9);
+				char id[64];
+				Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id));
 
-			list<shared_ptr<SMPTELoadFontNode> >::const_iterator j = _load_font_nodes.begin ();
-			while (j != _load_font_nodes.end() && (*j)->urn != check_id) {
-				++j;
-			}
+				shared_array<uint8_t> data (new uint8_t[buffer.Size()]);
+				memcpy (data.get(), buffer.RoData(), buffer.Size());
+
+				list<shared_ptr<SMPTELoadFontNode> >::const_iterator j = _load_font_nodes.begin ();
+				while (j != _load_font_nodes.end() && (*j)->urn != id) {
+					++j;
+				}
 
-			if (j != _load_font_nodes.end ()) {
-				_fonts.push_back (Font ((*j)->id, (*j)->urn, Data (data, buffer.Size ())));
+				if (j != _load_font_nodes.end ()) {
+					_fonts.push_back (Font ((*j)->id, (*j)->urn, Data (data, buffer.Size ())));
+				}
 			}
 		}
-	}
-
 
+		/* Get intrinsic duration */
+		_intrinsic_duration = descriptor.ContainerDuration;
+	} else {
+		/* Guess intrinsic duration */
+		_intrinsic_duration = latest_subtitle_out().as_editable_units (_edit_rate.numerator / _edit_rate.denominator);
+	}
 }
 
 list<shared_ptr<LoadFontNode> >
@@ -168,7 +187,7 @@ SMPTESubtitleAsset::valid_mxf (boost::filesystem::path file)
 	return !ASDCP_FAILURE (r);
 }
 
-Glib::ustring
+string
 SMPTESubtitleAsset::xml_as_string () const
 {
 	xmlpp::Document doc;
@@ -176,7 +195,7 @@ SMPTESubtitleAsset::xml_as_string () const
 	root->set_namespace_declaration ("http://www.smpte-ra.org/schemas/428-7/2010/DCST", "dcst");
 	root->set_namespace_declaration ("http://www.w3.org/2001/XMLSchema", "xs");
 
-	root->add_child("ID", "dcst")->add_child_text (_id);
+	root->add_child("Id", "dcst")->add_child_text ("urn:uuid:" + _id);
 	root->add_child("ContentTitleText", "dcst")->add_child_text (_content_title_text);
 	if (_annotation_text) {
 		root->add_child("AnnotationText", "dcst")->add_child_text (_annotation_text.get ());
@@ -191,16 +210,16 @@ SMPTESubtitleAsset::xml_as_string () const
 	root->add_child("EditRate", "dcst")->add_child_text (_edit_rate.as_string ());
 	root->add_child("TimeCodeRate", "dcst")->add_child_text (raw_convert<string> (_time_code_rate));
 	if (_start_time) {
-		root->add_child("StartTime", "dcst")->add_child_text (_start_time.get().as_string ());
+		root->add_child("StartTime", "dcst")->add_child_text (_start_time.get().as_string (SMPTE));
 	}
 
 	BOOST_FOREACH (shared_ptr<SMPTELoadFontNode> i, _load_font_nodes) {
 		xmlpp::Element* load_font = root->add_child("LoadFont", "dcst");
-		load_font->add_child_text (i->urn);
+		load_font->add_child_text ("urn:uuid:" + i->urn);
 		load_font->set_attribute ("ID", i->id);
 	}
 
-	subtitles_as_xml (root->add_child ("SubtitleList", "dcst"), _time_code_rate, "dcst");
+	subtitles_as_xml (root->add_child ("SubtitleList", "dcst"), _time_code_rate, SMPTE);
 
 	return doc.write_to_string_formatted ("UTF-8");
 }
@@ -233,7 +252,7 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 
 	descriptor.NamespaceName = "dcst";
 	memcpy (descriptor.AssetID, writer_info.AssetUUID, ASDCP::UUIDlen);
-	descriptor.ContainerDuration = latest_subtitle_out().as_editable_units (_edit_rate.numerator / _edit_rate.denominator);
+	descriptor.ContainerDuration = _intrinsic_duration;
 
 	ASDCP::TimedText::MXFWriter writer;
 	ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor);
@@ -254,8 +273,8 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 		}
 		if (j != _fonts.end ()) {
 			ASDCP::TimedText::FrameBuffer buffer;
-			buffer.SetData (j->data.data.get(), j->data.size);
-			buffer.Size (j->data.size);
+			buffer.SetData (j->data.data().get(), j->data.size());
+			buffer.Size (j->data.size());
 			r = writer.WriteAncillaryResource (buffer);
 			if (ASDCP_FAILURE (r)) {
 				boost::throw_exception (MXFFileError ("could not write font to timed text resource", p.string(), r));
@@ -353,3 +372,10 @@ SMPTESubtitleAsset::add_font (string load_id, boost::filesystem::path file)
 	_fonts.push_back (Font (load_id, uuid, file));
 	_load_font_nodes.push_back (shared_ptr<SMPTELoadFontNode> (new SMPTELoadFontNode (load_id, uuid)));
 }
+
+void
+SMPTESubtitleAsset::add (dcp::SubtitleString s)
+{
+	SubtitleAsset::add (s);
+	_intrinsic_duration = latest_subtitle_out().as_editable_units (_edit_rate.numerator / _edit_rate.denominator);
+}