Rename MISSING_LOAD_FONT -> MISSING_LOAD_FONT_FOR_FONT.
[libdcp.git] / src / verify.cc
index 197e51831ec8f7ffa85add85d9d7dd5ef55b838c..fc58cf78473f60fc9b5652d7dd8e62f0db02c197 100644 (file)
@@ -58,6 +58,7 @@
 #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;
@@ -239,7 +243,8 @@ public:
                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");
@@ -275,7 +280,7 @@ private:
 static void
 parse (XercesDOMParser& parser, boost::filesystem::path xml)
 {
-       parser.parse(xml.string().c_str());
+       parser.parse(xml.c_str());
 }
 
 
@@ -318,6 +323,7 @@ validate_xml (T xml, boost::filesystem::path xsd_dtd_directory, vector<Verificat
                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");
@@ -444,7 +450,7 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
                        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);
@@ -456,8 +462,8 @@ verify_picture_asset (shared_ptr<const ReelFileAsset> reel_file_asset, boost::fi
                        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);
@@ -485,27 +491,32 @@ verify_main_picture_asset (
        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);
 
@@ -562,36 +573,55 @@ verify_main_picture_asset (
 }
 
 
+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});
        }
 }
 
@@ -628,12 +658,6 @@ verify_closed_caption_reel (shared_ptr<const ReelClosedCaptionAsset> reel_asset,
 }
 
 
-struct State
-{
-       boost::optional<string> subtitle_language;
-};
-
-
 /** Verify stuff that is common to both subtitles and closed captions */
 void
 verify_smpte_timed_text_asset (
@@ -685,6 +709,20 @@ 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 (
@@ -714,6 +752,17 @@ 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});
+               }
+       }
 }
 
 
@@ -738,10 +787,33 @@ verify_subtitle_asset (
                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()});
+               }
        }
 }
 
@@ -777,7 +849,7 @@ verify_closed_caption_asset (
 }
 
 
