Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / test / verify_test.cc

diff --git a/test/verify_test.cc b/test/verify_test.cc
index cb7c539d6e525a56eefebd61864636f6f156fb6d..4e26c66e5e225e860e52ea13b3a59e8d79fbae23 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -41,12 +41,14 @@
 #include "openjpeg_image.h"
 #include "raw_convert.h"
 #include "reel.h"
-#include "reel_closed_caption_asset.h"
+#include "reel_interop_closed_caption_asset.h"
+#include "reel_interop_subtitle_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 "reel_smpte_closed_caption_asset.h"
+#include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "stereo_picture_asset.h"
 #include "stream_operators.h"
@@ -59,6 +61,7 @@
 #include <cstdio>
 #include <iostream>
 
+
 using std::list;
 using std::pair;
 using std::string;
@@ -121,12 +124,11 @@ write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dc
        reel->add (reel_asset);
        reel->add (simple_markers());
 
-       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, standard);
        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(),
@@ -191,6 +193,7 @@ private:
 };
 
 
+#if 0
 static
 void
 dump_notes (vector<dcp::VerificationNote> const & notes)
@@ -199,6 +202,7 @@ dump_notes (vector<dcp::VerificationNote> const & notes)
                std::cout << dcp::note_to_string(i) << "\n";
        }
 }
+#endif
 
 
 static
@@ -206,7 +210,6 @@ void
 check_verify_result (vector<path> dir, vector<dcp::VerificationNote> test_notes)
 {
        auto notes = dcp::verify ({dir}, &stage, &progress, xsd_test);
-       dump_notes (notes);
        BOOST_REQUIRE_EQUAL (notes.size(), test_notes.size());
        for (auto i = 0U; i < notes.size(); ++i) {
                BOOST_REQUIRE_EQUAL (notes[i], test_notes[i]);
@@ -525,10 +528,13 @@ BOOST_AUTO_TEST_CASE (verify_invalid_standard)
        ++st;
        BOOST_REQUIRE (st == stages.end());
 
-       BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+       BOOST_REQUIRE_EQUAL (notes.size(), 2U);
        auto i = notes.begin ();
        BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_STANDARD);
+       ++i;
+       BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::Type::BV21_ERROR);
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K);
 }
 
 /* DCP with a short asset */
@@ -542,7 +548,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_duration)
                        { 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") }
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_INTRINSIC_DURATION, string("a2a87f5d-b749-4a7e-8d0c-9d48a4abf626") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, string("2") }
                });
 }
 
@@ -585,6 +592,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
        check_verify_result (
                { dir },
                {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte") },
                        { 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() }
                });
@@ -612,6 +620,7 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
        check_verify_result (
                { dir },
                {
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM, string("missing marker start byte") },
                        { 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() }
                });
@@ -639,7 +648,7 @@ BOOST_AUTO_TEST_CASE (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);
+       auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(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 }});
@@ -654,7 +663,7 @@ BOOST_AUTO_TEST_CASE (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);
+       auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
        write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
        {
@@ -684,7 +693,7 @@ BOOST_AUTO_TEST_CASE (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(25, 1), 300 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 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() }});
@@ -699,7 +708,7 @@ BOOST_AUTO_TEST_CASE (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), 300 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
        check_verify_result (
@@ -754,7 +763,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 
        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_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 
        auto reel = make_shared<dcp::Reel>();
        reel->add (reel_asset);
@@ -762,7 +771,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
        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);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->add (reel);
        cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
        cpl->set_main_sound_sample_rate (48000);
@@ -773,7 +782,6 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
        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(),
@@ -805,7 +813,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 
        auto reel = make_shared<dcp::Reel>();
        reel->add (black_picture_asset(dir));
-       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->add (reel);
        cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
        cpl->set_main_sound_sample_rate (48000);
@@ -818,7 +826,6 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
        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(),
@@ -860,7 +867,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
 
        auto reel = make_shared<dcp::Reel>();
        reel->add (black_picture_asset(dir));
