Don't use flat_red.j2c for the simple DCP test as it's only 8-bit.
[libdcp.git] / test / verify_test.cc
index 2ff66f6945f13ec89169ed3f9ecac4b3c6a00fe1..f5a012a629f93ccd55ad26142640ccd851b3bbb8 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
     files in the program, then also delete it here.
 */
 
-#include "verify.h"
-#include "util.h"
 #include "compose.hpp"
+#include "cpl.h"
+#include "dcp.h"
+#include "interop_subtitle_asset.h"
+#include "j2k_transcode.h"
+#include "mono_picture_asset.h"
+#include "mono_picture_asset_writer.h"
+#include "openjpeg_image.h"
+#include "raw_convert.h"
+#include "reel.h"
+#include "reel_closed_caption_asset.h"
+#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_stereo_picture_asset.h"
+#include "reel_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "stereo_picture_asset.h"
+#include "stream_operators.h"
+#include "test.h"
+#include "util.h"
+#include "verify.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <cstdio>
 #include <iostream>
@@ -45,13 +63,19 @@ using std::pair;
 using std::string;
 using std::vector;
 using std::make_pair;
+using std::make_shared;
 using boost::optional;
+using namespace boost::filesystem;
+using std::shared_ptr;
 
-static list<pair<string, optional<boost::filesystem::path> > > stages;
-static int next_verify_test_number = 1;
+
+static list<pair<string, optional<path>>> stages;
+static string const dcp_test1_pkl = "pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml";
+static string const dcp_test1_cpl_id = "81fb54df-e1bf-4647-8788-ea7ba154375b";
+static string const dcp_test1_cpl = "cpl_" + dcp_test1_cpl_id + ".xml";
 
 static void
-stage (string s, optional<boost::filesystem::path> p)
+stage (string s, optional<path> p)
 {
        stages.push_back (make_pair (s, p));
 }
@@ -62,25 +86,59 @@ progress (float)
 
 }
 
-static vector<boost::filesystem::path>
-setup (int reference_number, int verify_test_number)
+static void
+prepare_directory (path path)
+{
+       using namespace boost::filesystem;
+       remove_all (path);
+       create_directories (path);
+}
+
+
+static path
+setup (int reference_number, string verify_test_suffix)
 {
-       boost::filesystem::remove_all (dcp::String::compose("build/test/verify_test%1", verify_test_number));
-       boost::filesystem::create_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number));
-       for (boost::filesystem::directory_iterator i(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number)); i != boost::filesystem::directory_iterator(); ++i) {
-               boost::filesystem::copy_file (i->path(), dcp::String::compose("build/test/verify_test%1", verify_test_number) / i->path().filename());
+       auto const dir = dcp::String::compose("build/test/verify_test%1", verify_test_suffix);
+       prepare_directory (dir);
+       for (auto i: directory_iterator(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number))) {
+               copy_file (i.path(), dir / i.path().filename());
        }
 
-       vector<boost::filesystem::path> directories;
-       directories.push_back (dcp::String::compose("build/test/verify_test%1", verify_test_number));
-       return directories;
+       return dir;
+}
+
+
+static
+shared_ptr<dcp::CPL>
+write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dcp::Standard standard = dcp::Standard::SMPTE)
+{
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (reel_asset);
+       reel->add (simple_markers());
+
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       dcp->add (cpl);
+       dcp->write_xml (
+               standard,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
 
+       return cpl;
 }
 
+
+/** Class that can alter a file by searching and replacing strings within it.
+ *  On destruction modifies the file whose name was given to the constructor.
+ */
 class Editor
 {
 public:
-       Editor (boost::filesystem::path path)
+       Editor (path path)
                : _path(path)
        {
                _content = dcp::file_to_string (_path);
@@ -88,7 +146,7 @@ public:
 
        ~Editor ()
        {
-               FILE* f = fopen(_path.string().c_str(), "w");
+               auto f = fopen(_path.string().c_str(), "w");
                BOOST_REQUIRE (f);
                fwrite (_content.c_str(), _content.length(), 1, f);
                fclose (f);
@@ -96,400 +154,2577 @@ public:
 
        void replace (string a, string b)
        {
+               auto old_content = _content;
                boost::algorithm::replace_all (_content, a, b);
+               BOOST_REQUIRE (_content != old_content);
+       }
+
+       void delete_lines (string from, string to)
+       {
+               vector<string> lines;
+               boost::algorithm::split (lines, _content, boost::is_any_of("\r\n"), boost::token_compress_on);
+               bool deleting = false;
+               auto old_content = _content;
+               _content = "";
+               for (auto i: lines) {
+                       if (i.find(from) != string::npos) {
+                               deleting = true;
+                       }
+                       if (!deleting) {
+                               _content += i + "\n";
+                       }
+                       if (deleting && i.find(to) != string::npos) {
+                               deleting = false;
+                       }
+               }
+               BOOST_REQUIRE (_content != old_content);
        }
 
 private:
-       boost::filesystem::path _path;
+       path _path;
        std::string _content;
 };
 
+
 static
 void
-dump_notes (list<dcp::VerificationNote> const & notes)
+dump_notes (vector<dcp::VerificationNote> const & notes)
 {
-       BOOST_FOREACH (dcp::VerificationNote i, notes) {
+       for (auto i: notes) {
                std::cout << dcp::note_to_string(i) << "\n";
        }
 }
 
-/* Check DCP as-is (should be OK) */
-BOOST_AUTO_TEST_CASE (verify_test1)
+
+static
+void
+check_verify_result (vector<path> dir, vector<dcp::VerificationNote> test_notes)
+{
+       auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+       BOOST_REQUIRE_EQUAL (notes.size(), test_notes.size());
+       for (auto i = 0U; i < notes.size(); ++i) {
+               BOOST_REQUIRE_EQUAL (notes[i], test_notes[i]);
+       }
+}
+
+
+static
+void
+check_verify_result_after_replace (string suffix, boost::function<path (string)> file, string from, string to, vector<dcp::VerificationNote::Code> codes)
+{
+       auto dir = setup (1, suffix);
+
+       {
+               Editor e (file(suffix));
+               e.replace (from, to);
+       }
+
+       auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
+
+       BOOST_REQUIRE_EQUAL (notes.size(), codes.size());
+       auto i = notes.begin();
+       auto j = codes.begin();
+       while (i != notes.end()) {
+               BOOST_CHECK_EQUAL (i->code(), *j);
+               ++i;
+               ++j;
+       }
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_no_error)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       auto dir = setup (1, "no_error");
+       auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test1/ASSETMAP.xml", next_verify_test_number);
+       path const cpl_file = dir / dcp_test1_cpl;
+       path const pkl_file = dir / dcp_test1_pkl;
+       path const assetmap_file = dir / "ASSETMAP.xml";
 
-       list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
+       auto st = stages.begin();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(cpl_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(cpl_file));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking reel");
        BOOST_REQUIRE (!st->second);
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/video.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "video.mxf"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "video.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/audio.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "audio.mxf"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "audio.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(pkl_file));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking ASSETMAP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(assetmap_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(assetmap_file));
        ++st;
        BOOST_REQUIRE (st == stages.end());
 
-       dump_notes (notes);
-
        BOOST_CHECK_EQUAL (notes.size(), 0);
-
-       next_verify_test_number++;
 }
 
-/* Corrupt the MXFs and check that this is spotted */
-BOOST_AUTO_TEST_CASE (verify_test2)
+
+BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       using namespace boost::filesystem;
 
-       FILE* mod = fopen("build/test/verify_test2/video.mxf", "r+b");
+       auto dir = setup (1, "incorrect_picture_sound_hash");
+
+       auto video_path = path(dir / "video.mxf");
+       auto mod = fopen(video_path.string().c_str(), "r+b");
        BOOST_REQUIRE (mod);
        fseek (mod, 4096, SEEK_SET);
        int x = 42;
        fwrite (&x, sizeof(x), 1, mod);
        fclose (mod);
 
-       mod = fopen("build/test/verify_test2/audio.mxf", "r+b");
+       auto audio_path = path(dir / "audio.mxf");
+       mod = fopen(audio_path.string().c_str(), "r+b");
        BOOST_REQUIRE (mod);
-       fseek (mod, 4096, SEEK_SET);
+       BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0);
        BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
        fclose (mod);
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 2);
-       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_HASH_INCORRECT);
-       BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::SOUND_HASH_INCORRECT);
+       dcp::ASDCPErrorSuspender sus;
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_PICTURE_HASH, canonical(video_path) },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INCORRECT_SOUND_HASH, canonical(audio_path) },
+               });
 }
 