-/** 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 (
@@ -798,9 +870,11 @@ 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) {
@@ -840,8 +914,17 @@ verify_text_details (
                        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);
                }
@@ -918,6 +1001,10 @@ verify_text_details (
                        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));
+       }
 }
 
 
@@ -1174,7 +1261,7 @@ verify_text_details (vector<shared_ptr<Reel>> reels, vector<VerificationNote>& n
 
 
 void
-verify_extension_metadata (shared_ptr<CPL> cpl, vector<VerificationNote>& notes)
+verify_extension_metadata(shared_ptr<const CPL> cpl, vector<VerificationNote>& notes)
 {
        DCP_ASSERT (cpl->file());
        cxml::Document doc ("CompositionPlaylist");
@@ -1232,7 +1319,7 @@ verify_extension_metadata (shared_ptr<CPL> cpl, vector<VerificationNote>& notes)
 
 
 bool
-pkl_has_encrypted_assets (shared_ptr<DCP> dcp, shared_ptr<PKL> pkl)
+pkl_has_encrypted_assets(shared_ptr<const DCP> dcp, shared_ptr<const PKL> pkl)
 {
        vector<string> encrypted;
        for (auto i: dcp->cpls()) {
@@ -1246,7 +1333,7 @@ pkl_has_encrypted_assets (shared_ptr<DCP> dcp, shared_ptr<PKL> pkl)
                }
        }
 
-       for (auto i: pkl->asset_list()) {
+       for (auto i: pkl->assets()) {
                if (find(encrypted.begin(), encrypted.end(), i->id()) != encrypted.end()) {
                        return true;
                }
@@ -1256,368 +1343,493 @@ pkl_has_encrypted_assets (shared_ptr<DCP> dcp, shared_ptr<PKL> pkl)
 }
 
 
-vector<VerificationNote>
-dcp::verify (
-       vector<boost::filesystem::path> directories,
+static
+void
+verify_reel(
+       shared_ptr<const DCP> dcp,
+       shared_ptr<const CPL> cpl,
+       shared_ptr<const Reel> reel,
+       optional<dcp::Size> main_picture_active_area,
        function<void (string, optional<boost::filesystem::path>)> stage,
+       boost::filesystem::path xsd_dtd_directory,
        function<void (float)> progress,
-       optional<boost::filesystem::path> xsd_dtd_directory
+       VerificationOptions options,
+       vector<VerificationNote>& notes,
+       State& state,
+       bool* have_main_subtitle,
+       bool* have_no_main_subtitle,
+       size_t* most_closed_captions,
+       size_t* fewest_closed_captions,
+       map<Marker, Time>* markers_seen
        )
 {
-       if (!xsd_dtd_directory) {
-               xsd_dtd_directory = resources_directory() / "xsd";
+       for (auto i: reel->assets()) {
+               if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_DURATION, i->id()});
+               }
+               if ((i->intrinsic_duration() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_INTRINSIC_DURATION, i->id()});
+               }
+               auto file_asset = dynamic_pointer_cast<ReelFileAsset>(i);
+               if (i->encryptable() && !file_asset->hash()) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_HASH, i->id()});
+               }
        }
-       *xsd_dtd_directory = boost::filesystem::canonical (*xsd_dtd_directory);
 
-       vector<VerificationNote> notes;
-       State state{};
+       if (dcp->standard() == Standard::SMPTE) {
+               boost::optional<int64_t> duration;
+               for (auto i: reel->assets()) {
+                       if (!duration) {
+                               duration = i->actual_duration();
+                       } else if (*duration != i->actual_duration()) {
+                               notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_ASSET_DURATION});
+                               break;
+                       }
+               }
+       }
 
-       vector<shared_ptr<DCP>> dcps;
-       for (auto i: directories) {
-               dcps.push_back (make_shared<DCP>(i));
+       if (reel->main_picture()) {
+               /* Check reel stuff */
+               auto const frame_rate = reel->main_picture()->frame_rate();
+               if (frame_rate.denominator != 1 ||
+                   (frame_rate.numerator != 24 &&
+                    frame_rate.numerator != 25 &&
+                    frame_rate.numerator != 30 &&
+                    frame_rate.numerator != 48 &&
+                    frame_rate.numerator != 50 &&
+                    frame_rate.numerator != 60 &&
+                    frame_rate.numerator != 96)) {
+                       notes.push_back({
+                               VerificationNote::Type::ERROR,
+                               VerificationNote::Code::INVALID_PICTURE_FRAME_RATE,
+                               String::compose("%1/%2", frame_rate.numerator, frame_rate.denominator)
+                       });
+               }
+               /* Check asset */
+               if (reel->main_picture()->asset_ref().resolved()) {
+                       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) {
+                                       notes.push_back({
+                                                       VerificationNote::Type::ERROR,
+                                                       VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
+                                                       String::compose("width %1 is bigger than the asset width %2", main_picture_active_area->width, asset_size.width),
+                                                       cpl->file().get()
+                                                       });
+                               }
+                               if (main_picture_active_area->height > asset_size.height) {
+                                       notes.push_back({
+                                                       VerificationNote::Type::ERROR,
+                                                       VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
+                                                       String::compose("height %1 is bigger than the asset height %2", main_picture_active_area->height, asset_size.height),
+                                                       cpl->file().get()
+                                                       });
+                               }
+                       }
+               }
        }
 
-       for (auto dcp: dcps) {
-               stage ("Checking DCP", dcp->directory());
-               bool carry_on = true;
-               try {
-                       dcp->read (&notes, true);
-               } catch (MissingAssetmapError& e) {
-                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
-                       carry_on = false;
-               } catch (ReadError& e) {
-                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
-               } catch (XMLError& e) {
-                       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 (cxml::Error& e) {
-                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+       if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
+               verify_main_sound_asset(dcp, reel->main_sound(), stage, progress, options, notes, state);
+       }
+
+       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(), reel->main_subtitle()->duration(), stage, xsd_dtd_directory, notes, state);
                }
+               *have_main_subtitle = true;
+       } else {
+               *have_no_main_subtitle = true;
+       }
 