-       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->add (reel);
        cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
        cpl->set_main_sound_sample_rate (48000);
@@ -870,7 +877,6 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
        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(),
@@ -897,7 +903,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
        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), 300 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
        reel_asset->_language = "badlang";
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -920,7 +926,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
        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), 300 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
        reel_asset->_language = "badlang";
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -951,7 +957,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
        reel->add (reel_sound);
        reel->add (simple_markers());
 
-       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->add (reel);
        cpl->_additional_subtitle_languages.push_back("this-is-wrong");
        cpl->_additional_subtitle_languages.push_back("andso-is-this");
@@ -964,7 +970,6 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
        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(),
@@ -1008,7 +1013,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
        picture_writer->finalize ();
 
        auto d = make_shared<dcp::DCP>(dcp_path);
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        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,-,-");
@@ -1031,7 +1036,6 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 
        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(),
@@ -1047,7 +1051,6 @@ 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);
 }
 
@@ -1115,7 +1118,7 @@ BOOST_AUTO_TEST_CASE (verify_picture_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);
+       check_picture_size_bad_frame_size (4000, 2000, 24, true);
 
        /* Bad 2K frame rate */
        check_picture_size_bad_2k_frame_rate (2048, 858, 26, false);
@@ -1175,7 +1178,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
        }
        asset->set_language (dcp::LanguageTag("de-DE"));
        asset->write (dir / "subs.mxf");
-       auto reel_asset = make_shared<dcp::ReelClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 2049 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 49148, 0);
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
        check_verify_result (
@@ -1215,11 +1218,11 @@ 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);
+       add_test_subtitle (asset, 0, 240);
        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 reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), 240, 0);
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
        check_verify_result (
@@ -1236,8 +1239,8 @@ verify_timed_text_asset_too_large (string name)
 
 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");
+       verify_timed_text_asset_too_large<dcp::ReelSMPTESubtitleAsset>("verify_subtitle_asset_too_large");
+       verify_timed_text_asset_too_large<dcp::ReelSMPTEClosedCaptionAsset>("verify_closed_caption_asset_too_large");
 }
 
 
@@ -1245,7 +1248,7 @@ 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);
+       auto dcp = make_simple (dir, 1, 106);
 
        string const xml =
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -1255,8 +1258,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
                "<AnnotationText>Annotation</AnnotationText>"
                "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
                "<ReelNumber>1</ReelNumber>"
-               "<EditRate>25 1</EditRate>"
-               "<TimeCodeRate>25</TimeCodeRate>"
+               "<EditRate>24 1</EditRate>"
+               "<TimeCodeRate>24</TimeCodeRate>"
                "<StartTime>00:00:00:00</StartTime>"
                "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
                "<SubtitleList>"
@@ -1275,10 +1278,9 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
        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);
+       auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
+       dcp->cpls()[0]->reels()[0]->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(),
@@ -1297,7 +1299,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 {
        path path ("build/test/verify_mismatched_subtitle_languages");
-       auto dcp = make_simple (path, 2, 240);
+       auto constexpr reel_length = 192;
+       auto dcp = make_simple (path, 2, reel_length);
        auto cpl = dcp->cpls()[0];
 
        {
@@ -1305,7 +1308,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
                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);
+               auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
                cpl->reels()[0]->add(reel_subs);
        }
 
@@ -1314,12 +1317,11 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
                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);
+               auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 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(),
@@ -1339,7 +1341,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 {
        path path ("build/test/verify_multiple_closed_caption_languages_allowed");
-       auto dcp = make_simple (path, 2, 240);
+       auto constexpr reel_length = 192;
+       auto dcp = make_simple (path, 2, reel_length);
        auto cpl = dcp->cpls()[0];
 
        {
@@ -1347,7 +1350,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
                ccaps->set_language (dcp::LanguageTag("de-DE"));
                ccaps->add (simple_subtitle());
                ccaps->write (path / "subs1.mxf");
-               auto reel_ccaps = make_shared<dcp::ReelClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), 240, 0);
+               auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
                cpl->reels()[0]->add(reel_ccaps);
        }
 