-/* Corrupt the hashes in the PKL and check that the disagreement between CPL and PKL is spotted */
-BOOST_AUTO_TEST_CASE (verify_test3)
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       using namespace boost::filesystem;
+
+       auto dir = setup (1, "mismatched_picture_sound_hashes");
 
        {
-               Editor e ("build/test/verify_test3/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml");
+               Editor e (dir / dcp_test1_pkl);
                e.replace ("<Hash>", "<Hash>x");
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xX3bMCBdXEOYEpYmsConNWrWUAGs=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xaddO7je2lZSNQp55qjCWo5DLKFQ=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xqtXbkcwhUj/yqquVLmV+wbzbxQ8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 }
+               });
+}
+
 
-       dump_notes (notes);
+BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
+{
+       auto dir = setup (1, "failed_read_content_kind");
 
-       BOOST_REQUIRE_EQUAL (notes.size(), 6);
-       list<dcp::VerificationNote>::const_iterator i = notes.begin();
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT);
-       ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE);
-       ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE);
-       ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
-       ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
-       ++i;
-       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
-       ++i;
-}
-
-/* Corrupt the ContentKind in the CPL */
-BOOST_AUTO_TEST_CASE (verify_test4)
-{
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
-
-       {
-               Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
+       {
+               Editor e (dir / dcp_test1_cpl);
                e.replace ("<ContentKind>", "<ContentKind>x");
        }
 
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 1);
-       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::GENERAL_READ);
-       BOOST_CHECK_EQUAL (*notes.front().note(), "Bad content kind 'xfeature'");
+       check_verify_result (
+               { dir },
+               {{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("Bad content kind 'xtrailer'")}}
+               );
 }
 
-static
-boost::filesystem::path
-cpl (int n)
-{
-       return dcp::String::compose("build/test/verify_test%1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml", n);
-}
 
 static
-boost::filesystem::path
-pkl (int n)
+path
+cpl (string suffix)
 {
-       return dcp::String::compose("build/test/verify_test%1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", n);
+       return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_cpl);
 }
 
-static
-boost::filesystem::path
-asset_map (int n)
-{
-       return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", n);
-}
 
 static
-void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1)
+path
+pkl (string suffix)
 {
-       vector<boost::filesystem::path> directories = setup (1, n);
-
-       {
-               Editor e (file(n));
-               e.replace (from, to);
-       }
-
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 1);
-       BOOST_CHECK_EQUAL (notes.front().code(), code1);
+       return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_pkl);
 }
 
-static
-void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1, dcp::VerificationNote::Code code2)
-{
-       vector<boost::filesystem::path> directories = setup (1, n);
-
-       {
-               Editor e (file(n));
-               e.replace (from, to);
-       }
-
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 2);
-       BOOST_CHECK_EQUAL (notes.front().code(), code1);
-       BOOST_CHECK_EQUAL (notes.back().code(), code2);
-}
 
 static
-void check_after_replace (
-       int n, boost::function<boost::filesystem::path (int)> file,
-       string from,
-       string to,
-       dcp::VerificationNote::Code code1,
-       dcp::VerificationNote::Code code2,
-       dcp::VerificationNote::Code code3
-       )
+path
+asset_map (string suffix)
 {
-       vector<boost::filesystem::path> directories = setup (1, n);
-
-       {
-               Editor e (file(n));
-               e.replace (from, to);
-       }
-
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       dump_notes (notes);
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 3);
-       list<dcp::VerificationNote>::const_iterator i = notes.begin ();
-       BOOST_CHECK_EQUAL (i->code(), code1);
-       ++i;
-       BOOST_CHECK_EQUAL (i->code(), code2);
-       ++i;
-       BOOST_CHECK_EQUAL (i->code(), code3);
+       return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", suffix);
 }
 
-/* FrameRate */
-BOOST_AUTO_TEST_CASE (verify_test5)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_rate)
 {
-       check_after_replace (
-                       next_verify_test_number++, &cpl,
+       check_verify_result_after_replace (
+                       "invalid_picture_frame_rate", &cpl,
                        "<FrameRate>24 1", "<FrameRate>99 1",
-                       dcp::VerificationNote::CPL_HASH_INCORRECT,
-                       dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE
+                       { dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES,
+                         dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE }
                        );
 }
 
-/* Missing asset */
-BOOST_AUTO_TEST_CASE (verify_test6)
+BOOST_AUTO_TEST_CASE (verify_missing_asset)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
-
-       boost::filesystem::remove ("build/test/verify_test6/video.mxf");
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
-
-       BOOST_REQUIRE_EQUAL (notes.size(), 1);
-       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::MISSING_ASSET);
+       auto dir = setup (1, "missing_asset");
+       remove (dir / "video.mxf");
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISSING_ASSET, canonical(dir) / "video.mxf" }
+               });
 }
 
-static
-boost::filesystem::path
-assetmap (int n)
-{
-       return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", n);
-}
 