-               if (!carry_on) {
-                       continue;
+       for (auto i: reel->closed_captions()) {
+               verify_closed_caption_reel(i, notes);
+               if (i->asset_ref().resolved()) {
+                       verify_closed_caption_asset(i->asset(), i->duration(), stage, xsd_dtd_directory, notes);
                }
+       }
 
-               if (dcp->standard() != Standard::SMPTE) {
-                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_STANDARD});
+       if (reel->main_markers()) {
+               for (auto const& i: reel->main_markers()->get()) {
+                       markers_seen->insert(i);
                }
+               if (reel->main_markers()->entry_point()) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::UNEXPECTED_ENTRY_POINT});
+               }
+               if (reel->main_markers()->duration()) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::UNEXPECTED_DURATION});
+               }
+       }
 
-               for (auto cpl: dcp->cpls()) {
-                       stage ("Checking CPL", cpl->file());
-                       validate_xml (cpl->file().get(), *xsd_dtd_directory, notes);
+       *fewest_closed_captions = std::min(*fewest_closed_captions, reel->closed_captions().size());
+       *most_closed_captions = std::max(*most_closed_captions, reel->closed_captions().size());
 
-                       if (cpl->any_encrypted() && !cpl->all_encrypted()) {
-                               notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::PARTIALLY_ENCRYPTED});
-                       }
+}
 
-                       for (auto const& i: cpl->additional_subtitle_languages()) {
-                               verify_language_tag (i, notes);
-                       }
 
-                       if (!cpl->content_kind().scope() || *cpl->content_kind().scope() == "http://www.smpte-ra.org/schemas/429-7/2006/CPL#standard-content") {
-                               /* This is a content kind from http://www.smpte-ra.org/schemas/429-7/2006/CPL#standard-content; make sure it's one
-                                * of the approved ones.
-                                */
-                               auto all = ContentKind::all();
-                               auto name = cpl->content_kind().name();
-                               transform(name.begin(), name.end(), name.begin(), ::tolower);
-                               auto iter = std::find_if(all.begin(), all.end(), [name](ContentKind const& k) { return !k.scope() && k.name() == name; });
-                               if (iter == all.end()) {
-                                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_CONTENT_KIND, cpl->content_kind().name()});
+static
+void
+verify_cpl(
+       shared_ptr<const DCP> dcp,
+       shared_ptr<const CPL> cpl,
+       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
+       )
+{
+       stage("Checking CPL", cpl->file());
+       validate_xml(cpl->file().get(), xsd_dtd_directory, notes);
+
+       if (cpl->any_encrypted() && !cpl->all_encrypted()) {
+               notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::PARTIALLY_ENCRYPTED});
+       }
+
+       for (auto const& i: cpl->additional_subtitle_languages()) {
+               verify_language_tag(i, notes);
+       }
+
+       if (!cpl->content_kind().scope() || *cpl->content_kind().scope() == "http://www.smpte-ra.org/schemas/429-7/2006/CPL#standard-content") {
+               /* This is a content kind from http://www.smpte-ra.org/schemas/429-7/2006/CPL#standard-content; make sure it's one
+                * of the approved ones.
+                */
+               auto all = ContentKind::all();
+               auto name = cpl->content_kind().name();
+               transform(name.begin(), name.end(), name.begin(), ::tolower);
+               auto iter = std::find_if(all.begin(), all.end(), [name](ContentKind const& k) { return !k.scope() && k.name() == name; });
+               if (iter == all.end()) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_CONTENT_KIND, cpl->content_kind().name()});
+               }
+       }
+
+       if (cpl->release_territory()) {
+               if (!cpl->release_territory_scope() || cpl->release_territory_scope().get() != "http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata#scope/release-territory/UNM49") {
+                       auto terr = cpl->release_territory().get();
+                       /* Must be a valid region tag, or "001" */
+                       try {
+                               LanguageTag::RegionSubtag test(terr);
+                       } catch (...) {
+                               if (terr != "001") {
+                                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_LANGUAGE, terr});
                                }
                        }
+               }
+       }
 