@@ -1356,12 +1359,11 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
                ccaps->set_language (dcp::LanguageTag("en-US"));
                ccaps->add (simple_subtitle());
                ccaps->write (path / "subs2.mxf");
-               auto reel_ccaps = make_shared<dcp::ReelClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), 240, 0);
+               auto reel_ccaps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), reel_length, 0);
                cpl->reels()[1]->add(reel_ccaps);
        }
 
        dcp->write_xml (
-               dcp::Standard::SMPTE,
                dcp::String::compose("libdcp %1", dcp::version),
                dcp::String::compose("libdcp %1", dcp::version),
                dcp::LocalTime().as_string(),
@@ -1381,7 +1383,7 @@ 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);
+       auto dcp = make_simple (dir, 1, 106);
 
        string const xml =
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -1392,8 +1394,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
                "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
                "<ReelNumber>1</ReelNumber>"
                "<Language>de-DE</Language>"
-               "<EditRate>25 1</EditRate>"
-               "<TimeCodeRate>25</TimeCodeRate>"
+               "<EditRate>24 1</EditRate>"
+               "<TimeCodeRate>24</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\">"
@@ -1411,10 +1413,9 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
        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);
+       auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
+       dcp->cpls()[0]->reels()[0]->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(),
@@ -1434,7 +1435,7 @@ 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);
+       auto dcp = make_simple (dir, 1, 106);
 
        string const xml =
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -1445,8 +1446,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
                "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
                "<ReelNumber>1</ReelNumber>"
                "<Language>de-DE</Language>"
-               "<EditRate>25 1</EditRate>"
-               "<TimeCodeRate>25</TimeCodeRate>"
+               "<EditRate>24 1</EditRate>"
+               "<TimeCodeRate>24</TimeCodeRate>"
                "<StartTime>00:00:02:00</StartTime>"
                "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
                "<SubtitleList>"
@@ -1465,10 +1466,9 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
        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);
+       auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 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(),
@@ -1514,7 +1514,7 @@ dcp_with_text (path dir, vector<TestText> subs)
        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 reel_asset = make_shared<T>(asset, dcp::Fraction(24, 1), asset->intrinsic_duration(), 0);
        return write_dcp_with_single_asset (dir, reel_asset);
 }
 
@@ -1523,7 +1523,7 @@ 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 }});
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
        check_verify_result (
                { dir },
                {
@@ -1538,7 +1538,7 @@ 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 }});
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (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() }});
 }
 
@@ -1554,33 +1554,32 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
        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 reel_asset1 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset1, dcp::Fraction(24, 1), 5 * 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);
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 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);
+       add_test_subtitle (asset2, 3, 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 reel_asset2 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset2, dcp::Fraction(24, 1), 4 * 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));
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(4 * 24 - 1, 24, 24));
        reel2->add (markers2);
 
-       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        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(),
@@ -1595,7 +1594,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 4 * 24,     5 * 24 },
@@ -1613,7 +1612,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 4 * 24,      5 * 24 },
@@ -1626,7 +1625,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 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 }});
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
        check_verify_result (
                {dir},
                {
@@ -1639,7 +1638,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 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 }});
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (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() }});
 }
 
@@ -1654,11 +1653,12 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
        asset->set_language (dcp::LanguageTag("de-DE"));
        asset->write (dir / "subs.mxf");
 