-/* Empty asset filename in ASSETMAP */
-BOOST_AUTO_TEST_CASE (verify_test7)
+BOOST_AUTO_TEST_CASE (verify_empty_asset_path)
 {
-       check_after_replace (
-                       next_verify_test_number++, &assetmap,
+       check_verify_result_after_replace (
+                       "empty_asset_path", &asset_map,
                        "<Path>video.mxf</Path>", "<Path></Path>",
-                       dcp::VerificationNote::EMPTY_ASSET_PATH
+                       { dcp::VerificationNote::Code::EMPTY_ASSET_PATH }
                        );
 }
 
-/* Mismatched standard */
-BOOST_AUTO_TEST_CASE (verify_test8)
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_standard)
 {
-       check_after_replace (
-                       next_verify_test_number++, &cpl,
+       check_verify_result_after_replace (
+                       "mismatched_standard", &cpl,
                        "http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#",
-                       dcp::VerificationNote::MISMATCHED_STANDARD,
-                       dcp::VerificationNote::XML_VALIDATION_ERROR,
-                       dcp::VerificationNote::CPL_HASH_INCORRECT
+                       { dcp::VerificationNote::Code::MISMATCHED_STANDARD,
+                         dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES }
                        );
 }
 
-/* Badly formatted <Id> in CPL */
-BOOST_AUTO_TEST_CASE (verify_test9)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
 {
-       /* There's no CPL_HASH_INCORRECT error here because it can't find the correct hash by ID (since the ID is wrong) */
-       check_after_replace (
-                       next_verify_test_number++, &cpl,
+       /* There's no MISMATCHED_CPL_HASHES error here because it can't find the correct hash by ID (since the ID is wrong) */
+       check_verify_result_after_replace (
+                       "invalid_xml_cpl_id", &cpl,
                        "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
-                       dcp::VerificationNote::XML_VALIDATION_ERROR
+                       { dcp::VerificationNote::Code::INVALID_XML }
                        );
 }
 
-/* Badly formatted <IssueDate> in CPL */
-BOOST_AUTO_TEST_CASE (verify_test10)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_issue_date)
 {
-       check_after_replace (
-                       next_verify_test_number++, &cpl,
+       check_verify_result_after_replace (
+                       "invalid_xml_issue_date", &cpl,
                        "<IssueDate>", "<IssueDate>x",
-                       dcp::VerificationNote::XML_VALIDATION_ERROR,
-                       dcp::VerificationNote::CPL_HASH_INCORRECT
+                       { dcp::VerificationNote::Code::INVALID_XML,
+                         dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES }
                        );
 }
 
-/* Badly-formatted <Id> in PKL */
-BOOST_AUTO_TEST_CASE (verify_test11)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 {
-       check_after_replace (
-               next_verify_test_number++, &pkl,
-               "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
-               dcp::VerificationNote::XML_VALIDATION_ERROR
+       check_verify_result_after_replace (
+               "invalid_xml_pkl_id", &pkl,
+               "<Id>urn:uuid:2b9", "<Id>urn:uuid:xb9",
+               { dcp::VerificationNote::Code::INVALID_XML }
                );
 }
 
-/* Badly-formatted <Id> in ASSETMAP */
-BOOST_AUTO_TEST_CASE (verify_test12)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
 {
-       check_after_replace (
-               next_verify_test_number++, &asset_map,
-               "<Id>urn:uuid:74e", "<Id>urn:uuid:x4e",
-               dcp::VerificationNote::XML_VALIDATION_ERROR
+       check_verify_result_after_replace (
+               "invalix_xml_asset_map_id", &asset_map,
+               "<Id>urn:uuid:07e", "<Id>urn:uuid:x7e",
+               { dcp::VerificationNote::Code::INVALID_XML }
                );
 }
 
-/* Basic test of an Interop DCP */
-BOOST_AUTO_TEST_CASE (verify_test13)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_standard)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (3, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       auto dir = setup (3, "verify_invalid_standard");
+       auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test%1/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test%1/ASSETMAP", next_verify_test_number);
+       path const cpl_file = dir / "cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
+       path const pkl_file = dir / "pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
+       path const assetmap_file = dir / "ASSETMAP";
 
-       list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
+       auto st = stages.begin();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(cpl_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(cpl_file));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking reel");
        BOOST_REQUIRE (!st->second);
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(dir / "pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(pkl_file));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking ASSETMAP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(assetmap_file));
+       BOOST_CHECK_EQUAL (st->second.get(), canonical(assetmap_file));
        ++st;
        BOOST_REQUIRE (st == stages.end());
 
-       dump_notes (notes);
+       BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+       auto i = notes.begin ();
+       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_STANDARD);
+}
 
-       BOOST_CHECK_EQUAL (notes.size(), 0);
+/* DCP with a short asset */
+BOOST_AUTO_TEST_CASE (verify_invalid_duration)
+{
+       auto dir = setup (8, "invalid_duration");
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("d7576dcb-a361-4139-96b8-267f5f8d7f91") },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") }
+               });
+}
+
+
+static
+shared_ptr<dcp::CPL>
+dcp_from_frame (dcp::ArrayData const& frame, path dir)
+{
+       auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+       create_directories (dir);
+       auto writer = asset->start_write (dir / "pic.mxf", true);
+       for (int i = 0; i < 24; ++i) {
+               writer->write (frame.data(), frame.size());
+       }
+       writer->finalize ();
 
-       next_verify_test_number++;
+       auto reel_asset = make_shared<dcp::ReelMonoPictureAsset>(asset, 0);
+       return write_dcp_with_single_asset (dir, reel_asset);
 }
 