-                       if (cpl->release_territory()) {
-                               if (!cpl->release_territory_scope() || cpl->release_territory_scope().get() != "http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata#scope/release-territory/UNM49") {
-                                       auto terr = cpl->release_territory().get();
-                                       /* Must be a valid region tag, or "001" */
-                                       try {
-                                               LanguageTag::RegionSubtag test (terr);
-                                       } catch (...) {
-                                               if (terr != "001") {
-                                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_LANGUAGE, terr});
-                                               }
+       if (dcp->standard() == Standard::SMPTE) {
+               if (!cpl->annotation_text()) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
+               } else if (cpl->annotation_text().get() != cpl->content_title_text()) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
+               }
+       }
+
+       for (auto i: dcp->pkls()) {
+               /* Check that the CPL's hash corresponds to the PKL */
+               optional<string> h = i->hash(cpl->id());
+               if (h && make_digest(ArrayData(*cpl->file())) != *h) {
+                       notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()});
+               }
+
+               /* 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->assets()) {
+                       /* See if this is a CPL */
+                       for (auto k: dcp->cpls()) {
+                               if (j->id() == k->id()) {
+                                       if (!required_annotation_text) {
+                                               /* First CPL we have found; this is the required AnnotationText unless we find another */
+                                               required_annotation_text = cpl->content_title_text();
+                                       } else {
+                                               /* There's more than one CPL so we don't care what the PKL's AnnotationText is */
+                                               required_annotation_text = boost::none;
                                        }
                                }
                        }
+               }
 
-                       if (dcp->standard() == Standard::SMPTE) {
-                               if (!cpl->annotation_text()) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
-                               } else if (cpl->annotation_text().get() != cpl->content_title_text()) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), cpl->file().get()});
-                               }
-                       }
+               if (required_annotation_text && i->annotation_text() != required_annotation_text) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()});
+               }
+       }
 
-                       for (auto i: dcp->pkls()) {
-                               /* Check that the CPL's hash corresponds to the PKL */
-                               optional<string> h = i->hash(cpl->id());
-                               if (h && make_digest(ArrayData(*cpl->file())) != *h) {
-                                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get()});
-                               }
+       /* set to true if any reel has a MainSubtitle */
+       auto have_main_subtitle = false;
+       /* set to true if any reel has no MainSubtitle */
+       auto have_no_main_subtitle = false;
+       /* fewest number of closed caption assets seen in a reel */
+       size_t fewest_closed_captions = SIZE_MAX;
+       /* most number of closed caption assets seen in a reel */
+       size_t most_closed_captions = 0;
+       map<Marker, Time> markers_seen;
 
-                               /* 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()) {
-                                       /* See if this is a CPL */
-                                       for (auto k: dcp->cpls()) {
-                                               if (j->id() == k->id()) {
-                                                       if (!required_annotation_text) {
-                                                               /* First CPL we have found; this is the required AnnotationText unless we find another */
-                                                               required_annotation_text = cpl->content_title_text();
-                                                       } else {
-                                                               /* There's more than one CPL so we don't care what the PKL's AnnotationText is */
-                                                               required_annotation_text = boost::none;
-                                                       }
-                                               }
-                                       }
-                               }
+       auto const main_picture_active_area = cpl->main_picture_active_area();
+       if (main_picture_active_area && (main_picture_active_area->width % 2)) {
+               notes.push_back({
+                               VerificationNote::Type::ERROR,
+                               VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
+                               String::compose("width %1 is not a multiple of 2", main_picture_active_area->width),
+                               cpl->file().get()
+                       });
+       }
+       if (main_picture_active_area && (main_picture_active_area->height % 2)) {
+               notes.push_back({
+                               VerificationNote::Type::ERROR,
+                               VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
+                               String::compose("height %1 is not a multiple of 2", main_picture_active_area->height),
+                               cpl->file().get()
+                       });
+       }
 
-                               if (required_annotation_text && i->annotation_text() != required_annotation_text) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()});
-                               }
-                       }
+       for (auto reel: cpl->reels()) {
+               stage("Checking reel", optional<boost::filesystem::path>());
+               verify_reel(
+                       dcp,
+                       cpl,
+                       reel,
+                       main_picture_active_area,
+                       stage,
+                       xsd_dtd_directory,
+                       progress,
+                       options,
+                       notes,
+                       state,
+                       &have_main_subtitle,
+                       &have_no_main_subtitle,
+                       &most_closed_captions,
+                       &fewest_closed_captions,
+                       &markers_seen
+                       );
+       }
+
+       verify_text_details(cpl->reels(), notes);
 
