summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-09-03 12:10:27 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-21 21:57:18 +0200
commit549011d53fa302fde3dcb6df4d946dc569a8b03e (patch)
treef85b0731b5acf20c2c560fd9f287380d5e1578c3 /src
parentfc205951d1fec50d59bfbed9cb03c07cc95205d9 (diff)
Add namespaces and tweak CPL namespace so Xerces checks CompositionMetadataAsset.
Diffstat (limited to 'src')
-rw-r--r--src/verify.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/verify.cc b/src/verify.cc
index 9a0895f6..ddf308ca 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -206,10 +206,15 @@ public:
add("http://www.digicine.com/PROTO-ASDCP-CC-CPL-20070926#", "PROTO-ASDCP-CC-CPL-20070926.xsd");
add("interop-subs", "DCSubtitle.v1.mattsson.xsd");
add("http://www.smpte-ra.org/schemas/428-7/2010/DCST.xsd", "SMPTE-428-7-2010-DCST.xsd");
+ add("http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata", "SMPTE-429-16.xsd");
+ add("http://www.dolby.com/schemas/2012/AD", "Dolby-2012-AD.xsd");
}
InputSource* resolveEntity(XMLCh const *, XMLCh const * system_id)
{
+ if (!system_id) {
+ return 0;
+ }
string system_id_str = xml_ch_to_string (system_id);
boost::filesystem::path p = _xsd_dtd_directory;
if (_files.find(system_id_str) == _files.end()) {
@@ -278,6 +283,8 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, list<Verificatio
schema.push_back("DCSubtitle.v1.mattsson.xsd");
schema.push_back("DCDMSubtitle-2010.xsd");
schema.push_back("PROTO-ASDCP-CC-CPL-20070926.xsd");
+ schema.push_back("SMPTE-429-16.xsd");
+ schema.push_back("Dolby-2012-AD.xsd");
/* XXX: I'm not especially clear what this is for, but it seems to be necessary */
string locations;