/*
- Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
#include "dcp.h"
#include "cpl.h"
#include "reel.h"
+#include "reel_closed_caption_asset.h"
#include "reel_picture_asset.h"
#include "reel_sound_asset.h"
+#include "reel_subtitle_asset.h"
+#include "interop_subtitle_asset.h"
#include "mono_picture_asset.h"
#include "mono_picture_frame.h"
#include "stereo_picture_asset.h"
#include "exceptions.h"
#include "compose.hpp"
#include "raw_convert.h"
+#include "smpte_subtitle_asset.h"
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/parsers/AbstractDOMParser.hpp>
#include <xercesc/dom/DOMAttr.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/framework/LocalFileInputSource.hpp>
+#include <xercesc/framework/MemBufInputSource.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/foreach.hpp>
#include <boost/algorithm/string.hpp>
#include <map>
-#include <list>
#include <vector>
#include <iostream>
using std::cout;
using std::map;
using std::max;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using boost::function;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
using namespace dcp;
using namespace xercesc;
: _message (xml_ch_to_string(e.getMessage()))
, _line (e.getLineNumber())
, _column (e.getColumnNumber())
+ , _public_id (e.getPublicId() ? xml_ch_to_string(e.getPublicId()) : "")
+ , _system_id (e.getSystemId() ? xml_ch_to_string(e.getSystemId()) : "")
{
}
return _column;
}
+ string public_id () const {
+ return _public_id;
+ }
+
+ string system_id () const {
+ return _system_id;
+ }
+
private:
string _message;
uint64_t _line;
uint64_t _column;
+ string _public_id;
+ string _system_id;
};
LocalFileResolver (boost::filesystem::path xsd_dtd_directory)
: _xsd_dtd_directory (xsd_dtd_directory)
{
+ /* XXX: I'm not clear on what things need to be in this list; some XSDs are apparently, magically
+ * found without being here.
+ */
add("http://www.w3.org/2001/XMLSchema.dtd", "XMLSchema.dtd");
add("http://www.w3.org/2001/03/xml.xsd", "xml.xsd");
add("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd", "xmldsig-core-schema.xsd");
add("http://www.digicine.com/PROTO-ASDCP-CPL-20040511.xsd", "PROTO-ASDCP-CPL-20040511.xsd");
add("http://www.digicine.com/PROTO-ASDCP-PKL-20040311.xsd", "PROTO-ASDCP-PKL-20040311.xsd");
add("http://www.digicine.com/PROTO-ASDCP-AM-20040311.xsd", "PROTO-ASDCP-AM-20040311.xsd");
+ 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");
+ add("http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL", "SMPTE-429-10-2008.xsd");
}
InputSource* resolveEntity(XMLCh const *, XMLCh const * system_id)
{
- string system_id_str = xml_ch_to_string (system_id);
- if (_files.find(system_id_str) == _files.end()) {
+ if (!system_id) {
return 0;
}
-
- boost::filesystem::path p = _xsd_dtd_directory / _files[system_id_str];
+ auto system_id_str = xml_ch_to_string (system_id);
+ auto p = _xsd_dtd_directory;
+ if (_files.find(system_id_str) == _files.end()) {
+ p /= system_id_str;
+ } else {
+ p /= _files[system_id_str];
+ }
StringToXMLCh ch (p.string());
return new LocalFileInputSource(ch.get());
}
boost::filesystem::path _xsd_dtd_directory;
};
-static
+
+static void
+parse (XercesDOMParser& parser, boost::filesystem::path xml)
+{
+ parser.parse(xml.string().c_str());
+}
+
+
+static void
+parse (XercesDOMParser& parser, std::string xml)
+{
+ xercesc::MemBufInputSource buf(reinterpret_cast<unsigned char const*>(xml.c_str()), xml.size(), "");
+ parser.parse(buf);
+}
+
+
+template <class T>
void
-validate_xml (boost::filesystem::path xml_file, boost::filesystem::path xsd_dtd_directory, list<VerificationNote>& notes)
+validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<VerificationNote>& notes)
{
try {
XMLPlatformUtils::Initialize ();
parser.setDoNamespaces(true);
parser.setDoSchema(true);
- map<string, string> schema;
- schema["http://www.w3.org/2000/09/xmldsig#"] = "xmldsig-core-schema.xsd";
- schema["http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"] = "xmldsig-core-schema.xsd";
- schema["http://www.smpte-ra.org/schemas/429-7/2006/CPL"] = "SMPTE-429-7-2006-CPL.xsd";
- schema["http://www.smpte-ra.org/schemas/429-8/2006/PKL"] = "SMPTE-429-8-2006-PKL.xsd";
- schema["http://www.smpte-ra.org/schemas/429-9/2007/AM"] = "SMPTE-429-9-2007-AM.xsd";
- schema["http://www.digicine.com/schemas/437-Y/2007/Main-Stereo-Picture-CPL.xsd"] = "Main-Stereo-Picture-CPL.xsd";
- schema["http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"] = "PROTO-ASDCP-CPL-20040511.xsd";
- schema["http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"] = "PROTO-ASDCP-PKL-20040311.xsd";
- schema["http://www.digicine.com/PROTO-ASDCP-AM-20040311#"] = "PROTO-ASDCP-AM-20040311.xsd";
-
+ vector<string> schema;
+ schema.push_back("xml.xsd");
+ schema.push_back("xmldsig-core-schema.xsd");
+ schema.push_back("SMPTE-429-7-2006-CPL.xsd");
+ schema.push_back("SMPTE-429-8-2006-PKL.xsd");
+ schema.push_back("SMPTE-429-9-2007-AM.xsd");
+ schema.push_back("Main-Stereo-Picture-CPL.xsd");
+ schema.push_back("PROTO-ASDCP-CPL-20040511.xsd");
+ schema.push_back("PROTO-ASDCP-PKL-20040311.xsd");
+ schema.push_back("PROTO-ASDCP-AM-20040311.xsd");
+ 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");
+ schema.push_back("SMPTE-429-10-2008.xsd");
+ schema.push_back("xlink.xsd");
+ schema.push_back("SMPTE-335-2012.xsd");
+ schema.push_back("SMPTE-395-2014-13-1-aaf.xsd");
+ schema.push_back("isdcf-mca.xsd");
+ schema.push_back("SMPTE-429-12-2008.xsd");
+
+ /* XXX: I'm not especially clear what this is for, but it seems to be necessary.
+ * Schemas that are not mentioned in this list are not read, and the things
+ * they describe are not checked.
+ */
string locations;
- for (map<string, string>::const_iterator i = schema.begin(); i != schema.end(); ++i) {
- locations += i->first;
- locations += " ";
- boost::filesystem::path p = xsd_dtd_directory / i->second;
- locations += p.string() + " ";
+ for (auto i: schema) {
+ locations += String::compose("%1 %1 ", i, i);
}
parser.setExternalSchemaLocation(locations.c_str());
try {
parser.resetDocumentPool();
- parser.parse(xml_file.string().c_str());
+ parse(parser, xml);
} catch (XMLException& e) {
throw MiscError(xml_ch_to_string(e.getMessage()));
} catch (DOMException& e) {
XMLPlatformUtils::Terminate ();
- BOOST_FOREACH (XMLValidationError i, error_handler.errors()) {
+ for (auto i: error_handler.errors()) {
notes.push_back (
VerificationNote(
VerificationNote::VERIFY_ERROR,
VerificationNote::XML_VALIDATION_ERROR,
i.message(),
- xml_file,
+ boost::trim_copy(i.public_id() + " " + i.system_id()),
i.line()
)
);
static VerifyAssetResult
-verify_asset (shared_ptr<DCP> dcp, shared_ptr<ReelMXF> reel_mxf, function<void (float)> progress)
+verify_asset (shared_ptr<const DCP> dcp, shared_ptr<const ReelMXF> reel_mxf, function<void (float)> progress)
{
- string const actual_hash = reel_mxf->asset_ref()->hash(progress);
+ auto const actual_hash = reel_mxf->asset_ref()->hash(progress);
- list<shared_ptr<PKL> > pkls = dcp->pkls();
+ auto pkls = dcp->pkls();
/* We've read this DCP in so it must have at least one PKL */
DCP_ASSERT (!pkls.empty());
- shared_ptr<Asset> asset = reel_mxf->asset_ref().asset();
+ auto asset = reel_mxf->asset_ref().asset();
optional<string> pkl_hash;
- BOOST_FOREACH (shared_ptr<PKL> i, pkls) {
+ for (auto i: pkls) {
pkl_hash = i->hash (reel_mxf->asset_ref()->id());
if (pkl_hash) {
break;
DCP_ASSERT (pkl_hash);
- optional<string> cpl_hash = reel_mxf->hash();
+ auto cpl_hash = reel_mxf->hash();
if (cpl_hash && *cpl_hash != *pkl_hash) {
return VERIFY_ASSET_RESULT_CPL_PKL_DIFFER;
}
}
+void
+verify_language_tag (string tag, vector<VerificationNote>& notes)
+{
+ try {
+ dcp::LanguageTag test (tag);
+ } catch (dcp::LanguageTagError &) {
+ notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::BAD_LANGUAGE, tag));
+ }
+}
+
+
enum VerifyPictureAssetResult
{
VERIFY_PICTURE_ASSET_RESULT_GOOD,
- VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_BIG,
+ VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE,
VERIFY_PICTURE_ASSET_RESULT_BAD,
};
int
biggest_frame_size (shared_ptr<const MonoPictureFrame> frame)
{
- return frame->j2k_size ();
+ return frame->size ();
}
int
biggest_frame_size (shared_ptr<const StereoPictureFrame> frame)
{
- return max(frame->left_j2k_size(), frame->right_j2k_size());
+ return max(frame->left()->size(), frame->right()->size());
}
template <class A, class R, class F>
optional<VerifyPictureAssetResult>
-verify_picture_asset_type (shared_ptr<ReelMXF> reel_mxf, function<void (float)> progress)
+verify_picture_asset_type (shared_ptr<const ReelMXF> reel_mxf, function<void (float)> progress)
{
- shared_ptr<A> asset = dynamic_pointer_cast<A>(reel_mxf->asset_ref().asset());
+ auto asset = dynamic_pointer_cast<A>(reel_mxf->asset_ref().asset());
if (!asset) {
return optional<VerifyPictureAssetResult>();
}
int biggest_frame = 0;
- shared_ptr<R> reader = asset->start_read ();
- int64_t const duration = asset->intrinsic_duration ();
+ auto reader = asset->start_read ();
+ auto const duration = asset->intrinsic_duration ();
for (int64_t i = 0; i < duration; ++i) {
shared_ptr<const F> frame = reader->get_frame (i);
biggest_frame = max(biggest_frame, biggest_frame_size(frame));
if (biggest_frame > max_frame) {
return VERIFY_PICTURE_ASSET_RESULT_BAD;
} else if (biggest_frame > risky_frame) {
- return VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_BIG;
+ return VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE;
}
return VERIFY_PICTURE_ASSET_RESULT_GOOD;
static VerifyPictureAssetResult
-verify_picture_asset (shared_ptr<ReelMXF> reel_mxf, function<void (float)> progress)
+verify_picture_asset (shared_ptr<const ReelMXF> reel_mxf, function<void (float)> progress)
{
- optional<VerifyPictureAssetResult> r = verify_picture_asset_type<MonoPictureAsset, MonoPictureAssetReader, MonoPictureFrame>(reel_mxf, progress);
+ auto r = verify_picture_asset_type<MonoPictureAsset, MonoPictureAssetReader, MonoPictureFrame>(reel_mxf, progress);
if (!r) {
r = verify_picture_asset_type<StereoPictureAsset, StereoPictureAssetReader, StereoPictureFrame>(reel_mxf, progress);
}
}
-list<VerificationNote>
+static void
+verify_main_picture_asset (
+ shared_ptr<const DCP> dcp,
+ shared_ptr<const ReelPictureAsset> reel_asset,
+ function<void (string, optional<boost::filesystem::path>)> stage,
+ function<void (float)> progress,
+ vector<VerificationNote>& notes
+ )
+{
+ auto asset = reel_asset->asset();
+ auto const file = *asset->file();
+ stage ("Checking picture asset hash", file);
+ auto const r = verify_asset (dcp, reel_asset, progress);
+ switch (r) {
+ case VERIFY_ASSET_RESULT_BAD:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_HASH_INCORRECT, file
+ )
+ );
+ break;
+ case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER, file
+ )
+ );
+ break;
+ default:
+ break;
+ }
+ stage ("Checking picture frame sizes", asset->file());
+ auto const pr = verify_picture_asset (reel_asset, progress);
+ switch (pr) {
+ case VERIFY_PICTURE_ASSET_RESULT_BAD:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES, file
+ )
+ );
+ break;
+ case VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_LARGE:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_WARNING, VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES, file
+ )
+ );
+ break;
+ default:
+ break;
+ }
+
+ /* Only flat/scope allowed by Bv2.1 */
+ if (
+ asset->size() != dcp::Size(2048, 858) &&
+ asset->size() != dcp::Size(1998, 1080) &&
+ asset->size() != dcp::Size(4096, 1716) &&
+ asset->size() != dcp::Size(3996, 2160)) {
+ notes.push_back(
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR,
+ VerificationNote::PICTURE_ASSET_INVALID_SIZE_IN_PIXELS,
+ String::compose("%1x%2", asset->size().width, asset->size().height),
+ file
+ )
+ );
+ }
+
+ /* Only 24, 25, 48fps allowed for 2K */
+ if (
+ (asset->size() == dcp::Size(2048, 858) || asset->size() == dcp::Size(1998, 1080)) &&
+ (asset->edit_rate() != dcp::Fraction(24, 1) && asset->edit_rate() != dcp::Fraction(25, 1) && asset->edit_rate() != dcp::Fraction(48, 1))
+ ) {
+ notes.push_back(
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR,
+ VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_2K,
+ String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
+ file
+ )
+ );
+ }
+
+ if (asset->size() == dcp::Size(4096, 1716) || asset->size() == dcp::Size(3996, 2160)) {
+ /* Only 24fps allowed for 4K */
+ if (asset->edit_rate() != dcp::Fraction(24, 1)) {
+ notes.push_back(
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR,
+ VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_4K,
+ String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),
+ file
+ )
+ );
+ }
+
+ /* Only 2D allowed for 4K */
+ if (dynamic_pointer_cast<const StereoPictureAsset>(asset)) {
+ notes.push_back(
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR,
+ VerificationNote::PICTURE_ASSET_4K_3D,
+ file
+ )
+ );
+
+ }
+ }
+
+}
+
+
+static void
+verify_main_sound_asset (
+ shared_ptr<const DCP> dcp,
+ shared_ptr<const ReelSoundAsset> reel_asset,
+ function<void (string, optional<boost::filesystem::path>)> stage,
+ function<void (float)> progress,
+ vector<VerificationNote>& notes
+ )
+{
+ auto asset = reel_asset->asset();
+ stage ("Checking sound asset hash", asset->file());
+ auto const r = verify_asset (dcp, reel_asset, progress);
+ switch (r) {
+ case VERIFY_ASSET_RESULT_BAD:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_ERROR, VerificationNote::SOUND_HASH_INCORRECT, *asset->file()
+ )
+ );
+ break;
+ case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER, *asset->file()
+ )
+ );
+ break;
+ default:
+ break;
+ }
+
+ stage ("Checking sound asset metadata", asset->file());
+
+ verify_language_tag (asset->language(), notes);
+}
+
+
+static void
+verify_main_subtitle_reel (shared_ptr<const ReelSubtitleAsset> reel_asset, vector<VerificationNote>& notes)
+{
+ /* XXX: is Language compulsory? */
+ if (reel_asset->language()) {
+ verify_language_tag (*reel_asset->language(), notes);
+ }
+}
+
+
+static void
+verify_closed_caption_reel (shared_ptr<const ReelClosedCaptionAsset> reel_asset, vector<VerificationNote>& notes)
+{
+ /* XXX: is Language compulsory? */
+ if (reel_asset->language()) {
+ verify_language_tag (*reel_asset->language(), notes);
+ }
+}
+
+
+struct State
+{
+ boost::optional<string> subtitle_language;
+};
+
+
+static void
+verify_subtitle_asset (
+ shared_ptr<const SubtitleAsset> asset,
+ function<void (string, optional<boost::filesystem::path>)> stage,
+ boost::filesystem::path xsd_dtd_directory,
+ vector<VerificationNote>& notes,
+ State& state,
+ bool first_reel
+ )
+{
+ stage ("Checking subtitle XML", asset->file());
+ /* Note: we must not use SubtitleAsset::xml_as_string() here as that will mean the data on disk
+ * gets passed through libdcp which may clean up and therefore hide errors.
+ */
+ validate_xml (asset->raw_xml(), xsd_dtd_directory, notes);
+
+ auto smpte = dynamic_pointer_cast<const SMPTESubtitleAsset>(asset);
+ if (smpte) {
+ if (smpte->language()) {
+ auto const language = *smpte->language();
+ verify_language_tag (language, notes);
+ if (!state.subtitle_language) {
+ state.subtitle_language = language;
+ } else if (state.subtitle_language != language) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::SUBTITLE_LANGUAGES_DIFFER, *asset->file()
+ )
+ );
+ }
+ } else {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_LANGUAGE, *asset->file()
+ )
+ );
+ }
+ if (boost::filesystem::file_size(*asset->file()) > 115 * 1024 * 1024) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::TIMED_TEXT_ASSET_TOO_LARGE_IN_BYTES, *asset->file()
+ )
+ );
+ }
+ /* XXX: I'm not sure what Bv2.1_7.2.1 means when it says "the font resource shall not be larger than 10MB"
+ * but I'm hoping that checking for the total size of all fonts being <= 10MB will do.
+ */
+ auto fonts = asset->font_data ();
+ int total_size = 0;
+ for (auto i: fonts) {
+ total_size += i.second.size();
+ }
+ if (total_size > 10 * 1024 * 1024) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::TIMED_TEXT_FONTS_TOO_LARGE_IN_BYTES, *asset->file()
+ )
+ );
+ }
+
+ if (!smpte->start_time()) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::MISSING_SUBTITLE_START_TIME, *asset->file())
+ );
+ } else if (smpte->start_time() != dcp::Time()) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::SUBTITLE_START_TIME_NON_ZERO, *asset->file())
+ );
+ }
+
+ if (first_reel) {
+ auto subs = smpte->subtitles();
+ sort (subs.begin(), subs.end(), [](shared_ptr<Subtitle> a, shared_ptr<Subtitle> b) {
+ return a->in() < b->in();
+ });
+ if (!subs.empty() && subs.front()->in() < dcp::Time(0, 0, 4, 0, 24)) {
+ notes.push_back(
+ VerificationNote(
+ VerificationNote::VERIFY_WARNING, VerificationNote::FIRST_TEXT_TOO_EARLY
+ )
+ );
+ }
+ }
+ }
+}
+
+
+static void
+verify_closed_caption_asset (
+ shared_ptr<const SubtitleAsset> asset,
+ function<void (string, optional<boost::filesystem::path>)> stage,
+ boost::filesystem::path xsd_dtd_directory,
+ vector<VerificationNote>& notes,
+ State& state,
+ bool first_reel
+ )
+{
+ verify_subtitle_asset (asset, stage, xsd_dtd_directory, notes, state, first_reel);
+
+ if (asset->raw_xml().size() > 256 * 1024) {
+ notes.push_back (
+ VerificationNote(
+ VerificationNote::VERIFY_BV21_ERROR, VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES, *asset->file()
+ )
+ );
+ }
+}
+
+
+vector<VerificationNote>
dcp::verify (
vector<boost::filesystem::path> directories,
function<void (string, optional<boost::filesystem::path>)> stage,
{
xsd_dtd_directory = boost::filesystem::canonical (xsd_dtd_directory);
- list<VerificationNote> notes;
+ vector<VerificationNote> notes;
+ State state;
- list<shared_ptr<DCP> > dcps;
- BOOST_FOREACH (boost::filesystem::path i, directories) {
+ vector<shared_ptr<DCP>> dcps;
+ for (auto i: directories) {
dcps.push_back (shared_ptr<DCP> (new DCP (i)));
}
- BOOST_FOREACH (shared_ptr<DCP> dcp, dcps) {
+ for (auto dcp: dcps) {
stage ("Checking DCP", dcp->directory());
try {
dcp->read (¬es);
notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
} catch (XMLError& e) {
notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
+ } catch (MXFFileError& e) {
+ notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
+ } catch (cxml::Error& e) {
+ notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
+ }
+
+ if (dcp->standard() != dcp::SMPTE) {
+ notes.push_back (VerificationNote(VerificationNote::VERIFY_BV21_ERROR, VerificationNote::NOT_SMPTE));
}
- BOOST_FOREACH (shared_ptr<CPL> cpl, dcp->cpls()) {
+ for (auto cpl: dcp->cpls()) {
stage ("Checking CPL", cpl->file());
validate_xml (cpl->file().get(), xsd_dtd_directory, notes);
+ for (auto const& i: cpl->additional_subtitle_languages()) {
+ verify_language_tag (i, notes);
+ }
+
+ if (cpl->release_territory()) {
+ verify_language_tag (cpl->release_territory().get(), notes);
+ }
+
/* Check that the CPL's hash corresponds to the PKL */
- BOOST_FOREACH (shared_ptr<PKL> i, dcp->pkls()) {
+ for (auto i: dcp->pkls()) {
optional<string> h = i->hash(cpl->id());
- if (h && make_digest(Data(*cpl->file())) != *h) {
+ if (h && make_digest(ArrayData(*cpl->file())) != *h) {
notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::CPL_HASH_INCORRECT));
}
}
- BOOST_FOREACH (shared_ptr<Reel> reel, cpl->reels()) {
+ bool first_reel = true;
+ for (auto reel: cpl->reels()) {
stage ("Checking reel", optional<boost::filesystem::path>());
- BOOST_FOREACH (shared_ptr<ReelAsset> i, reel->assets()) {
+ for (auto i: reel->assets()) {
if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::DURATION_TOO_SMALL, i->id()));
}
if (reel->main_picture()) {
/* Check reel stuff */
- Fraction const frame_rate = reel->main_picture()->frame_rate();
+ auto const frame_rate = reel->main_picture()->frame_rate();
if (frame_rate.denominator != 1 ||
(frame_rate.numerator != 24 &&
frame_rate.numerator != 25 &&
}
/* Check asset */
if (reel->main_picture()->asset_ref().resolved()) {
- boost::filesystem::path const file = *reel->main_picture()->asset()->file();
- stage ("Checking picture asset hash", file);
- VerifyAssetResult const r = verify_asset (dcp, reel->main_picture(), progress);
- switch (r) {
- case VERIFY_ASSET_RESULT_BAD:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_HASH_INCORRECT, file
- )
- );
- break;
- case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE, file
- )
- );
- break;
- default:
- break;
- }
- stage ("Checking picture frame sizes", reel->main_picture()->asset()->file());
- VerifyPictureAssetResult const pr = verify_picture_asset (reel->main_picture(), progress);
- switch (pr) {
- case VERIFY_PICTURE_ASSET_RESULT_BAD:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_FRAME_TOO_LARGE, file
- )
- );
- break;
- case VERIFY_PICTURE_ASSET_RESULT_FRAME_NEARLY_TOO_BIG:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_WARNING, VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE, file
- )
- );
- break;
- default:
- break;
- }
+ verify_main_picture_asset (dcp, reel->main_picture(), stage, progress, notes);
}
}
+
if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
- stage ("Checking sound asset hash", reel->main_sound()->asset()->file());
- VerifyAssetResult const r = verify_asset (dcp, reel->main_sound(), progress);
- switch (r) {
- case VERIFY_ASSET_RESULT_BAD:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_ERROR, VerificationNote::SOUND_HASH_INCORRECT, *reel->main_sound()->asset()->file()
- )
- );
- break;
- case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
- notes.push_back (
- VerificationNote(
- VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE, *reel->main_sound()->asset()->file()
- )
- );
- break;
- default:
- break;
+ verify_main_sound_asset (dcp, reel->main_sound(), stage, progress, notes);
+ }
+
+ if (reel->main_subtitle()) {
+ verify_main_subtitle_reel (reel->main_subtitle(), notes);
+ if (reel->main_subtitle()->asset_ref().resolved()) {
+ verify_subtitle_asset (reel->main_subtitle()->asset(), stage, xsd_dtd_directory, notes, state, first_reel);
}
}
+
+ for (auto i: reel->closed_captions()) {
+ verify_closed_caption_reel (i, notes);
+ if (i->asset_ref().resolved()) {
+ verify_closed_caption_asset (i->asset(), stage, xsd_dtd_directory, notes, state, first_reel);
+ }
+ }
+
+ first_reel = false;
}
}
- BOOST_FOREACH (shared_ptr<PKL> pkl, dcp->pkls()) {
+ for (auto pkl: dcp->pkls()) {
stage ("Checking PKL", pkl->file());
validate_xml (pkl->file().get(), xsd_dtd_directory, notes);
}
case dcp::VerificationNote::GENERAL_READ:
return *note.note();
case dcp::VerificationNote::CPL_HASH_INCORRECT:
- return "The hash of the CPL in the PKL does not agree with the CPL file";
+ return "The hash of the CPL in the PKL does not agree with the CPL file.";
case dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE:
- return "The picture in a reel has an invalid frame rate";
+ return "The picture in a reel has an invalid frame rate.";
case dcp::VerificationNote::PICTURE_HASH_INCORRECT:
- return dcp::String::compose("The hash of the picture asset %1 does not agree with the PKL file", note.file()->filename());
- case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE:
- return dcp::String::compose("The PKL and CPL hashes disagree for the picture asset %1", note.file()->filename());
+ return dcp::String::compose("The hash of the picture asset %1 does not agree with the PKL file.", note.file()->filename());
+ case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER:
+ return dcp::String::compose("The PKL and CPL hashes differ for the picture asset %1.", note.file()->filename());
case dcp::VerificationNote::SOUND_HASH_INCORRECT:
- return dcp::String::compose("The hash of the sound asset %1 does not agree with the PKL file", note.file()->filename());
- case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE:
- return dcp::String::compose("The PKL and CPL hashes disagree for the sound asset %1", note.file()->filename());
+ return dcp::String::compose("The hash of the sound asset %1 does not agree with the PKL file.", note.file()->filename());
+ case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER:
+ return dcp::String::compose("The PKL and CPL hashes differ for the sound asset %1.", note.file()->filename());
case dcp::VerificationNote::EMPTY_ASSET_PATH:
return "The asset map contains an empty asset path.";
case dcp::VerificationNote::MISSING_ASSET:
case dcp::VerificationNote::XML_VALIDATION_ERROR:
return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
case dcp::VerificationNote::MISSING_ASSETMAP:
- return "No ASSETMAP or ASSETMAP.xml was found";
+ return "No ASSETMAP or ASSETMAP.xml was found.";
case dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL:
return String::compose("The intrinsic duration of an asset is less than 1 second long: %1", note.note().get());
case dcp::VerificationNote::DURATION_TOO_SMALL:
return String::compose("The duration of an asset is less than 1 second long: %1", note.note().get());
- case dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE:
- return String::compose("The instantaneous bit rate of the picture asset %1 is larger than the limit of 250Mbit/s in at least one place", note.file()->filename());
- case dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE:
- return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place", note.file()->filename());
+ case dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES:
+ return String::compose("The instantaneous bit rate of the picture asset %1 is larger than the limit of 250Mbit/s in at least one place.", note.file()->filename());
+ case dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES:
+ return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place.", note.file()->filename());
+ case dcp::VerificationNote::EXTERNAL_ASSET:
+ return String::compose("An asset that this DCP refers to is not included in the DCP. It may be a VF. Missing asset is %1.", note.note().get());
+ case dcp::VerificationNote::NOT_SMPTE:
+ return "This DCP does not use the SMPTE standard, which is required for Bv2.1 compliance.";
+ case dcp::VerificationNote::BAD_LANGUAGE:
+ return String::compose("The DCP specifies a language '%1' which does not conform to the RFC 5646 standard.", note.note().get());
+ case dcp::VerificationNote::PICTURE_ASSET_INVALID_SIZE_IN_PIXELS:
+ return String::compose("A picture asset's size (%1) is not one of those allowed by Bv2.1 (2048x858, 1998x1080, 4096x1716 or 3996x2160)", note.note().get());
+ case dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_2K:
+ return String::compose("A picture asset's frame rate (%1) is not one of those allowed for 2K DCPs by Bv2.1 (24, 25 or 48fps)", note.note().get());
+ case dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_4K:
+ return String::compose("A picture asset's frame rate (%1) is not 24fps as required for 4K DCPs by Bv2.1", note.note().get());
+ case dcp::VerificationNote::PICTURE_ASSET_4K_3D:
+ return "3D 4K DCPs are not allowed by Bv2.1";
+ case dcp::VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES:
+ return String::compose("The XML for the closed caption asset %1 is longer than the 256KB maximum required by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::TIMED_TEXT_ASSET_TOO_LARGE_IN_BYTES:
+ return String::compose("The total size of the timed text asset %1 is larger than the 115MB maximum required by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::TIMED_TEXT_FONTS_TOO_LARGE_IN_BYTES:
+ return String::compose("The total size of the fonts in timed text asset %1 is larger than the 10MB maximum required by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::MISSING_SUBTITLE_LANGUAGE:
+ return String::compose("The XML for a SMPTE subtitle asset has no <Language> tag, which is required by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::SUBTITLE_LANGUAGES_DIFFER:
+ return String::compose("Some subtitle assets have different <Language> tags than others", note.file()->filename());
+ case dcp::VerificationNote::MISSING_SUBTITLE_START_TIME:
+ return String::compose("The XML for a SMPTE subtitle asset has no <StartTime> tag, which is required by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::SUBTITLE_START_TIME_NON_ZERO:
+ return String::compose("The XML for a SMPTE subtitle asset has a non-zero <StartTime> tag, which is disallowed by Bv2.1", note.file()->filename());
+ case dcp::VerificationNote::FIRST_TEXT_TOO_EARLY:
+ return "The first subtitle or closed caption is less than 4 seconds from the start of the DCP.";
}
return "";