-                       /* set to true if any reel has a MainSubtitle */
-                       auto have_main_subtitle = false;
-                       /* set to true if any reel has no MainSubtitle */
-                       auto have_no_main_subtitle = false;
-                       /* fewest number of closed caption assets seen in a reel */
-                       size_t fewest_closed_captions = SIZE_MAX;
-                       /* most number of closed caption assets seen in a reel */
-                       size_t most_closed_captions = 0;
-                       map<Marker, Time> markers_seen;
-
-                       auto const main_picture_active_area = cpl->main_picture_active_area();
-                       if (main_picture_active_area && (main_picture_active_area->width % 2)) {
+       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_PICTURE_ACTIVE_AREA,
-                                               String::compose("width %1 is not a multiple of 2", main_picture_active_area->width),
+                                               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 (main_picture_active_area && (main_picture_active_area->height % 2)) {
-                               notes.push_back({
-                                               VerificationNote::Type::ERROR,
-                                               VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
-                                               String::compose("height %1 is not a multiple of 2", main_picture_active_area->height),
-                                               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});
+               }
+
+               if (fewest_closed_captions != most_closed_captions) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS});
+               }
+
+               if (cpl->content_kind() == ContentKind::FEATURE) {
+                       if (markers_seen.find(Marker::FFEC) == markers_seen.end()) {
+                               notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFEC_IN_FEATURE});
+                       }
+                       if (markers_seen.find(Marker::FFMC) == markers_seen.end()) {
+                               notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFMC_IN_FEATURE});
                        }
+               }
 
-                       for (auto reel: cpl->reels()) {
-                               stage ("Checking reel", optional<boost::filesystem::path>());
+               auto ffoc = markers_seen.find(Marker::FFOC);
+               if (ffoc == markers_seen.end()) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_FFOC});
+               } else if (ffoc->second.e != 1) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
+               }
 
-                               for (auto i: reel->assets()) {
-                                       if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
-                                               notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_DURATION, i->id()});
-                                       }
-                                       if ((i->intrinsic_duration() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
-                                               notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_INTRINSIC_DURATION, i->id()});
-                                       }
-                                       auto file_asset = dynamic_pointer_cast<ReelFileAsset>(i);
-                                       if (i->encryptable() && !file_asset->hash()) {
-                                               notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_HASH, i->id()});
-                                       }
-                               }
+               auto lfoc = markers_seen.find(Marker::LFOC);
+               if (lfoc == markers_seen.end()) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_LFOC});
+               } else {
+                       auto lfoc_time = lfoc->second.as_editable_units_ceil(lfoc->second.tcr);
+                       if (lfoc_time != (cpl->reels().back()->duration() - 1)) {
+                               notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
+                       }
+               }
 
-                               if (dcp->standard() == Standard::SMPTE) {
-                                       boost::optional<int64_t> duration;
-                                       for (auto i: reel->assets()) {
-                                               if (!duration) {
-                                                       duration = i->actual_duration();
-                                               } else if (*duration != i->actual_duration()) {
-                                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_ASSET_DURATION});
-                                                       break;
-                                               }
-                                       }
-                               }
+               LinesCharactersResult result;
+               for (auto reel: cpl->reels()) {
+                       if (reel->main_subtitle() && reel->main_subtitle()->asset()) {
+                               verify_text_lines_and_characters(reel->main_subtitle()->asset(), 52, 79, &result);
+                       }
+               }
 
