#include "stereo_picture_frame.h"
#include "verify.h"
#include "verify_j2k.h"
+#include <libxml/parserInternals.h>
#include <xercesc/dom/DOMAttr.hpp>
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMError.hpp>
#include <boost/algorithm/string.hpp>
#include <iostream>
#include <map>
+#include <regex>
+#include <set>
#include <vector>
-using std::list;
-using std::vector;
-using std::string;
using std::cout;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
using std::map;
using std::max;
+using std::set;
using std::shared_ptr;
-using std::make_shared;
+using std::string;
+using std::vector;
using boost::optional;
using boost::function;
-using std::dynamic_pointer_cast;
using namespace dcp;
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/428-7/2010/DCST.xsd", "DCDMSubtitle-2010.xsd");
+ add("http://www.smpte-ra.org/schemas/428-7/2014/DCST.xsd", "DCDMSubtitle-2014.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");
static void
parse (XercesDOMParser& parser, boost::filesystem::path xml)
{
- parser.parse(xml.string().c_str());
+ parser.parse(xml.c_str());
}
schema.push_back("PROTO-ASDCP-AM-20040311.xsd");
schema.push_back("DCSubtitle.v1.mattsson.xsd");
schema.push_back("DCDMSubtitle-2010.xsd");
+ schema.push_back("DCDMSubtitle-2014.xsd");
schema.push_back("PROTO-ASDCP-CC-CPL-20070926.xsd");
schema.push_back("SMPTE-429-16.xsd");
schema.push_back("Dolby-2012-AD.xsd");
biggest_frame = max(biggest_frame, frame->size());
if (!mono_asset->encrypted() || mono_asset->key()) {
vector<VerificationNote> j2k_notes;
- verify_j2k (frame, j2k_notes);
+ verify_j2k(frame, i, mono_asset->frame_rate().numerator, j2k_notes);
check_and_add (j2k_notes);
}
progress (float(i) / duration);
biggest_frame = max(biggest_frame, max(frame->left()->size(), frame->right()->size()));
if (!stereo_asset->encrypted() || stereo_asset->key()) {
vector<VerificationNote> j2k_notes;
- verify_j2k (frame->left(), j2k_notes);
- verify_j2k (frame->right(), j2k_notes);
+ verify_j2k(frame->left(), i, stereo_asset->frame_rate().numerator, j2k_notes);
+ verify_j2k(frame->right(), i, stereo_asset->frame_rate().numerator, j2k_notes);
check_and_add (j2k_notes);
}
progress (float(i) / duration);
shared_ptr<const ReelPictureAsset> reel_asset,
function<void (string, optional<boost::filesystem::path>)> stage,
function<void (float)> progress,
+ VerificationOptions options,
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 VerifyAssetResult::BAD:
- notes.push_back ({
- VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
- });
- break;
- case VerifyAssetResult::CPL_PKL_DIFFER:
- notes.push_back ({
- VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file
- });
- break;
- default:
- break;
+
+ if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+ stage ("Checking picture asset hash", file);
+ auto const r = verify_asset (dcp, reel_asset, progress);
+ switch (r) {
+ case VerifyAssetResult::BAD:
+ notes.push_back ({
+ VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_PICTURE_HASH, file
+ });
+ break;
+ case VerifyAssetResult::CPL_PKL_DIFFER:
+ notes.push_back ({
+ VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_PICTURE_HASHES, file
+ });
+ break;
+ default:
+ break;
+ }
}
+
stage ("Checking picture frame sizes", asset->file());
verify_picture_asset (reel_asset, file, notes, progress);
}
+struct State
+{
+ boost::optional<string> subtitle_language;
+ boost::optional<int> audio_channels;
+};
+
+
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
+ VerificationOptions options,
+ vector<VerificationNote>& notes,
+ State& state
)
{
auto asset = reel_asset->asset();
- stage ("Checking sound asset hash", asset->file());
- auto const r = verify_asset (dcp, reel_asset, progress);
- switch (r) {
- case VerifyAssetResult::BAD:
- notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, *asset->file()});
- break;
- case VerifyAssetResult::CPL_PKL_DIFFER:
- notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, *asset->file()});
- break;
- default:
- break;
+ auto const file = *asset->file();
+
+ if (options.check_asset_hashes && (!options.maximum_asset_size_for_hash_check || boost::filesystem::file_size(file) < *options.maximum_asset_size_for_hash_check)) {
+ stage("Checking sound asset hash", file);
+ auto const r = verify_asset (dcp, reel_asset, progress);
+ switch (r) {
+ case VerifyAssetResult::BAD:
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INCORRECT_SOUND_HASH, file});
+ break;
+ case VerifyAssetResult::CPL_PKL_DIFFER:
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_HASHES, file});
+ break;
+ default:
+ break;
+ }
}
- stage ("Checking sound asset metadata", asset->file());
+ if (!state.audio_channels) {
+ state.audio_channels = asset->channels();
+ } else if (*state.audio_channels != asset->channels()) {
+ notes.push_back({ VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS, file });
+ }
+
+ stage ("Checking sound asset metadata", file);
if (auto lang = asset->language()) {
verify_language_tag (*lang, notes);
}
if (asset->sampling_rate() != 48000) {
- notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), *asset->file()});
+ notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), file});
}
}
}
-struct State
-{
- boost::optional<string> subtitle_language;
-};
-
-
/** Verify stuff that is common to both subtitles and closed captions */
void
verify_smpte_timed_text_asset (
}
+/** Verify Interop subtitle-only stuff */
+void
+verify_interop_subtitle_asset(shared_ptr<const InteropSubtitleAsset> asset, vector<VerificationNote>& notes)
+{
+ if (asset->subtitles().empty()) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_SUBTITLE, asset->id(), asset->file().get() });
+ }
+ auto const unresolved = asset->unresolved_fonts();
+ if (!unresolved.empty()) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_FONT, unresolved.front() });
+ }
+}
+
+
/** Verify SMPTE subtitle-only stuff */
void
verify_smpte_subtitle_asset (
} else {
notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED});
}
+
+ if (asset->raw_xml()) {
+ /* Deluxe require this in their QC even if it seems never to be mentioned in any standard */
+ cxml::Document doc("SubtitleReel");
+ doc.read_string(*asset->raw_xml());
+ auto issue_date = doc.string_child("IssueDate");
+ std::regex reg("^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d$");
+ if (!std::regex_match(issue_date, reg)) {
+ notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE, issue_date});
+ }
+ }
}
notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED});
}
+ auto namespace_count = [](shared_ptr<const SubtitleAsset> asset, string root_node) {
+ cxml::Document doc(root_node);
+ doc.read_string(asset->raw_xml().get());
+ auto root = dynamic_cast<xmlpp::Element*>(doc.node())->cobj();
+ int count = 0;
+ for (auto ns = root->nsDef; ns != nullptr; ns = ns->next) {
+ ++count;
+ }
+ return count;
+ };
+
+ auto interop = dynamic_pointer_cast<const InteropSubtitleAsset>(asset);
+ if (interop) {
+ verify_interop_subtitle_asset(interop, notes);
+ if (namespace_count(asset, "DCSubtitle") > 1) {
+ notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() });
+ }
+ }
+
auto smpte = dynamic_pointer_cast<const SMPTESubtitleAsset>(asset);
if (smpte) {
verify_smpte_timed_text_asset (smpte, reel_asset_duration, notes);
verify_smpte_subtitle_asset (smpte, notes, state);
+ /* This asset may be encrypted and in that case we'll have no raw_xml() */
+ if (asset->raw_xml() && namespace_count(asset, "SubtitleReel") > 1) {
+ notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()});
+ }
}
}
}
-/** Check the timing of the individual subtitles and make sure there are no empty <Text> nodes */
+/** Check the timing of the individual subtitles and make sure there are no empty <Text> nodes etc. */
static
void
verify_text_details (
auto empty_text = false;
/* current reel start time (in editable units) */
int64_t reel_offset = 0;
+ vector<string> font_ids;
+ optional<string> missing_load_font_id;
std::function<void (cxml::ConstNodePtr, optional<int>, optional<Time>, int, bool)> parse;
- parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset](cxml::ConstNodePtr node, optional<int> tcr, optional<Time> start_time, int er, bool first_reel) {
+ parse = [&parse, &last_out, &too_short, &too_close, &too_early, &empty_text, &reel_offset, &font_ids, &missing_load_font_id](cxml::ConstNodePtr node, optional<int> tcr, optional<Time> start_time, int er, bool first_reel) {
if (node->name() == "Subtitle") {
Time in (node->string_attribute("TimeIn"), tcr);
if (start_time) {
if (!node_has_content(node)) {
empty_text = true;
}
+ } else if (node->name() == "LoadFont") {
+ if (auto const id = node->optional_string_attribute("Id")) {
+ font_ids.push_back(*id);
+ }
+ } else if (node->name() == "Font") {
+ if (auto const font_id = node->optional_string_attribute("Id")) {
+ if (std::find_if(font_ids.begin(), font_ids.end(), [font_id](string const& id) { return id == font_id; }) == font_ids.end()) {
+ missing_load_font_id = font_id;
+ }
+ }
}
-
for (auto i: node->node_children()) {
parse(i, tcr, start_time, er, first_reel);
}
VerificationNote::Type::WARNING, VerificationNote::Code::EMPTY_TEXT
});
}
+
+ if (missing_load_font_id) {
+ notes.push_back(dcp::VerificationNote(VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT).set_id(*missing_load_font_id));
+ }
}
}
}
- for (auto i: pkl->asset_list()) {
+ for (auto i: pkl->assets()) {
if (find(encrypted.begin(), encrypted.end(), i->id()) != encrypted.end()) {
return true;
}
function<void (string, optional<boost::filesystem::path>)> stage,
boost::filesystem::path xsd_dtd_directory,
function<void (float)> progress,
+ VerificationOptions options,
vector<VerificationNote>& notes,
State& state,
bool* have_main_subtitle,
}
/* Check asset */
if (reel->main_picture()->asset_ref().resolved()) {
- verify_main_picture_asset(dcp, reel->main_picture(), stage, progress, notes);
+ verify_main_picture_asset(dcp, reel->main_picture(), stage, progress, options, notes);
auto const asset_size = reel->main_picture()->asset()->size();
if (main_picture_active_area) {
if (main_picture_active_area->width > asset_size.width) {
}
if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
- verify_main_sound_asset(dcp, reel->main_sound(), stage, progress, notes);
+ verify_main_sound_asset(dcp, reel->main_sound(), stage, progress, options, notes, state);
}
if (reel->main_subtitle()) {
function<void (string, optional<boost::filesystem::path>)> stage,
boost::filesystem::path xsd_dtd_directory,
function<void (float)> progress,
+ VerificationOptions options,
vector<VerificationNote>& notes,
State& state
)
/* Check that any PKL with a single CPL has its AnnotationText the same as the CPL's ContentTitleText */
optional<string> required_annotation_text;
- for (auto j: i->asset_list()) {
+ for (auto j: i->assets()) {
/* See if this is a CPL */
for (auto k: dcp->cpls()) {
if (j->id() == k->id()) {
stage,
xsd_dtd_directory,
progress,
+ options,
notes,
state,
&have_main_subtitle,
verify_text_details(cpl->reels(), notes);
if (dcp->standard() == Standard::SMPTE) {
+ if (auto msc = cpl->main_sound_configuration()) {
+ if (state.audio_channels && msc->channels() != *state.audio_channels) {
+ notes.push_back({
+ VerificationNote::Type::ERROR,
+ VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
+ String::compose("MainSoundConfiguration has %1 channels but sound assets have %2", msc->channels(), *state.audio_channels),
+ cpl->file().get()
+ });
+ }
+ }
if (have_main_subtitle && have_no_main_subtitle) {
notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS});
}
+static
+void
+verify_pkl(
+ shared_ptr<const DCP> dcp,
+ shared_ptr<const PKL> pkl,
+ boost::filesystem::path xsd_dtd_directory,
+ vector<VerificationNote>& notes
+ )
+{
+ validate_xml(pkl->file().get(), xsd_dtd_directory, notes);
+
+ if (pkl_has_encrypted_assets(dcp, pkl)) {
+ cxml::Document doc("PackingList");
+ doc.read_file(pkl->file().get());
+ if (!doc.optional_node_child("Signature")) {
+ notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
+ }
+ }
+
+ set<string> uuid_set;
+ for (auto asset: pkl->assets()) {
+ if (!uuid_set.insert(asset->id()).second) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL, pkl->id(), pkl->file().get()});
+ break;
+ }
+ }
+}
+
+
+
+static
+void
+verify_assetmap(
+ shared_ptr<const DCP> dcp,
+ boost::filesystem::path xsd_dtd_directory,
+ vector<VerificationNote>& notes
+ )
+{
+ auto asset_map = dcp->asset_map();
+ DCP_ASSERT(asset_map);
+
+ validate_xml(asset_map->file().get(), xsd_dtd_directory, notes);
+
+ set<string> uuid_set;
+ for (auto const& asset: asset_map->assets()) {
+ if (!uuid_set.insert(asset.id()).second) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map->id(), asset_map->file().get()});
+ break;
+ }
+ }
+}
+
+
vector<VerificationNote>
dcp::verify (
vector<boost::filesystem::path> directories,
function<void (string, optional<boost::filesystem::path>)> stage,
function<void (float)> progress,
+ VerificationOptions options,
optional<boost::filesystem::path> xsd_dtd_directory
)
{
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
} catch (MXFFileError& e) {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+ } catch (BadURNUUIDError& e) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
} catch (cxml::Error& e) {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
}
stage,
*xsd_dtd_directory,
progress,
+ options,
notes,
state
);
}
for (auto pkl: dcp->pkls()) {
- stage ("Checking PKL", pkl->file());
- validate_xml (pkl->file().get(), *xsd_dtd_directory, notes);
- if (pkl_has_encrypted_assets(dcp, pkl)) {
- cxml::Document doc ("PackingList");
- doc.read_file (pkl->file().get());
- if (!doc.optional_node_child("Signature")) {
- notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl->id(), pkl->file().get()});
- }
- }
+ stage("Checking PKL", pkl->file());
+ verify_pkl(dcp, pkl, *xsd_dtd_directory, notes);
}
- if (dcp->asset_map_path()) {
- stage ("Checking ASSETMAP", dcp->asset_map_path().get());
- validate_xml (dcp->asset_map_path().get(), *xsd_dtd_directory, notes);
+ if (dcp->asset_map_file()) {
+ stage("Checking ASSETMAP", dcp->asset_map_file().get());
+ verify_assetmap(dcp, *xsd_dtd_directory, notes);
} else {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSETMAP});
}
case VerificationNote::Code::INVALID_XML:
return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
case VerificationNote::Code::MISSING_ASSETMAP:
- return "No ASSETMAP or ASSETMAP.xml was found.";
+ return "No valid ASSETMAP or ASSETMAP.xml was found.";
case VerificationNote::Code::INVALID_INTRINSIC_DURATION:
return String::compose("The intrinsic duration of the asset %1 is less than 1 second.", note.note().get());
case VerificationNote::Code::INVALID_DURATION:
return String::compose("<ContentKind> has an invalid value %1.", note.note().get());
case VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA:
return String::compose("<MainPictureActiveaArea> has an invalid value: %1", note.note().get());
+ case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL:
+ return String::compose("The PKL %1 has more than one asset with the same ID.", note.note().get());
+ case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP:
+ return String::compose("The ASSETMAP %1 has more than one asset with the same ID.", note.note().get());
+ case VerificationNote::Code::MISSING_SUBTITLE:
+ return String::compose("The subtitle asset %1 has no subtitles.", note.note().get());
+ case VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE:
+ return String::compose("<IssueDate> has an invalid value: %1", note.note().get());
+ case VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS:
+ return String::compose("The sound assets do not all have the same channel count; the first to differ is %1", note.file()->filename());
+ case VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION:
+ return String::compose("<MainSoundConfiguration> has an invalid value: %1", note.note().get());
+ case VerificationNote::Code::MISSING_FONT:
+ return String::compose("The font file for font ID \"%1\" was not found, or was not referred to in the ASSETMAP.", note.note().get());
+ case VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE:
+ return String::compose(
+ "Frame %1 has an image component that is too large (component %2 is %3 bytes in size).",
+ note.frame().get(), note.component().get(), note.size().get()
+ );
+ case VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT:
+ return String::compose("The XML in the subtitle asset %1 has more than one namespace declaration.", note.note().get());
+ case VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT:
+ return String::compose("A subtitle or closed caption refers to a font with ID %1 that does not have a corresponding <LoadFont> node", note.id().get());
}
return "";
projects / libdcp.git / blobdiff