-       auto reel_asset = make_shared<dcp::ReelSubtitleAsset>(asset, dcp::Fraction(24, 1), 3 * 24, 0);
+       auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 3 * 24, 0);
        auto cpl = write_dcp_with_single_asset (dir, reel_asset);
        check_verify_result (
                {dir},
                {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "72 96", boost::filesystem::canonical(asset->file().get()) },
                        { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::SUBTITLE_OVERLAPS_REEL_BOUNDARY },
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() }
@@ -1670,7 +1670,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 200, 0.0, "We" },
@@ -1690,7 +1690,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 200, 0.0, "We" },
@@ -1704,7 +1704,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 300, 0.0, "We" },
@@ -1724,7 +1724,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 300, 0.0, "We" },
@@ -1739,7 +1739,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123" }
@@ -1756,7 +1756,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
                dir,
                {
                        { 96, 300, 0.0, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
@@ -1773,7 +1773,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
                dir,
                {
                        { 96, 200, 0.0, "We" },
@@ -1793,7 +1793,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
                dir,
                {
                        { 96, 200, 0.0, "We" },
@@ -1807,7 +1807,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
                dir,
                {
                        { 96, 300, 0.0, "We" },
@@ -1827,7 +1827,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
                dir,
                {
                        { 96, 300, 0.0, "We" },
@@ -1842,7 +1842,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 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> (
+       auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> (
                dir,
                {
                        { 96, 300, 0.0, "0123456789012345678901234567890123" }
@@ -1869,12 +1869,11 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
        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);
+       auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        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(),
@@ -1895,7 +1894,6 @@ 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(),
@@ -1926,7 +1924,6 @@ 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(),
@@ -1956,7 +1953,7 @@ 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));
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 
        shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (dir, "", 24);
        shared_ptr<dcp::SoundAsset> ms = simple_sound (dir, "", dcp::MXFMetadata(), "en-US", 25);
@@ -1971,7 +1968,6 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 
        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(),
@@ -1994,48 +1990,49 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 {
        prepare_directory (dir);
        auto dcp = make_shared<dcp::DCP>(dir);
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+
+       auto constexpr reel_length = 192;
 
        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 reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 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)
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
                );
 
        if (add_to_reel1) {
-               reel1->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+               reel1->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
        }
 
-       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 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)
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
                );
 
        if (add_to_reel2) {
-               reel2->add (make_shared<dcp::ReelSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+               reel2->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
        }
 
-       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
-       markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 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(),
@@ -2080,7 +2077,9 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 {
        prepare_directory (dir);
        auto dcp = make_shared<dcp::DCP>(dir);
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+
+       auto constexpr reel_length = 192;
 
        auto subs = make_shared<dcp::SMPTESubtitleAsset>();
        subs->set_language (dcp::LanguageTag("de-DE"));
@@ -2089,38 +2088,37 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
        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)
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
                );
 
        for (int i = 0; i < caps_in_reel1; ++i) {
-               reel1->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+               reel1->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
        }
 
-       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
+       auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 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)
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
                );
 
        for (int i = 0; i < caps_in_reel2; ++i) {
-               reel2->add (make_shared<dcp::ReelClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0));
+               reel2->add (make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
        }
 
-       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 240, 0);
-       markers2->set (dcp::Marker::LFOC, dcp::Time(239, 24, 24));
+       auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length, 0);
+       markers2->set (dcp::Marker::LFOC, dcp::Time(reel_length - 1, 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(),
@@ -2164,30 +2162,31 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 {
        prepare_directory (dir);
        auto dcp = make_shared<dcp::DCP>(dir);
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
+
+       auto constexpr reel_length = 192;
 
        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);
+       auto reel_text = make_shared<T>(subs, dcp::Fraction(24, 1), reel_length, 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)
+               make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "", reel_length), 0),
+               make_shared<dcp::ReelSoundAsset>(simple_sound(dir, "", dcp::MXFMetadata(), "en-US", reel_length), 0)
                );
 
        reel->add (reel_text);
 
-       reel->add (simple_markers(240));
+       reel->add (simple_markers(reel_length));
 
        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(),