-                               if (reel->main_picture()) {
-                                       /* Check reel stuff */
-                                       auto const frame_rate = reel->main_picture()->frame_rate();
-                                       if (frame_rate.denominator != 1 ||
-                                           (frame_rate.numerator != 24 &&
-                                            frame_rate.numerator != 25 &&
-                                            frame_rate.numerator != 30 &&
-                                            frame_rate.numerator != 48 &&
-                                            frame_rate.numerator != 50 &&
-                                            frame_rate.numerator != 60 &&
-                                            frame_rate.numerator != 96)) {
-                                               notes.push_back ({
-                                                       VerificationNote::Type::ERROR,
-                                                       VerificationNote::Code::INVALID_PICTURE_FRAME_RATE,
-                                                       String::compose("%1/%2", frame_rate.numerator, frame_rate.denominator)
-                                               });
-                                       }
-                                       /* Check asset */
-                                       if (reel->main_picture()->asset_ref().resolved()) {
-                                               verify_main_picture_asset (dcp, reel->main_picture(), stage, progress, notes);
-                                               auto const asset_size = reel->main_picture()->asset()->size();
-                                               if (main_picture_active_area) {
-                                                       if (main_picture_active_area->width > asset_size.width) {
-                                                               notes.push_back({
-                                                                               VerificationNote::Type::ERROR,
-                                                                               VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
-                                                                               String::compose("width %1 is bigger than the asset width %2", main_picture_active_area->width, asset_size.width),
-                                                                               cpl->file().get()
-                                                                               });
-                                                       }
-                                                       if (main_picture_active_area->height > asset_size.height) {
-                                                               notes.push_back({
-                                                                               VerificationNote::Type::ERROR,
-                                                                               VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA,
-                                                                               String::compose("height %1 is bigger than the asset height %2", main_picture_active_area->height, asset_size.height),
-                                                                               cpl->file().get()
-                                                                               });
-                                                       }
-                                               }
-                                       }
-                               }
+               if (result.line_count_exceeded) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT});
+               }
+               if (result.error_length_exceeded) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH});
+               } else if (result.warning_length_exceeded) {
+                       notes.push_back({VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH});
+               }
 
-                               if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
-                                       verify_main_sound_asset (dcp, reel->main_sound(), stage, progress, notes);
+               result = LinesCharactersResult();
+               for (auto reel: cpl->reels()) {
+                       for (auto i: reel->closed_captions()) {
+                               if (i->asset()) {
+                                       verify_text_lines_and_characters(i->asset(), 32, 32, &result);
                                }
+                       }
+               }
 
-                               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(), reel->main_subtitle()->duration(), stage, *xsd_dtd_directory, notes, state);
-                                       }
-                                       have_main_subtitle = true;
-                               } else {
-                                       have_no_main_subtitle = true;
-                               }
+               if (result.line_count_exceeded) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT});
+               }
+               if (result.error_length_exceeded) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH});
+               }
 
-                               for (auto i: reel->closed_captions()) {
-                                       verify_closed_caption_reel (i, notes);
-                                       if (i->asset_ref().resolved()) {
-                                               verify_closed_caption_asset (i->asset(), i->duration(), stage, *xsd_dtd_directory, notes);
-                                       }
-                               }
+               if (!cpl->read_composition_metadata()) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get()});
+               } else if (!cpl->version_number()) {
+                       notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get()});
+               }
 
-                               if (reel->main_markers()) {
-                                       for (auto const& i: reel->main_markers()->get()) {
-                                               markers_seen.insert (i);
-                                       }
-                                       if (reel->main_markers()->entry_point()) {
-                                               notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::UNEXPECTED_ENTRY_POINT});
-                                       }
-                                       if (reel->main_markers()->duration()) {
-                                               notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::UNEXPECTED_DURATION});
-                                       }
-                               }
+               verify_extension_metadata(cpl, notes);
 
-                               fewest_closed_captions = std::min (fewest_closed_captions, reel->closed_captions().size());
-                               most_closed_captions = std::max (most_closed_captions, reel->closed_captions().size());
+               if (cpl->any_encrypted()) {
+                       cxml::Document doc("CompositionPlaylist");
+                       DCP_ASSERT(cpl->file());
+                       doc.read_file(cpl->file().get());
+                       if (!doc.optional_node_child("Signature")) {
+                               notes.push_back({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
                        }
+               }
+       }
+}
 
-                       verify_text_details (cpl->reels(), notes);
 
-                       if (dcp->standard() == Standard::SMPTE) {
+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 (have_main_subtitle && have_no_main_subtitle) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS});
-                               }
+       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()});
+               }
+       }
 
