X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsmpte_subtitle_asset.cc;h=6a62bc1dee3109e1a9d6f8040d14628c1234bd49;hb=56286bed00c2a6ad372b6c9d4902c74fd086f384;hp=128729d87bd988798a267d9a675be6b2ca177d0b;hpb=04a3cc53496a6a23c9b29351f6954597932d7701;p=libdcp.git diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 128729d8..6a62bc1d 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of libdcp. @@ -43,10 +43,11 @@ #include "dcp_assert.h" #include "util.h" #include "compose.hpp" -#include "encryption_context.h" -#include "decryption_context.h" +#include "crypto_context.h" +#include "subtitle_image.h" #include #include +#include #include #include #include @@ -60,12 +61,18 @@ using boost::split; using boost::is_any_of; using boost::shared_array; using boost::dynamic_pointer_cast; +using boost::optional; +using boost::starts_with; using namespace dcp; +static string const subtitle_smpte_ns = "http://www.smpte-ra.org/schemas/428-7/2010/DCST"; + SMPTESubtitleAsset::SMPTESubtitleAsset () - : _intrinsic_duration (0) + : MXF (SMPTE) + , _intrinsic_duration (0) , _edit_rate (24, 1) , _time_code_rate (24) + , _xml_id (make_uuid ()) { } @@ -87,32 +94,63 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) _id = read_writer_info (info); if (!_key_id) { /* Not encrypted; read it in now */ - string s; - reader->ReadTimedTextResource (s); - xml->read_string (s); + reader->ReadTimedTextResource (_raw_xml); + xml->read_string (_raw_xml); parse_xml (xml); - read_mxf_descriptor (reader, shared_ptr (new DecryptionContext ())); + read_mxf_descriptor (reader, shared_ptr (new DecryptionContext (optional(), SMPTE))); } } else { /* Plain XML */ try { + _raw_xml = dcp::file_to_string (file); xml.reset (new cxml::Document ("SubtitleReel")); xml->read_file (file); parse_xml (xml); - _id = remove_urn_uuid (xml->string_child ("Id")); + _id = _xml_id = remove_urn_uuid (xml->string_child ("Id")); } catch (cxml::Error& e) { boost::throw_exception ( - DCPReadError ( - String::compose ("MXF failed with %1, XML failed with %2", file, static_cast (r), e.what ()) + ReadError ( + String::compose ( + "Failed to read subtitle file %1; MXF failed with %2, XML failed with %3", + file, static_cast (r), e.what () + ) ) ); } + + /* Try to read PNG files from the same folder that the XML is in; the wisdom of this is + debatable, at best... + */ + BOOST_FOREACH (shared_ptr i, _subtitles) { + shared_ptr im = dynamic_pointer_cast(i); + if (im && im->png_image().size() == 0) { + /* Even more dubious; allow .png or urn:uuid:.png */ + boost::filesystem::path p = file.parent_path() / String::compose("%1.png", im->id()); + if (boost::filesystem::is_regular_file(p)) { + im->read_png_file (p); + } else if (starts_with (im->id(), "urn:uuid:")) { + p = file.parent_path() / String::compose("%1.png", remove_urn_uuid(im->id())); + if (boost::filesystem::is_regular_file(p)) { + im->read_png_file (p); + } + } + } + } + } + + /* Check that all required image data have been found */ + BOOST_FOREACH (shared_ptr i, _subtitles) { + shared_ptr im = dynamic_pointer_cast(i); + if (im && im->png_image().size() == 0) { + throw MissingSubtitleImageError (im->id()); + } } } void SMPTESubtitleAsset::parse_xml (shared_ptr xml) { + _xml_id = remove_urn_uuid(xml->string_child("Id")); _load_font_nodes = type_children (xml, "LoadFont"); _content_title_text = xml->string_child ("ContentTitleText"); @@ -159,24 +197,26 @@ SMPTESubtitleAsset::read_mxf_descriptor (shared_ptr ASDCP::TimedText::TimedTextDescriptor descriptor; reader->FillTimedTextDescriptor (descriptor); - /* Load fonts */ + /* Load fonts and images */ for ( ASDCP::TimedText::ResourceList_t::const_iterator i = descriptor.ResourceList.begin(); i != descriptor.ResourceList.end(); ++i) { - if (i->Type == ASDCP::TimedText::MT_OPENTYPE) { - ASDCP::TimedText::FrameBuffer buffer; - buffer.Capacity (10 * 1024 * 1024); - reader->ReadAncillaryResource (i->ResourceID, buffer, dec->decryption()); + ASDCP::TimedText::FrameBuffer buffer; + buffer.Capacity (10 * 1024 * 1024); + reader->ReadAncillaryResource (i->ResourceID, buffer, dec->context(), dec->hmac()); - char id[64]; - Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id)); + char id[64]; + Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id)); - shared_array data (new uint8_t[buffer.Size()]); - memcpy (data.get(), buffer.RoData(), buffer.Size()); + shared_array data (new uint8_t[buffer.Size()]); + memcpy (data.get(), buffer.RoData(), buffer.Size()); + switch (i->Type) { + case ASDCP::TimedText::MT_OPENTYPE: + { list >::const_iterator j = _load_font_nodes.begin (); while (j != _load_font_nodes.end() && (*j)->urn != id) { ++j; @@ -185,6 +225,22 @@ SMPTESubtitleAsset::read_mxf_descriptor (shared_ptr if (j != _load_font_nodes.end ()) { _fonts.push_back (Font ((*j)->id, (*j)->urn, Data (data, buffer.Size ()))); } + break; + } + case ASDCP::TimedText::MT_PNG: + { + list >::const_iterator j = _subtitles.begin (); + while (j != _subtitles.end() && ((!dynamic_pointer_cast(*j)) || dynamic_pointer_cast(*j)->id() != id)) { + ++j; + } + + if (j != _subtitles.end()) { + dynamic_pointer_cast(*j)->set_png_image (Data(data, buffer.Size())); + } + break; + } + default: + break; } } @@ -195,11 +251,17 @@ SMPTESubtitleAsset::read_mxf_descriptor (shared_ptr void SMPTESubtitleAsset::set_key (Key key) { + /* See if we already have a key; if we do, and we have a file, we'll already + have read that file. + */ + bool const had_key = static_cast (_key); + MXF::set_key (key); - if (!_key_id || !_file) { - /* Either we don't have any data to read, or it wasn't - encrypted, so we don't need to do anything else. + if (!_key_id || !_file || had_key) { + /* Either we don't have any data to read, it wasn't + encrypted, or we've already read it, so we don't + need to do anything else. */ return; } @@ -210,17 +272,16 @@ SMPTESubtitleAsset::set_key (Key key) Kumu::Result_t r = reader->OpenRead (_file->string().c_str ()); if (ASDCP_FAILURE (r)) { boost::throw_exception ( - DCPReadError ( + ReadError ( String::compose ("Could not read encrypted subtitle MXF (%1)", static_cast (r)) ) ); } - string s; - shared_ptr dec (new DecryptionContext (key)); - reader->ReadTimedTextResource (s, dec->decryption()); + shared_ptr dec (new DecryptionContext (key, SMPTE)); + reader->ReadTimedTextResource (_raw_xml, dec->context(), dec->hmac()); shared_ptr xml (new cxml::Document ("SubtitleReel")); - xml->read_string (s); + xml->read_string (_raw_xml); parse_xml (xml); read_mxf_descriptor (reader, dec); } @@ -237,7 +298,9 @@ bool SMPTESubtitleAsset::valid_mxf (boost::filesystem::path file) { ASDCP::TimedText::MXFReader reader; + Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL); Kumu::Result_t r = reader.OpenRead (file.string().c_str ()); + Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL); return !ASDCP_FAILURE (r); } @@ -246,10 +309,10 @@ SMPTESubtitleAsset::xml_as_string () const { xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("dcst:SubtitleReel"); - root->set_namespace_declaration ("http://www.smpte-ra.org/schemas/428-7/2010/DCST", "dcst"); + root->set_namespace_declaration (subtitle_smpte_ns, "dcst"); root->set_namespace_declaration ("http://www.w3.org/2001/XMLSchema", "xs"); - root->add_child("Id", "dcst")->add_child_text ("urn:uuid:" + _id); + root->add_child("Id", "dcst")->add_child_text ("urn:uuid:" + _xml_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 ()); @@ -275,22 +338,24 @@ SMPTESubtitleAsset::xml_as_string () const subtitles_as_xml (root->add_child ("SubtitleList", "dcst"), _time_code_rate, SMPTE); - return doc.write_to_string_formatted ("UTF-8"); + return doc.write_to_string ("UTF-8"); } /** Write this content to a MXF file */ void SMPTESubtitleAsset::write (boost::filesystem::path p) const { - EncryptionContext enc (key (), SMPTE); + EncryptionContext enc (key(), SMPTE); ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info, _id, SMPTE); + fill_writer_info (&writer_info, _id); ASDCP::TimedText::TimedTextDescriptor descriptor; descriptor.EditRate = ASDCP::Rational (_edit_rate.numerator, _edit_rate.denominator); descriptor.EncodingName = "UTF-8"; + /* Font references */ + BOOST_FOREACH (shared_ptr i, _load_font_nodes) { list::const_iterator j = _fonts.begin (); while (j != _fonts.end() && j->load_id != i->id) { @@ -306,22 +371,42 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const } } - descriptor.NamespaceName = "dcst"; - memcpy (descriptor.AssetID, writer_info.AssetUUID, ASDCP::UUIDlen); + /* Image subtitle references */ + + BOOST_FOREACH (shared_ptr i, _subtitles) { + shared_ptr si = dynamic_pointer_cast(i); + if (si) { + ASDCP::TimedText::TimedTextResourceDescriptor res; + unsigned int c; + Kumu::hex2bin (si->id().c_str(), res.ResourceID, Kumu::UUID_Length, &c); + DCP_ASSERT (c == Kumu::UUID_Length); + res.Type = ASDCP::TimedText::MT_PNG; + descriptor.ResourceList.push_back (res); + } + } + + descriptor.NamespaceName = subtitle_smpte_ns; + unsigned int c; + Kumu::hex2bin (_xml_id.c_str(), descriptor.AssetID, ASDCP::UUIDlen, &c); + DCP_ASSERT (c == Kumu::UUID_Length); descriptor.ContainerDuration = _intrinsic_duration; ASDCP::TimedText::MXFWriter writer; - ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor); + /* This header size is a guess. Empirically it seems that each subtitle reference is 90 bytes, and we need some extra. + The default size is not enough for some feature-length PNG sub projects (see DCP-o-matic #1561). + */ + ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor, _subtitles.size() * 90 + 16384); if (ASDCP_FAILURE (r)) { boost::throw_exception (FileError ("could not open subtitle MXF for writing", p.string(), r)); } - /* XXX: no encryption */ - r = writer.WriteTimedTextResource (xml_as_string (), enc.encryption(), enc.hmac()); + r = writer.WriteTimedTextResource (xml_as_string (), enc.context(), enc.hmac()); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError ("could not write XML to timed text resource", p.string(), r)); } + /* Font payload */ + BOOST_FOREACH (shared_ptr i, _load_font_nodes) { list::const_iterator j = _fonts.begin (); while (j != _fonts.end() && j->load_id != i->id) { @@ -331,13 +416,28 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const ASDCP::TimedText::FrameBuffer buffer; buffer.SetData (j->data.data().get(), j->data.size()); buffer.Size (j->data.size()); - r = writer.WriteAncillaryResource (buffer, enc.encryption(), enc.hmac()); + r = writer.WriteAncillaryResource (buffer, enc.context(), enc.hmac()); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError ("could not write font to timed text resource", p.string(), r)); } } } + /* Image subtitle payload */ + + BOOST_FOREACH (shared_ptr i, _subtitles) { + shared_ptr si = dynamic_pointer_cast(i); + if (si) { + ASDCP::TimedText::FrameBuffer buffer; + buffer.SetData (si->png_image().data().get(), si->png_image().size()); + buffer.Size (si->png_image().size()); + r = writer.WriteAncillaryResource (buffer, enc.context(), enc.hmac()); + if (ASDCP_FAILURE(r)) { + boost::throw_exception (MXFFileError ("could not write PNG data to timed text resource", p.string(), r)); + } + } + } + writer.Finalize (); _file = p; @@ -430,7 +530,7 @@ SMPTESubtitleAsset::add_font (string load_id, boost::filesystem::path file) } void -SMPTESubtitleAsset::add (dcp::SubtitleString s) +SMPTESubtitleAsset::add (shared_ptr s) { SubtitleAsset::add (s); _intrinsic_duration = latest_subtitle_out().as_editable_units (_edit_rate.numerator / _edit_rate.denominator);