@@ -2205,34 +2204,34 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 
 BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 {
-       verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
+       verify_text_entry_point_check<dcp::ReelSMPTESubtitleAsset> (
                "build/test/verify_subtitle_entry_point_must_be_present",
                dcp::VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT,
-               [](shared_ptr<dcp::ReelSubtitleAsset> asset) {
+               [](shared_ptr<dcp::ReelSMPTESubtitleAsset> asset) {
                        asset->unset_entry_point ();
                        }
                );
 
-       verify_text_entry_point_check<dcp::ReelSubtitleAsset> (
+       verify_text_entry_point_check<dcp::ReelSMPTESubtitleAsset> (
                "build/test/verify_subtitle_entry_point_must_be_zero",
                dcp::VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT,
-               [](shared_ptr<dcp::ReelSubtitleAsset> asset) {
+               [](shared_ptr<dcp::ReelSMPTESubtitleAsset> asset) {
                        asset->set_entry_point (4);
                        }
                );
 
-       verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
+       verify_text_entry_point_check<dcp::ReelSMPTEClosedCaptionAsset> (
                "build/test/verify_closed_caption_entry_point_must_be_present",
                dcp::VerificationNote::Code::MISSING_CLOSED_CAPTION_ENTRY_POINT,
-               [](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
+               [](shared_ptr<dcp::ReelSMPTEClosedCaptionAsset> asset) {
                        asset->unset_entry_point ();
                        }
                );
 
-       verify_text_entry_point_check<dcp::ReelClosedCaptionAsset> (
+       verify_text_entry_point_check<dcp::ReelSMPTEClosedCaptionAsset> (
                "build/test/verify_closed_caption_entry_point_must_be_zero",
                dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ENTRY_POINT,
-               [](shared_ptr<dcp::ReelClosedCaptionAsset> asset) {
+               [](shared_ptr<dcp::ReelSMPTEClosedCaptionAsset> asset) {
                        asset->set_entry_point (9);
                        }
                );
@@ -2246,7 +2245,6 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
        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(),
@@ -2287,7 +2285,6 @@ verify_markers_test (
        }
        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(),
@@ -2389,7 +2386,6 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
        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(),
@@ -2405,7 +2401,6 @@ 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(),
@@ -2433,7 +2428,6 @@ 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(),
@@ -2461,7 +2455,6 @@ 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(),
@@ -2491,7 +2484,6 @@ 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(),
@@ -2519,7 +2511,6 @@ 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(),
@@ -2547,7 +2538,6 @@ 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(),
@@ -2577,7 +2567,6 @@ 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(),
@@ -2605,7 +2594,6 @@ 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(),
@@ -2635,7 +2623,6 @@ 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(),
@@ -2751,7 +2738,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
        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);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 
        dcp::Key key;
 
@@ -2791,9 +2778,13 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
        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);
+       d.write_xml ("OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP", signer);
 
-       check_verify_result ({dir}, {{dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED}});
+       check_verify_result (
+               {dir},
+               {
+                       {dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED},
+               });
 }
 
 
@@ -2804,7 +2795,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_2k)
        auto reader = picture.start_read ();
        auto frame = reader->get_frame (0);
        verify_j2k (frame, notes);
-       dump_notes (notes);
+       BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
 
@@ -2815,7 +2806,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_4k)
        auto reader = picture.start_read ();
        auto frame = reader->get_frame (0);
        verify_j2k (frame, notes);
-       dump_notes (notes);
+       BOOST_REQUIRE_EQUAL (notes.size(), 0U);
 }
 
 
@@ -2824,12 +2815,139 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_libdcp)
        boost::filesystem::path dir = "build/test/verify_jpeg2000_codestream_libdcp";
        prepare_directory (dir);
        auto dcp = make_simple (dir);
-       dcp->write_xml (dcp::Standard::SMPTE);
+       dcp->write_xml ();
        vector<dcp::VerificationNote> notes;
        dcp::MonoPictureAsset picture (find_file(dir, "video"));
        auto reader = picture.start_read ();
        auto frame = reader->get_frame (0);
        verify_j2k (frame, notes);