-                               if (fewest_closed_captions != most_closed_captions) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS});
-                               }
+       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;
+               }
+       }
+}
 
-                               if (cpl->content_kind() == ContentKind::FEATURE) {
-                                       if (markers_seen.find(Marker::FFEC) == markers_seen.end()) {
-                                               notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFEC_IN_FEATURE});
-                                       }
-                                       if (markers_seen.find(Marker::FFMC) == markers_seen.end()) {
-                                               notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_FFMC_IN_FEATURE});
-                                       }
-                               }
 
-                               auto ffoc = markers_seen.find(Marker::FFOC);
-                               if (ffoc == markers_seen.end()) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_FFOC});
-                               } else if (ffoc->second.e != 1) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
-                               }
 
-                               auto lfoc = markers_seen.find(Marker::LFOC);
-                               if (lfoc == markers_seen.end()) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_LFOC});
-                               } else {
-                                       auto lfoc_time = lfoc->second.as_editable_units_ceil(lfoc->second.tcr);
-                                       if (lfoc_time != (cpl->reels().back()->duration() - 1)) {
-                                               notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
-                                       }
-                               }
+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);
 
-                               LinesCharactersResult result;
-                               for (auto reel: cpl->reels()) {
-                                       if (reel->main_subtitle() && reel->main_subtitle()->asset()) {
-                                               verify_text_lines_and_characters (reel->main_subtitle()->asset(), 52, 79, &result);
-                                       }
-                               }
+       validate_xml(asset_map->file().get(), xsd_dtd_directory, notes);
 
-                               if (result.line_count_exceeded) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT});
-                               }
-                               if (result.error_length_exceeded) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH});
-                               } else if (result.warning_length_exceeded) {
-                                       notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH});
-                               }
+       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;
+               }
+       }
+}
 
-                               result = LinesCharactersResult();
-                               for (auto reel: cpl->reels()) {
-                                       for (auto i: reel->closed_captions()) {
-                                               if (i->asset()) {
-                                                       verify_text_lines_and_characters (i->asset(), 32, 32, &result);
-                                               }
-                                       }
-                               }
 
-                               if (result.line_count_exceeded) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT});
-                               }
-                               if (result.error_length_exceeded) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH});
-                               }
+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
+       )
+{
+       if (!xsd_dtd_directory) {
+               xsd_dtd_directory = resources_directory() / "xsd";
+       }
+       *xsd_dtd_directory = boost::filesystem::canonical (*xsd_dtd_directory);
 
-                               if (!cpl->read_composition_metadata()) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get()});
-                               } else if (!cpl->version_number()) {
-                                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get()});
-                               }
+       vector<VerificationNote> notes;
+       State state{};
 
-                               verify_extension_metadata (cpl, notes);
+       vector<shared_ptr<DCP>> dcps;
+       for (auto i: directories) {
+               dcps.push_back (make_shared<DCP>(i));
+       }
 
-                               if (cpl->any_encrypted()) {
-                                       cxml::Document doc ("CompositionPlaylist");
-                                       DCP_ASSERT (cpl->file());
-                                       doc.read_file (cpl->file().get());
-                                       if (!doc.optional_node_child("Signature")) {
-                                               notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl->id(), cpl->file().get()});
-                                       }
-                               }
-                       }
+       for (auto dcp: dcps) {
+               stage ("Checking DCP", dcp->directory());
+               bool carry_on = true;
+               try {
+                       dcp->read (&notes, true);
+               } catch (MissingAssetmapError& e) {
+                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+                       carry_on = false;
+               } catch (ReadError& e) {
+                       notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+               } catch (XMLError& e) {
+                       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())});
+               }
+
+               if (!carry_on) {
+                       continue;
+               }
+
+               if (dcp->standard() != Standard::SMPTE) {
+                       notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_STANDARD});
+               }
+
+               for (auto cpl: dcp->cpls()) {
+                       verify_cpl(
+                               dcp,
+                               cpl,
+                               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});
                }
@@ -1664,7 +1876,7 @@ dcp::note_to_string (VerificationNote note)
        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:
@@ -1824,6 +2036,29 @@ dcp::note_to_string (VerificationNote note)
                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 "";