-/* DCP with a short asset */
-BOOST_AUTO_TEST_CASE (verify_test14)
+
+BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
+{
+       int const too_big = 1302083 * 2;
+
+       /* Compress a black image */
+       auto image = black_image ();
+       auto frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       BOOST_REQUIRE (frame.size() < too_big);
+
+       /* Place it in a bigger block with some zero padding at the end */
+       dcp::ArrayData oversized_frame(too_big);
+       memcpy (oversized_frame.data(), frame.data(), frame.size());
+       memset (oversized_frame.data() + frame.size(), 0, too_big - frame.size());
+
+       path const dir("build/test/verify_invalid_picture_frame_size_in_bytes");
+       prepare_directory (dir);
+       auto cpl = dcp_from_frame (oversized_frame, dir);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
+{
+       int const nearly_too_big = 1302083 * 0.98;
+
+       /* Compress a black image */
+       auto image = black_image ();
+       auto frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       BOOST_REQUIRE (frame.size() < nearly_too_big);
+
+       /* Place it in a bigger block with some zero padding at the end */
+       dcp::ArrayData oversized_frame(nearly_too_big);
+       memcpy (oversized_frame.data(), frame.data(), frame.size());
+       memset (oversized_frame.data() + frame.size(), 0, nearly_too_big - frame.size());
+
+       path const dir("build/test/verify_nearly_invalid_picture_frame_size_in_bytes");
+       prepare_directory (dir);
+       auto cpl = dcp_from_frame (oversized_frame, dir);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_PICTURE_FRAME_SIZE_IN_BYTES, canonical(dir / "pic.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_picture_frame_size_in_bytes)
+{
+       /* Compress a black image */
+       auto image = black_image ();
+       auto frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
+
+       path const dir("build/test/verify_valid_picture_frame_size_in_bytes");
+       prepare_directory (dir);
+       auto cpl = dcp_from_frame (frame, dir);
+
+       check_verify_result ({ dir }, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
+{
+       path const dir("build/test/verify_valid_interop_subtitles");
+       prepare_directory (dir);
+       copy_file ("test/data/subs1.xml", dir / "subs.xml");
+       auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
+{
+       using namespace boost::filesystem;
+
+       path const dir("build/test/verify_invalid_interop_subtitles");
+       prepare_directory (dir);
+       copy_file ("test/data/subs1.xml", dir / "subs.xml");
+       auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
+
+       {
+               Editor e (dir / "subs.xml");
+               e.replace ("</ReelNumber>", "</ReelNumber><Foo></Foo>");
+       }
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 5 },
+                       {
+                               dcp::VerificationNote::Type::ERROR,
+                               dcp::VerificationNote::Code::INVALID_XML,
+                               string("element 'Foo' is not allowed for content model '(SubtitleID,MovieTitle,ReelNumber,Language,LoadFont*,Font*,Subtitle*)'"),
+                               path(),
+                               29
+                       }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
+{
+       path const dir("build/test/verify_valid_smpte_subtitles");
+       prepare_directory (dir);
+       copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
+{
+       using namespace boost::filesystem;
+
+       path const dir("build/test/verify_invalid_smpte_subtitles");
+       prepare_directory (dir);
+       copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'Foo'"), path(), 2 },
+                       {
+                               dcp::VerificationNote::Type::ERROR,
+                               dcp::VerificationNote::Code::INVALID_XML,
+                               string("element 'Foo' is not allowed for content model '(Id,ContentTitleText,AnnotationText?,IssueDate,ReelNumber?,Language?,EditRate,TimeCodeRate,StartTime?,DisplayType?,LoadFont*,SubtitleList)'"),
+                               path(),
+                               2
+                       },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_external_asset)
+{
+       path const ov_dir("build/test/verify_external_asset");
+       prepare_directory (ov_dir);
+
+       auto image = black_image ();
+       auto frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+       BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
+       dcp_from_frame (frame, ov_dir);
+
+       dcp::DCP ov (ov_dir);
+       ov.read ();
+
+       path const vf_dir("build/test/verify_external_asset_vf");
+       prepare_directory (vf_dir);
+
+       auto picture = ov.cpls()[0]->reels()[0]->main_picture();
+       auto cpl = write_dcp_with_single_asset (vf_dir, picture);
+
+       check_verify_result (
+               { vf_dir },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::EXTERNAL_ASSET, picture->asset()->id() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
+{
+       path const dir("build/test/verify_valid_cpl_metadata");
+       prepare_directory (dir);
+
+       copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (reel_asset);
+
+       reel->add (make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 16 * 24), 0));
+       reel->add (simple_markers(16 * 24));
+
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+       cpl->set_version_number (1);
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+}
+
+
+path find_cpl (path dir)
+{
+       for (auto i: directory_iterator(dir)) {
+               if (boost::starts_with(i.path().filename().string(), "cpl_")) {
+                       return i.path();
+               }
+       }
+
+       BOOST_REQUIRE (false);
+       return {};
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
+{
+       using namespace boost::filesystem;
+
+       path const dir("build/test/verify_invalid_cpl_metadata_bad_tag");
+       prepare_directory (dir);
+
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (black_picture_asset(dir));
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+       cpl->set_version_number (1);
+
+       reel->add (simple_markers());
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+
+       {
+               Editor e (find_cpl(dir));
+               e.replace ("MainSound", "MainSoundX");
+       }
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXConfiguration'"), canonical(cpl->file().get()), 54 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:MainSoundXSampleRate'"), canonical(cpl->file().get()), 55 },
+                       {
+                               dcp::VerificationNote::Type::ERROR,
+                               dcp::VerificationNote::Code::INVALID_XML,
+                               string("element 'meta:MainSoundXConfiguration' is not allowed for content model "
+                                      "'(Id,AnnotationText?,EditRate,IntrinsicDuration,EntryPoint?,Duration?,"
+                                      "FullContentTitleText,ReleaseTerritory?,VersionNumber?,Chain?,Distributor?,"
+                                      "Facility?,AlternateContentVersionList?,Luminance?,MainSoundConfiguration,"
+                                      "MainSoundSampleRate,MainPictureStoredArea,MainPictureActiveArea,MainSubtitleLanguageList?,"
+                                      "ExtensionMetadataList?,)'"),
+                               canonical(cpl->file().get()),
+                               75
+                       },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) },
+               });
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
+{
+       path const dir("build/test/verify_invalid_cpl_metadata_missing_tag");
+       prepare_directory (dir);
+
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (black_picture_asset(dir));
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+       dcp::DCP dcp (dir);
+       dcp.add (cpl);
+       dcp.write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+
+       {
+               Editor e (find_cpl(dir));
+               e.replace ("meta:Width", "meta:WidthX");
+       }
+
+       check_verify_result (
+               { dir },
+               {{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::FAILED_READ, string("missing XML tag Width in MainPictureStoredArea") }}
+               );
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_language1)
+{
+       path const dir("build/test/verify_invalid_language1");
+       prepare_directory (dir);
+       copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+       asset->_language = "wrong-andbad";
+       asset->write (dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       reel_asset->_language = "badlang";
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+/* SMPTE DCP with invalid <Language> in the MainClosedCaption reel and also in the XML within the MXF */
+BOOST_AUTO_TEST_CASE (verify_invalid_language2)
+{
+       path const dir("build/test/verify_invalid_language2");
+       prepare_directory (dir);
+       copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+       asset->_language = "wrong-andbad";
+       asset->write (dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       reel_asset->_language = "badlang";
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("badlang") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("wrong-andbad") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+/* SMPTE DCP with invalid <Language> in the MainSound reel, the CPL additional subtitles languages and
+ * the release territory.
+ */
+BOOST_AUTO_TEST_CASE (verify_invalid_language3)
+{
+       path const dir("build/test/verify_invalid_language3");
+       prepare_directory (dir);
+
+       auto picture = simple_picture (dir, "foo");
+       auto reel_picture = make_shared<dcp::ReelMonoPictureAsset>(picture, 0);
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (reel_picture);
+       auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz");
+       auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
+       reel->add (reel_sound);
+       reel->add (simple_markers());
+
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       cpl->_additional_subtitle_languages.push_back("this-is-wrong");
+       cpl->_additional_subtitle_languages.push_back("andso-is-this");
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+       cpl->set_version_number (1);
+       cpl->_release_territory = "fred-jim";
+       auto dcp = make_shared<dcp::DCP>(dir);
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("this-is-wrong") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("andso-is-this") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("fred-jim") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_LANGUAGE, string("frobozz") },
+               });
+}
+
+
+static
+vector<dcp::VerificationNote>
+check_picture_size (int width, int height, int frame_rate, bool three_d)
 {
-       vector<boost::filesystem::path> directories = setup (8, next_verify_test_number);
-       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+       using namespace boost::filesystem;
+
+       path dcp_path = "build/test/verify_picture_test";
+       prepare_directory (dcp_path);
+
+       shared_ptr<dcp::PictureAsset> mp;
+       if (three_d) {
+               mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
+       } else {
+               mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
+       }
+       auto picture_writer = mp->start_write (dcp_path / "video.mxf", false);
+
+       auto image = black_image (dcp::Size(width, height));
+       auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
+       int const length = three_d ? frame_rate * 2 : frame_rate;
+       for (int i = 0; i < length; ++i) {
+               picture_writer->write (j2c.data(), j2c.size());
+       }
+       picture_writer->finalize ();
+
+       auto d = make_shared<dcp::DCP>(dcp_path);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       cpl->set_annotation_text ("A Test DCP");
+       cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1998, 1080));
+       cpl->set_version_number (1);
+
+       auto reel = make_shared<dcp::Reel>();
+
+       if (three_d) {
+               reel->add (make_shared<dcp::ReelStereoPictureAsset>(std::dynamic_pointer_cast<dcp::StereoPictureAsset>(mp), 0));
+       } else {
+               reel->add (make_shared<dcp::ReelMonoPictureAsset>(std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp), 0));
+       }
+
+       reel->add (simple_markers(frame_rate));
+
+       cpl->add (reel);
+
+       d->add (cpl);
+       d->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
 
+       return dcp::verify ({dcp_path}, &stage, &progress, xsd_test);
+}
+
+
+static
+void
+check_picture_size_ok (int width, int height, int frame_rate, bool three_d)
+{
+       auto notes = check_picture_size(width, height, frame_rate, three_d);
        dump_notes (notes);
+       BOOST_CHECK_EQUAL (notes.size(), 0U);
+}
+
+
+static
+void
+check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool three_d)
+{
+       auto notes = check_picture_size(width, height, frame_rate, three_d);
+       BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_SIZE_IN_PIXELS);
+}
+
+
+static
+void
+check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, bool three_d)
+{
+       auto notes = check_picture_size(width, height, frame_rate, three_d);
+       BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+       BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K);
+}
+
+
+static
+void
+check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, bool three_d)
+{
+       auto notes = check_picture_size(width, height, frame_rate, three_d);
+       BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_4K);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_picture_size)
+{
+       using namespace boost::filesystem;
+
+       /* 2K scope */
+       check_picture_size_ok (2048, 858, 24, false);
+       check_picture_size_ok (2048, 858, 25, false);
+       check_picture_size_ok (2048, 858, 48, false);
+       check_picture_size_ok (2048, 858, 24, true);
+       check_picture_size_ok (2048, 858, 25, true);
+       check_picture_size_ok (2048, 858, 48, true);
+
+       /* 2K flat */
+       check_picture_size_ok (1998, 1080, 24, false);
+       check_picture_size_ok (1998, 1080, 25, false);
+       check_picture_size_ok (1998, 1080, 48, false);
+       check_picture_size_ok (1998, 1080, 24, true);
+       check_picture_size_ok (1998, 1080, 25, true);
+       check_picture_size_ok (1998, 1080, 48, true);
+
+       /* 4K scope */
+       check_picture_size_ok (4096, 1716, 24, false);
+
+       /* 4K flat */
+       check_picture_size_ok (3996, 2160, 24, false);
+
+       /* Bad frame size */
+       check_picture_size_bad_frame_size (2050, 858, 24, false);
+       check_picture_size_bad_frame_size (2048, 658, 25, false);
+       check_picture_size_bad_frame_size (1920, 1080, 48, true);
+       check_picture_size_bad_frame_size (4000, 3000, 24, true);
+
+       /* Bad 2K frame rate */
+       check_picture_size_bad_2k_frame_rate (2048, 858, 26, false);
+       check_picture_size_bad_2k_frame_rate (2048, 858, 31, false);
+       check_picture_size_bad_2k_frame_rate (1998, 1080, 50, true);
+
+       /* Bad 4K frame rate */
+       check_picture_size_bad_4k_frame_rate (3996, 2160, 25, false);
+       check_picture_size_bad_4k_frame_rate (3996, 2160, 48, false);
+
+       /* No 4K 3D */
+       auto notes = check_picture_size(3996, 2160, 24, true);
+       BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D);
+}
+
+
+static
+void
+add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, string text = "Hello")
+{
+       asset->add (
+               make_shared<dcp::SubtitleString>(
+                       optional<string>(),
+                       false,
+                       false,
+                       false,
+                       dcp::Colour(),
+                       42,
+                       1,
+                       dcp::Time(start_frame, 24, 24),
+                       dcp::Time(end_frame, 24, 24),
+                       0,
+                       dcp::HAlign::CENTER,
+                       v_position,
+                       dcp::VAlign::CENTER,
+                       dcp::Direction::LTR,
+                       text,
+                       dcp::Effect::NONE,
+                       dcp::Colour(),
+                       dcp::Time(),
+                       dcp::Time()
+               )
+       );
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
+{
+       path const dir("build/test/verify_invalid_closed_caption_xml_size_in_bytes");
+       prepare_directory (dir);
+
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+       for (int i = 0; i < 2048; ++i) {
+               add_test_subtitle (asset, i * 24, i * 24 + 20);
+       }
+       asset->set_language (dcp::LanguageTag("de-DE"));
+       asset->write (dir / "subs.mxf");
+       auto reel_asset = make_shared<dcp::ReelClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+                       {
+                               dcp::VerificationNote::Type::BV21_ERROR,
+                               dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
+                               string("413262"),
+                               canonical(dir / "subs.mxf")
+                       },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+static
+shared_ptr<dcp::SMPTESubtitleAsset>
+make_large_subtitle_asset (path font_file)
+{
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+       dcp::ArrayData big_fake_font(1024 * 1024);
+       big_fake_font.write (font_file);
+       for (int i = 0; i < 116; ++i) {
+               asset->add_font (dcp::String::compose("big%1", i), big_fake_font);
+       }
+       return asset;
+}
+
+
+template <class T>
+void
+verify_timed_text_asset_too_large (string name)
+{
+       auto const dir = path("build/test") / name;
+       prepare_directory (dir);
+       auto asset = make_large_subtitle_asset (dir / "font.ttf");
+       add_test_subtitle (asset, 0, 20);
+       asset->set_language (dcp::LanguageTag("de-DE"));
+       asset->write (dir / "subs.mxf");
+
+       auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto cpl = write_dcp_with_single_asset (dir, reel_asset);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121696411"), canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_subtitle_asset_too_large)
+{
+       verify_timed_text_asset_too_large<dcp::ReelSubtitleAsset>("verify_subtitle_asset_too_large");
+       verify_timed_text_asset_too_large<dcp::ReelClosedCaptionAsset>("verify_closed_caption_asset_too_large");
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
+{
+       path dir = "build/test/verify_missing_subtitle_language";
+       prepare_directory (dir);
+       auto dcp = make_simple (dir, 1, 240);
+
+       string const xml =
+               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+               "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+               "<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+               "<ContentTitleText>Content</ContentTitleText>"
+               "<AnnotationText>Annotation</AnnotationText>"
+               "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+               "<ReelNumber>1</ReelNumber>"
+               "<EditRate>25 1</EditRate>"
+               "<TimeCodeRate>25</TimeCodeRate>"
+               "<StartTime>00:00:00:00</StartTime>"
+               "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
+               "<SubtitleList>"
+               "<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+               "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+               "<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+               "</Subtitle>"
+               "</Font>"
+               "</SubtitleList>"
+               "</SubtitleReel>";
+
+       auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+       BOOST_REQUIRE (xml_file);
+       fwrite (xml.c_str(), xml.size(), 1, xml_file);
+       fclose (xml_file);
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+       subs->write (dir / "subs.mxf");
+
+       auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+       dcp->cpls().front()->reels().front()->add(reel_subs);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
+{
+       path path ("build/test/verify_mismatched_subtitle_languages");
+       auto dcp = make_simple (path, 2, 240);
+       auto cpl = dcp->cpls()[0];
+
+       {
+               auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+               subs->set_language (dcp::LanguageTag("de-DE"));
+               subs->add (simple_subtitle());
+               subs->write (path / "subs1.mxf");
+               auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+               cpl->reels()[0]->add(reel_subs);
+       }
+
+       {
+               auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+               subs->set_language (dcp::LanguageTag("en-US"));
+               subs->add (simple_subtitle());
+               subs->write (path / "subs2.mxf");
+               auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+               cpl->reels()[1]->add(reel_subs);
+       }
+
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               { path },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
+{
+       path dir = "build/test/verify_missing_subtitle_start_time";
+       prepare_directory (dir);
+       auto dcp = make_simple (dir, 1, 240);
+
+       string const xml =
+               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+               "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+               "<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+               "<ContentTitleText>Content</ContentTitleText>"
+               "<AnnotationText>Annotation</AnnotationText>"
+               "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+               "<ReelNumber>1</ReelNumber>"
+               "<Language>de-DE</Language>"
+               "<EditRate>25 1</EditRate>"
+               "<TimeCodeRate>25</TimeCodeRate>"
+               "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
+               "<SubtitleList>"
+               "<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+               "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+               "<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+               "</Subtitle>"
+               "</Font>"
+               "</SubtitleList>"
+               "</SubtitleReel>";
+
+       auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+       BOOST_REQUIRE (xml_file);
+       fwrite (xml.c_str(), xml.size(), 1, xml_file);
+       fclose (xml_file);
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+       subs->write (dir / "subs.mxf");
+
+       auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+       dcp->cpls().front()->reels().front()->add(reel_subs);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
+{
+       path dir = "build/test/verify_invalid_subtitle_start_time";
+       prepare_directory (dir);
+       auto dcp = make_simple (dir, 1, 240);
+
+       string const xml =
+               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+               "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+               "<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+               "<ContentTitleText>Content</ContentTitleText>"
+               "<AnnotationText>Annotation</AnnotationText>"
+               "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+               "<ReelNumber>1</ReelNumber>"
+               "<Language>de-DE</Language>"
+               "<EditRate>25 1</EditRate>"
+               "<TimeCodeRate>25</TimeCodeRate>"
+               "<StartTime>00:00:02:00</StartTime>"
+               "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
+               "<SubtitleList>"
+               "<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+               "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+               "<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+               "</Subtitle>"
+               "</Font>"
+               "</SubtitleList>"
+               "</SubtitleReel>";
+
+       auto xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+       BOOST_REQUIRE (xml_file);
+       fwrite (xml.c_str(), xml.size(), 1, xml_file);
+       fclose (xml_file);
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+       subs->write (dir / "subs.mxf");
+
+       auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+       dcp->cpls().front()->reels().front()->add(reel_subs);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }
+               });
+}
+
+
+class TestText
+{
+public:
+       TestText (int in_, int out_, float v_position_ = 0, string text_ = "Hello")
+               : in(in_)
+               , out(out_)
+               , v_position(v_position_)
+               , text(text_)
+       {}
+
+       int in;
+       int out;
+       float v_position;
+       string text;
+};
+
+
+template <class T>
+shared_ptr<dcp::CPL>
+dcp_with_text (path dir, vector<TestText> subs)
+{
+       prepare_directory (dir);
+       auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+       asset->set_start_time (dcp::Time());
+       for (auto i: subs) {
+               add_test_subtitle (asset, i.in, i.out, i.v_position, i.text);
+       }
+       asset->set_language (dcp::LanguageTag("de-DE"));
+       asset->write (dir / "subs.mxf");
+
+       auto reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+       return write_dcp_with_single_asset (dir, reel_asset);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
+{
+       auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
+       /* Just too early */
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
+{
+       auto const dir = path("build/test/verify_valid_subtitle_first_text_time");
+       /* Just late enough */
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
+{
+       auto const dir = path("build/test/verify_valid_subtitle_first_text_time_on_second_reel");
+       prepare_directory (dir);
+
+       auto asset1 = make_shared<dcp::SMPTESubtitleAsset>();
+       asset1->set_start_time (dcp::Time());
+       /* Just late enough */
+       add_test_subtitle (asset1, 4 * 24, 5 * 24);
+       asset1->set_language (dcp::LanguageTag("de-DE"));
+       asset1->write (dir / "subs1.mxf");
+       auto reel_asset1 = make_shared<dcp::ReelSubtitleAsset>(asset1, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto reel1 = make_shared<dcp::Reel>();
+       reel1->add (reel_asset1);
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 16 * 24, 0);
+       markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+       reel1->add (markers1);
+
+       auto asset2 = make_shared<dcp::SMPTESubtitleAsset>();
+       asset2->set_start_time (dcp::Time());
+       /* This would be too early on first reel but should be OK on the second */
+       add_test_subtitle (asset2, 0, 4 * 24);
+       asset2->set_language (dcp::LanguageTag("de-DE"));
+       asset2->write (dir / "subs2.mxf");
+       auto reel_asset2 = make_shared<dcp::ReelSubtitleAsset>(asset2, dcp::Fraction(24, 1), 16 * 24, 0);
+       auto reel2 = make_shared<dcp::Reel>();
+       reel2->add (reel_asset2);
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 16 * 24, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(16 * 24 - 1, 24, 24));
+       reel2->add (markers2);
+
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel1);
+       cpl->add (reel2);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+
+
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
+{
+       auto const dir = path("build/test/verify_invalid_subtitle_spacing");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 4 * 24,     5 * 24 },
+                       { 5 * 24 + 1, 6 * 24 },
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
+{
+       auto const dir = path("build/test/verify_valid_subtitle_spacing");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 4 * 24,      5 * 24 },
+                       { 5 * 24 + 16, 8 * 24 },
+               });
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
+{
+       auto const dir = path("build/test/verify_invalid_subtitle_duration");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
+{
+       auto const dir = path("build/test/verify_valid_subtitle_duration");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
+{
+       auto const dir = path ("build/test/invalid_subtitle_line_count1");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 200, 0.0, "We" },
+                       { 96, 200, 0.1, "have" },
+                       { 96, 200, 0.2, "four" },
+                       { 96, 200, 0.3, "lines" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
+{
+       auto const dir = path ("build/test/verify_valid_subtitle_line_count1");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 200, 0.0, "We" },
+                       { 96, 200, 0.1, "have" },
+                       { 96, 200, 0.2, "four" },
+               });
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
+{
+       auto const dir = path ("build/test/verify_invalid_subtitle_line_count2");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "We" },
+                       { 96, 300, 0.1, "have" },
+                       { 150, 180, 0.2, "four" },
+                       { 150, 180, 0.3, "lines" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_COUNT },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
+{
+       auto const dir = path ("build/test/verify_valid_subtitle_line_count2");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "We" },
+                       { 96, 300, 0.1, "have" },
+                       { 150, 180, 0.2, "four" },
+                       { 190, 250, 0.3, "lines" }
+               });
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
+{
+       auto const dir = path ("build/test/verify_invalid_subtitle_line_length1");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::NEARLY_INVALID_SUBTITLE_LINE_LENGTH },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
+{
+       auto const dir = path ("build/test/verify_invalid_subtitle_line_length2");
+       auto cpl = dcp_with_text<dcp::ReelSubtitleAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_LINE_LENGTH },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
+{
+       auto const dir = path ("build/test/verify_valid_closed_caption_line_count1");
+       auto cpl = dcp_with_text<dcp::ReelClosedCaptionAsset> (
+               dir,
+               {
+                       { 96, 200, 0.0, "We" },
+                       { 96, 200, 0.1, "have" },
+                       { 96, 200, 0.2, "four" },
+                       { 96, 200, 0.3, "lines" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
+{
+       auto const dir = path ("build/test/verify_valid_closed_caption_line_count2");
+       auto cpl = dcp_with_text<dcp::ReelClosedCaptionAsset> (
+               dir,
+               {
+                       { 96, 200, 0.0, "We" },
+                       { 96, 200, 0.1, "have" },
+                       { 96, 200, 0.2, "four" },
+               });
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
+{
+       auto const dir = path ("build/test/verify_invalid_closed_caption_line_count3");
+       auto cpl = dcp_with_text<dcp::ReelClosedCaptionAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "We" },
+                       { 96, 300, 0.1, "have" },
+                       { 150, 180, 0.2, "four" },
+                       { 150, 180, 0.3, "lines" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_COUNT},
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
+{
+       auto const dir = path ("build/test/verify_valid_closed_caption_line_count4");
+       auto cpl = dcp_with_text<dcp::ReelClosedCaptionAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "We" },
+                       { 96, 300, 0.1, "have" },
+                       { 150, 180, 0.2, "four" },
+                       { 190, 250, 0.3, "lines" }
+               });
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
+{
+       auto const dir = path ("build/test/verify_invalid_closed_caption_line_length");
+       auto cpl = dcp_with_text<dcp::ReelClosedCaptionAsset> (
+               dir,
+               {
+                       { 96, 300, 0.0, "0123456789012345678901234567890123" }
+               });
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
+{
+       path const dir("build/test/verify_invalid_sound_frame_rate");
+       prepare_directory (dir);
+
+       auto picture = simple_picture (dir, "foo");
+       auto reel_picture = make_shared<dcp::ReelMonoPictureAsset>(picture, 0);
+       auto reel = make_shared<dcp::Reel>();
+       reel->add (reel_picture);
+       auto sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "de-DE", 24, 96000);
+       auto reel_sound = make_shared<dcp::ReelSoundAsset>(sound, 0);
+       reel->add (reel_sound);
+       reel->add (simple_markers());
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       cpl->add (reel);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "hello"
+               );
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_SOUND_FRAME_RATE, string("96000"), canonical(dir / "audiofoo.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
+{
+       path const dir("build/test/verify_missing_cpl_annotation_text");
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               BOOST_REQUIRE (cpl->file());
+               Editor e(cpl->file().get());
+               e.replace("<AnnotationText>A Test DCP</AnnotationText>", "");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
+{
+       path const dir("build/test/verify_mismatched_cpl_annotation_text");
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               BOOST_REQUIRE (cpl->file());
+               Editor e(cpl->file().get());
+               e.replace("<AnnotationText>A Test DCP</AnnotationText>", "<AnnotationText>A Test DCP 1</AnnotationText>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISMATCHED_CPL_ANNOTATION_TEXT, cpl->id(), canonical(cpl->file().get()) },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), canonical(cpl->file().get()) }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
+{
+       path const dir("build/test/verify_mismatched_asset_duration");
+       prepare_directory (dir);
+       shared_ptr<dcp::DCP> dcp (new dcp::DCP(dir));
+       shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::ContentKind::TRAILER));
+
+       shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (dir, "", 24);
+       shared_ptr<dcp::SoundAsset> ms = simple_sound (dir, "", dcp::MXFMetadata(), "en-US", 25);
+
+       auto reel = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+               make_shared<dcp::ReelSoundAsset>(ms, 0)
+               );
+
+       reel->add (simple_markers());
+       cpl->add (reel);
+
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_ASSET_DURATION },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), canonical(cpl->file().get()) }
+               });
+}
+
+
+
+static
+shared_ptr<dcp::CPL>
+verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool add_to_reel2)
+{
+       prepare_directory (dir);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+       subs->set_language (dcp::LanguageTag("de-DE"));
+       subs->set_start_time (dcp::Time());
+       subs->add (simple_subtitle());
+       subs->write (dir / "subs.mxf");
+       auto reel_subs = make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+
+       auto reel1 = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", 240), 0)
+               );
+
+       if (add_to_reel1) {
+               reel1->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+       }
+
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+       reel1->add (markers1);
+
+       cpl->add (reel1);
+
+       auto reel2 = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", 240), 0)
+               );
+
+       if (add_to_reel2) {
+               reel2->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+       }
+
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+       reel2->add (markers2);
+
+       cpl->add (reel2);
+
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       return cpl;
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
+{
+       {
+               path dir ("build/test/missing_main_subtitle_from_some_reels");
+               auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, true, false);
+               check_verify_result (
+                       { dir },
+                       {
+                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_MAIN_SUBTITLE_FROM_SOME_REELS },
+                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       });
+
+       }
+
+       {
+               path dir ("build/test/verify_subtitles_must_be_in_all_reels2");
+               auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, true, true);
+               check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       }
+
+       {
+               path dir ("build/test/verify_subtitles_must_be_in_all_reels1");
+               auto cpl = verify_subtitles_must_be_in_all_reels_check (dir, false, false);
+               check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       }
+}
+
+
+static
+shared_ptr<dcp::CPL>
+verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1, int caps_in_reel2)
+{
+       prepare_directory (dir);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+       subs->set_language (dcp::LanguageTag("de-DE"));
+       subs->set_start_time (dcp::Time());
+       subs->add (simple_subtitle());
+       subs->write (dir / "subs.mxf");
+
+       auto reel1 = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", 240), 0)
+               );
+
+       for (int i = 0; i < caps_in_reel1; ++i) {
+               reel1->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+       }
+
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+       reel1->add (markers1);
+
+       cpl->add (reel1);
+
+       auto reel2 = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", 240), 0)
+               );
+
+       for (int i = 0; i < caps_in_reel2; ++i) {
+               reel2->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+       }
+
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+       reel2->add (markers2);
+
+       cpl->add (reel2);
+
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       return cpl;
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
+{
+       {
+               path dir ("build/test/mismatched_closed_caption_asset_counts");
+               auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 3, 4);
+               check_verify_result (
+                       {dir},
+                       {
+                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS },
+                               { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+                       });
+       }
+
+       {
+               path dir ("build/test/verify_closed_captions_must_be_in_all_reels2");
+               auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 4, 4);
+               check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       }
+
+       {
+               path dir ("build/test/verify_closed_captions_must_be_in_all_reels3");
+               auto cpl = verify_closed_captions_must_be_in_all_reels_check (dir, 0, 0);
+               check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }});
+       }
+}
+
+
+template <class T>
+void
+verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost::function<void (shared_ptr<T>)> adjust)
+{
+       prepare_directory (dir);
+       auto dcp = make_shared<dcp::DCP>(dir);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+
+       auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+       subs->set_language (dcp::LanguageTag("de-DE"));
+       subs->set_start_time (dcp::Time());
+       subs->add (simple_subtitle());
+       subs->write (dir / "subs.mxf");
+       auto reel_text = make_shared<T>(subs, dcp::Fraction(24, 1), 240, 0);
+       adjust (reel_text);
+
+       auto reel = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", 240), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", 240), 0)
+               );
+
+       reel->add (reel_text);
+
+       reel->add (simple_markers(240));
+
+       cpl->add (reel);
+
+       dcp->add (cpl);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, code, subs->id() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_text_entry_point)
+{
+       verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
+               "build/test/verify_subtitle_entry_point_must_be_present",
+               dcp::VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT,
+               [](shared_ptr<dcp::ReelSubtitleAsset> asset) {
+                       asset->unset_entry_point ();
+                       }
+               );
+
+       verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
+               "build/test/verify_subtitle_entry_point_must_be_zero",
+               dcp::VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT,
+               [](shared_ptr<dcp::ReelSubtitleAsset> asset) {
+                       asset->set_entry_point (4);
+                       }
+               );
+
+       verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
+               "build/test/verify_closed_caption_entry_point_must_be_present",
+               dcp::VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT,
+               [](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
+                       asset->unset_entry_point ();
+                       }
+               );
+
+       verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
+               "build/test/verify_closed_caption_entry_point_must_be_zero",
+               dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
+               [](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
+                       asset->set_entry_point (9);
+                       }
+               );
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_hash)
+{
+       RNGFixer fix;
+
+       path const dir("build/test/verify_missing_hash");
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       BOOST_REQUIRE_EQUAL (dcp->cpls().size(), 1U);
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               BOOST_REQUIRE (cpl->file());
+               Editor e(cpl->file().get());
+               e.replace("<Hash>addO7je2lZSNQp55qjCWo5DLKFQ=</Hash>", "");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_HASH, string("1fab8bb0-cfaf-4225-ad6d-01768bc10470") }
+               });
+}
+
+
+static
+void
+verify_markers_test (
+       path dir,
+       vector<pair<dcp::Marker, dcp::Time>> markers,
+       vector<dcp::VerificationNote> test_notes
+       )
+{
+       auto dcp = make_simple (dir);
+       dcp->cpls()[0]->set_content_kind (dcp::ContentKind::FEATURE);
+       auto markers_asset = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 24, 0);
+       for (auto const& i: markers) {
+               markers_asset->set (i.first, i.second);
+       }
+       dcp->cpls()[0]->reels()[0]->add(markers_asset);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result ({dir}, test_notes);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_markers)
+{
+       verify_markers_test (
+               "build/test/verify_markers_all_correct",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+               },
+               {}
+               );
+
+       verify_markers_test (
+               "build/test/verify_markers_missing_ffec",
+               {
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE }
+               });
+
+       verify_markers_test (
+               "build/test/verify_markers_missing_ffmc",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE }
+               });
+
+       verify_markers_test (
+               "build/test/verify_markers_missing_ffoc",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC}
+               });
+
+       verify_markers_test (
+               "build/test/verify_markers_missing_lfoc",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(1, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC }
+               });
+
+       verify_markers_test (
+               "build/test/verify_markers_incorrect_ffoc",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(3, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(23, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_FFOC, string("3") }
+               });
+
+       verify_markers_test (
+               "build/test/verify_markers_incorrect_lfoc",
+               {
+                       { dcp::Marker::FFEC, dcp::Time(12, 24, 24) },
+                       { dcp::Marker::FFMC, dcp::Time(13, 24, 24) },
+                       { dcp::Marker::FFOC, dcp::Time(1, 24, 24) },
+                       { dcp::Marker::LFOC, dcp::Time(18, 24, 24) }
+               },
+               {
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INCORRECT_LFOC, string("18") }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
+{
+       path dir = "build/test/verify_missing_cpl_metadata_version_number";
+       prepare_directory (dir);
+       auto dcp = make_simple (dir);
+       auto cpl = dcp->cpls()[0];
+       cpl->unset_version_number();
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result ({dir}, {{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->id(), cpl->file().get() }});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
+{
+       path dir = "build/test/verify_missing_extension_metadata1";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.delete_lines ("<meta:ExtensionMetadataList>", "</meta:ExtensionMetadataList>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
+{
+       path dir = "build/test/verify_missing_extension_metadata2";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.delete_lines ("<meta:ExtensionMetadata scope=\"http://isdcf.com/ns/cplmd/app\">", "</meta:ExtensionMetadata>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, cpl->id(), cpl->file().get() }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
+{
+       path dir = "build/test/verify_invalid_xml_cpl_extension_metadata3";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("<meta:Name>A", "<meta:NameX>A");
+               e.replace ("n</meta:Name>", "n</meta:NameX>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:NameX'"), cpl->file().get(), 75 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:NameX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
+{
+       path dir = "build/test/verify_invalid_extension_metadata1";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("Application", "Fred");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> should be 'Application'"), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
+{
+       path dir = "build/test/verify_invalid_extension_metadata2";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("DCP Constraints Profile", "Fred");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Name> property should be 'DCP Constraints Profile'"), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
+{
+       path dir = "build/test/verify_invalid_xml_cpl_extension_metadata6";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("<meta:Value>", "<meta:ValueX>");
+               e.replace ("</meta:Value>", "</meta:ValueX>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:ValueX'"), cpl->file().get(), 79 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:ValueX' is not allowed for content model '(Name,Value)'"), cpl->file().get(), 80 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
+{
+       path dir = "build/test/verify_invalid_xml_cpl_extension_metadata7";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("SMPTE-RDD-52:2020-Bv2.1", "Fred");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_EXTENSION_METADATA, string("<Value> property should be 'SMPTE-RDD-52:2020-Bv2.1'"), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
+{
+       path dir = "build/test/verify_invalid_xml_cpl_extension_metadata8";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("<meta:Property>", "<meta:PropertyX>");
+               e.replace ("</meta:Property>", "</meta:PropertyX>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyX'"), cpl->file().get(), 77 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyX' is not allowed for content model '(Property+)'"), cpl->file().get(), 81 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
+{
+       path dir = "build/test/verify_invalid_xml_cpl_extension_metadata9";
+       auto dcp = make_simple (dir);
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       auto const cpl = dcp->cpls()[0];
+
+       {
+               Editor e (cpl->file().get());
+               e.replace ("<meta:PropertyList>", "<meta:PropertyListX>");
+               e.replace ("</meta:PropertyList>", "</meta:PropertyListX>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("no declaration found for element 'meta:PropertyListX'"), cpl->file().get(), 76 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, string("element 'meta:PropertyListX' is not allowed for content model '(Name,PropertyList?,)'"), cpl->file().get(), 82 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl->id(), cpl->file().get() },
+               });
+}
+
+
+
+BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
+{
+       path dir = "build/test/verify_unsigned_cpl_with_encrypted_content";
+       prepare_directory (dir);
+       for (auto i: directory_iterator("test/ref/DCP/encryption_test")) {
+               copy_file (i.path(), dir / i.path().filename());
+       }
+
+       string const pkl_id = "93182bd2-b1e8-41a3-b5c8-6e6564273bff";
+       path const pkl = dir / ( "pkl_" + pkl_id + ".xml" );
+       string const cpl_id = "81fb54df-e1bf-4647-8788-ea7ba154375b";
+       path const cpl = dir / ( "cpl_" + cpl_id + ".xml");
+
+       {
+               Editor e (cpl);
+               e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, cpl_id, canonical(cpl) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, pkl_id, canonical(pkl), },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl_id, canonical(cpl) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_CPL_WITH_ENCRYPTED_CONTENT, cpl_id, canonical(cpl) }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
+{
+       path dir = "build/test/unsigned_pkl_with_encrypted_content";
+       prepare_directory (dir);
+       for (auto i: directory_iterator("test/ref/DCP/encryption_test")) {
+               copy_file (i.path(), dir / i.path().filename());
+       }
+
+       string const cpl_id = "81fb54df-e1bf-4647-8788-ea7ba154375b";
+       path const cpl = dir / ("cpl_" + cpl_id + ".xml");
+       string const pkl_id = "93182bd2-b1e8-41a3-b5c8-6e6564273bff";
+       path const pkl = dir / ("pkl_" + pkl_id + ".xml");
+       {
+               Editor e (pkl);
+               e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, pkl_id, canonical(pkl) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_FFOC },
+                       { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::MISSING_LFOC },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl_id, canonical(cpl) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, pkl_id, canonical(pkl) },
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_unencrypted_content)
+{
+       path dir = "build/test/verify_unsigned_pkl_with_unencrypted_content";
+       prepare_directory (dir);
+       for (auto i: directory_iterator("test/ref/DCP/dcp_test1")) {
+               copy_file (i.path(), dir / i.path().filename());
+       }
+
+       {
+               Editor e (dir / "pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml");
+               e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
+       }
+
+       check_verify_result ({dir}, {});
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
+{
+       path dir ("build/test/verify_must_not_be_partially_encrypted");
+       prepare_directory (dir);
+
+       dcp::DCP d (dir);
+
+       auto signer = make_shared<dcp::CertificateChain>();
+       signer->add (dcp::Certificate(dcp::file_to_string("test/ref/crypt/ca.self-signed.pem")));
+       signer->add (dcp::Certificate(dcp::file_to_string("test/ref/crypt/intermediate.signed.pem")));
+       signer->add (dcp::Certificate(dcp::file_to_string("test/ref/crypt/leaf.signed.pem")));
+       signer->set_key (dcp::file_to_string("test/ref/crypt/leaf.key"));
+
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+
+       dcp::Key key;
+
+       auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+       mp->set_key (key);
+
+       auto writer = mp->start_write (dir / "video.mxf", false);
+       dcp::ArrayData j2c ("test/data/flat_red.j2c");
+       for (int i = 0; i < 24; ++i) {
+               writer->write (j2c.data(), j2c.size());
+       }
+       writer->finalize ();
+
+       auto ms = simple_sound (dir, "", dcp::MXFMetadata(), "de-DE");
+
+       auto reel = make_shared<dcp::Reel>(
+               make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
+               make_shared<dcp::ReelSoundAsset>(ms, 0)
+               );
+
+       reel->add (simple_markers());
+
+       cpl->add (reel);
+
+       cpl->set_content_version (
+               {"urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"}
+               );
+       cpl->set_annotation_text ("A Test DCP");
+       cpl->set_issuer ("OpenDCP 0.0.25");
+       cpl->set_creator ("OpenDCP 0.0.25");
+       cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+       cpl->set_version_number (1);
+
+       d.add (cpl);
+
+       d.write_xml (dcp::Standard::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
 
-       BOOST_REQUIRE_EQUAL (notes.size(), 4);
-       list<dcp::VerificationNote>::const_iterator i = notes.begin ();
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
-       ++i;
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
-       ++i;
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
-       ++i;
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
-       ++i;
-       next_verify_test_number++;
+       check_verify_result ({dir}, {{dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED}});
 }