diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-12 00:24:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-12 00:24:21 +0000 |
| commit | a18b9d20ac2a0353a4f1b0b78ce7a8e26fdd6aa8 (patch) | |
| tree | 0f1d8dc341f3bf87fb4094c1ac771e378719d172 /src | |
| parent | 80df2f4a80686eb2ab412843f5c4146ffc8ff31a (diff) | |
Use a different ID for the XML inside a SMPTE subtitle MXF than the
ID for the MXF itself. Apparently not doing so is an error (according
to Doremi's release notes for 2.8.18).
Diffstat (limited to 'src')
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 6 | ||||
| -rw-r--r-- | src/smpte_subtitle_asset.h | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index e52cd2ef..c85afc2e 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -66,6 +66,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset () : _intrinsic_duration (0) , _edit_rate (24, 1) , _time_code_rate (24) + , _xml_id (make_uuid ()) { } @@ -99,7 +100,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path 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 ( @@ -116,6 +117,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) void SMPTESubtitleAsset::parse_xml (shared_ptr<cxml::Document> xml) { + _xml_id = remove_urn_uuid(xml->string_child("Id")); _load_font_nodes = type_children<dcp::SMPTELoadFontNode> (xml, "LoadFont"); _content_title_text = xml->string_child ("ContentTitleText"); @@ -258,7 +260,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 ("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 ()); diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h index 004531a2..cf7e714d 100644 --- a/src/smpte_subtitle_asset.h +++ b/src/smpte_subtitle_asset.h @@ -151,6 +151,10 @@ public: return _start_time; } + std::string xml_id () const { + return _xml_id; + } + static bool valid_mxf (boost::filesystem::path); protected: @@ -160,6 +164,9 @@ protected: } private: + friend struct ::write_smpte_subtitle_test; + friend struct ::write_smpte_subtitle_test2; + void read_fonts (boost::shared_ptr<ASDCP::TimedText::MXFReader>); void parse_xml (boost::shared_ptr<cxml::Document> xml); void read_mxf_descriptor (boost::shared_ptr<ASDCP::TimedText::MXFReader> reader, boost::shared_ptr<DecryptionContext> dec); @@ -179,6 +186,10 @@ private: boost::optional<Time> _start_time; std::list<boost::shared_ptr<SMPTELoadFontNode> > _load_font_nodes; + /** UUID for the XML inside the MXF, which should be different to the ID of the MXF according to + * Doremi's 2.8.18 release notes. + */ + std::string _xml_id; }; } |