-       dump_notes (notes);
+       BOOST_REQUIRE_EQUAL (notes.size(), 0U);
+}
+
+
+/** Check that ResourceID and the XML ID being different is spotted */
+BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
+{
+       boost::filesystem::path const dir = "build/test/verify_mismatched_subtitle_resource_id";
+       prepare_directory (dir);
+
+       ASDCP::WriterInfo writer_info;
+       writer_info.LabelSetType = ASDCP::LS_MXF_SMPTE;
+
+       unsigned int c;
+       auto mxf_id = dcp::make_uuid ();
+       Kumu::hex2bin (mxf_id.c_str(), writer_info.AssetUUID, Kumu::UUID_Length, &c);
+       BOOST_REQUIRE (c == Kumu::UUID_Length);
+
+       auto resource_id = dcp::make_uuid ();
+       ASDCP::TimedText::TimedTextDescriptor descriptor;
+       Kumu::hex2bin (resource_id.c_str(), descriptor.AssetID, Kumu::UUID_Length, &c);
+       DCP_ASSERT (c == Kumu::UUID_Length);
+
+       auto xml_id = dcp::make_uuid ();
+       ASDCP::TimedText::MXFWriter writer;
+       auto subs_mxf = dir / "subs.mxf";
+       auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+       BOOST_REQUIRE (ASDCP_SUCCESS(r));
+       writer.WriteTimedTextResource (dcp::String::compose(
+               "<?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:%1</Id>"
+               "<ContentTitleText>Content</ContentTitleText>"
+               "<AnnotationText>Annotation</AnnotationText>"
+               "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+               "<ReelNumber>1</ReelNumber>"
+               "<Language>en-US</Language>"
+               "<EditRate>25 1</EditRate>"
+               "<TimeCodeRate>25</TimeCodeRate>"
+               "<StartTime>00:00:00:00</StartTime>"
+               "<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>",
+               xml_id).c_str());
+
+       writer.Finalize();
+
+       auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
+       auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
+
+       auto cpl = write_dcp_with_single_asset (dir, subs_reel);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_RESOURCE_ID },
+                       { 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() }
+               });
 }
 
+
+/** Check that ResourceID and the MXF ID being the same is spotted */
+BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
+{
+       boost::filesystem::path const dir = "build/test/verify_incorrect_timed_text_id";
+       prepare_directory (dir);
+
+       ASDCP::WriterInfo writer_info;
+       writer_info.LabelSetType = ASDCP::LS_MXF_SMPTE;
+
+       unsigned int c;
+       auto mxf_id = dcp::make_uuid ();
+       Kumu::hex2bin (mxf_id.c_str(), writer_info.AssetUUID, Kumu::UUID_Length, &c);
+       BOOST_REQUIRE (c == Kumu::UUID_Length);
+
+       auto resource_id = mxf_id;
+       ASDCP::TimedText::TimedTextDescriptor descriptor;
+       Kumu::hex2bin (resource_id.c_str(), descriptor.AssetID, Kumu::UUID_Length, &c);
+       DCP_ASSERT (c == Kumu::UUID_Length);
+
+       auto xml_id = resource_id;
+       ASDCP::TimedText::MXFWriter writer;
+       auto subs_mxf = dir / "subs.mxf";
+       auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
+       BOOST_REQUIRE (ASDCP_SUCCESS(r));
+       writer.WriteTimedTextResource (dcp::String::compose(
+               "<?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:%1</Id>"
+               "<ContentTitleText>Content</ContentTitleText>"
+               "<AnnotationText>Annotation</AnnotationText>"
+               "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+               "<ReelNumber>1</ReelNumber>"
+               "<Language>en-US</Language>"
+               "<EditRate>25 1</EditRate>"
+               "<TimeCodeRate>25</TimeCodeRate>"
+               "<StartTime>00:00:00:00</StartTime>"
+               "<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>",
+               xml_id).c_str());
+
+       writer.Finalize();
+
+       auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
+       auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
+
+       auto cpl = write_dcp_with_single_asset (dir, subs_reel);
+
+       check_verify_result (
+               { dir },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_TIMED_TEXT_DURATION , "240 0", boost::filesystem::canonical(subs_mxf) },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INCORRECT_TIMED_TEXT_ASSET_ID },
+                       { 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() }
+               });
+}