<ContentVersion> is optional in Interop so we can't assume it's there.
[libdcp.git] / test / write_subtitle_test.cc
index 292a00d579a6f4aa8a848fbfeb727023896ba1d0..4bdc6e9d04995f027bfc6bc97c51536d3dd5eb6d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "interop_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "subtitle_string.h"
+#include "subtitle_image.h"
 #include "subtitle_asset_internal.h"
+#include "reel_subtitle_asset.h"
+#include "reel.h"
+#include "cpl.h"
+#include "dcp.h"
 #include "test.h"
+#include "util.h"
 #include <boost/test/unit_test.hpp>
 
 using std::list;
 using std::string;
+using boost::optional;
 using boost::shared_ptr;
 
 /** Test dcp::order::Font::take_intersection */
@@ -146,77 +167,241 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
        c.set_movie_title ("Test");
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Frutiger"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 4,  9, 22, 24),
-                       dcp::Time (0, 4, 11, 22, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.8,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "Hello world",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Frutiger"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Hello world",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       boost::optional<string> (),
-                       true,
-                       true,
-                       true,
-                       dcp::Colour (128, 0, 64),
-                       91,
-                       1.0,
-                       dcp::Time (5, 41,  0, 21, 24),
-                       dcp::Time (6, 12, 15, 21, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.4,
-                       dcp::VALIGN_BOTTOM,
-                       dcp::DIRECTION_LTR,
-                       "What's going on",
-                       dcp::BORDER,
-                       dcp::Colour (1, 2, 3),
-                       dcp::Time (1, 2, 3, 4, 24),
-                       dcp::Time (5, 6, 7, 8, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               boost::optional<string> (),
+                               true,
+                               true,
+                               true,
+                               dcp::Colour (128, 0, 64),
+                               91,
+                               1.0,
+                               dcp::Time (5, 41,  0, 21, 24),
+                               dcp::Time (6, 12, 15, 21, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.4,
+                               dcp::VALIGN_BOTTOM,
+                               dcp::DIRECTION_LTR,
+                               "What's going on",
+                               dcp::BORDER,
+                               dcp::Colour (1, 2, 3),
+                               dcp::Time (1, 2, 3, 4, 24),
+                               dcp::Time (5, 6, 7, 8, 24)
+                               )
                        )
                );
 
        c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
        check_xml (
+               "<DCSubtitle Version=\"1.0\">"
+                 "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
+                 "<MovieTitle>Test</MovieTitle>"
+                 "<ReelNumber>1</ReelNumber>"
+                 "<Language>EN</Language>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
+                   "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
+                     "<Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
+                   "</Subtitle>"
+                 "</Font>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
+                   "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
+                     "<Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
+                   "</Subtitle>"
+                 "</Font>"
+               "</DCSubtitle>",
                c.xml_as_string (),
-               "<DCSubtitle Version=\"1.0\">\n"
-               "  <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
-               "  <MovieTitle>Test</MovieTitle>\n"
-               "  <ReelNumber>1</ReelNumber>\n"
-               "  <Language>EN</Language>\n"
-               "  <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
-               "    <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
-               "      <Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
-               "    </Subtitle>\n"
-               "  </Font>\n"
-               "  <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
-               "    <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:218\" TimeOut=\"06:12:15:218\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
-               "      <Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n"
-               "    </Subtitle>\n"
-               "  </Font>\n"
+               list<string> ()
+               );
+}
+
+/** Write some subtitle content as Interop XML and check that it is right.
+ *  This test includes some horizontal alignment.
+ */
+BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
+{
+       dcp::InteropSubtitleAsset c;
+       c.set_reel_number ("1");
+       c.set_language ("EN");
+       c.set_movie_title ("Test");
+
+       c.add (
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Frutiger"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               -0.2,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Hello world",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               boost::optional<string> (),
+                               true,
+                               true,
+                               true,
+                               dcp::Colour (128, 0, 64),
+                               91,
+                               1.0,
+                               dcp::Time (5, 41,  0, 21, 24),
+                               dcp::Time (6, 12, 15, 21, 24),
+                               -0.2,
+                               dcp::HALIGN_CENTER,
+                               0.4,
+                               dcp::VALIGN_BOTTOM,
+                               dcp::DIRECTION_LTR,
+                               "What's going on",
+                               dcp::BORDER,
+                               dcp::Colour (1, 2, 3),
+                               dcp::Time (1, 2, 3, 4, 24),
+                               dcp::Time (5, 6, 7, 8, 24)
+                               )
+                       )
+               );
+
+       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+
+       check_xml (
+               "<DCSubtitle Version=\"1.0\">"
+                 "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
+                 "<MovieTitle>Test</MovieTitle>"
+                 "<ReelNumber>1</ReelNumber>"
+                 "<Language>EN</Language>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
+                   "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
+                     "<Text HPosition=\"-20\" VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
+                   "</Subtitle>"
+                 "</Font>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
+                   "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
+                     "<Text HPosition=\"-20\" VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
+                   "</Subtitle>"
+                 "</Font>"
                "</DCSubtitle>",
+               c.xml_as_string (),
                list<string> ()
                );
 }
 
+/* Write some subtitle content as Interop XML using bitmaps and check that it is right */
+BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
+{
+       RNGFixer fix;
+
+       shared_ptr<dcp::InteropSubtitleAsset> c (new dcp::InteropSubtitleAsset());
+       c->set_reel_number ("1");
+       c->set_language ("EN");
+       c->set_movie_title ("Test");
+
+       c->add (
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleImage (
+                               dcp::Data ("test/data/sub.png"),
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c->_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+       boost::filesystem::remove_all ("build/test/write_interop_subtitle_test3");
+       boost::filesystem::create_directories ("build/test/write_interop_subtitle_test3");
+       c->write ("build/test/write_interop_subtitle_test3/subs.xml");
+
+       shared_ptr<dcp::Reel> reel (new dcp::Reel());
+       reel->add(shared_ptr<dcp::ReelSubtitleAsset>(new dcp::ReelSubtitleAsset(c, dcp::Fraction(24, 1), 6046, 0)));
+
+       string const issue_date = "2018-09-02T04:45:18+00:00";
+       string const issuer = "libdcp";
+       string const creator = "libdcp";
+       string const annotation_text = "Created by libdcp";
+
+       shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
+       cpl->add (reel);
+       cpl->set_issuer (issuer);
+       cpl->set_creator (creator);
+       cpl->set_issue_date (issue_date);
+       cpl->set_annotation_text (annotation_text);
+       optional<dcp::ContentVersion> cv = cpl->content_version();
+       BOOST_REQUIRE (cv);
+       cv->label_text = "foo";
+       cpl->set_content_version (*cv);
+
+       dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
+       dcp.add (cpl);
+       dcp.write_xml (dcp::INTEROP, issuer, creator, issue_date, annotation_text);
+
+       check_xml (
+               dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),
+               dcp::file_to_string("build/test/write_interop_subtitle_test3/subs.xml"),
+               list<string>()
+               );
+       check_file ("build/test/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png", "test/data/sub.png");
+
+       check_xml (
+               dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
+               dcp::file_to_string("build/test/write_interop_subtitle_test3/ASSETMAP"),
+               list<string>()
+               );
+
+       check_xml (
+               dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"),
+               dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"),
+               list<string>()
+               );
+}
+
 /* Write some subtitle content as SMPTE XML and check that it is right */
 BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 {
@@ -227,79 +412,83 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
        c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Frutiger"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 4,  9, 22, 24),
-                       dcp::Time (0, 4, 11, 22, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.8,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "Hello world",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Frutiger"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Hello world",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       boost::optional<string> (),
-                       true,
-                       true,
-                       true,
-                       dcp::Colour (128, 0, 64),
-                       91,
-                       1.0,
-                       dcp::Time (5, 41,  0, 21, 24),
-                       dcp::Time (6, 12, 15, 21, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.4,
-                       dcp::VALIGN_BOTTOM,
-                       dcp::DIRECTION_RTL,
-                       "What's going on",
-                       dcp::BORDER,
-                       dcp::Colour (1, 2, 3),
-                       dcp::Time (1, 2, 3, 4, 24),
-                       dcp::Time (5, 6, 7, 8, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               boost::optional<string> (),
+                               true,
+                               true,
+                               true,
+                               dcp::Colour (128, 0, 64),
+                               91,
+                               1.0,
+                               dcp::Time (5, 41,  0, 21, 24),
+                               dcp::Time (6, 12, 15, 21, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.4,
+                               dcp::VALIGN_BOTTOM,
+                               dcp::DIRECTION_RTL,
+                               "What's going on",
+                               dcp::BORDER,
+                               dcp::Colour (1, 2, 3),
+                               dcp::Time (1, 2, 3, 4, 24),
+                               dcp::Time (5, 6, 7, 8, 24)
+                               )
                        )
                );
 
-       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
        check_xml (
+               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
+                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
+                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
+                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
+                 "<dcst:Language>EN</dcst:Language>"
+                 "<dcst:EditRate>24 1</dcst:EditRate>"
+                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
+                 "<dcst:SubtitleList>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<dcst:Text Valign=\"top\" Vposition=\"80\">Hello world</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">"
+                     "<dcst:Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">"
+                       "<dcst:Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                 "</dcst:SubtitleList>"
+               "</dcst:SubtitleReel>",
                c.xml_as_string (),
-               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
-               "  <dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>\n"
-               "  <dcst:ContentTitleText>Test</dcst:ContentTitleText>\n"
-               "  <dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>\n"
-               "  <dcst:ReelNumber>1</dcst:ReelNumber>\n"
-               "  <dcst:Language>EN</dcst:Language>\n"
-               "  <dcst:EditRate>24 1</dcst:EditRate>\n"
-               "  <dcst:TimeCodeRate>24</dcst:TimeCodeRate>\n"
-               "  <dcst:SubtitleList>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
-               "      <dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"80\">Hello world</dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">\n"
-               "      <dcst:Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">\n"
-               "        <dcst:Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "  </dcst:SubtitleList>\n"
-               "</dcst:SubtitleReel>\n",
                list<string> ()
                );
 }
@@ -316,179 +505,223 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
        c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.8,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "Testing is ",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Testing is ",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       true,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.8,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "really",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               true,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "really",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.8,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       " fun",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               " fun",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.9,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "This is the ",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "This is the ",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       true,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.9,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       "second",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               true,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "second",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
        c.add (
-               dcp::SubtitleString (
-                       string ("Arial"),
-                       false,
-                       false,
-                       false,
-                       dcp::Colour (255, 255, 255),
-                       48,
-                       1.0,
-                       dcp::Time (0, 0, 1, 0, 24),
-                       dcp::Time (0, 0, 9, 0, 24),
-                       0,
-                       dcp::HALIGN_CENTER,
-                       0.9,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       " line",
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (0, 0, 0, 0, 24),
-                       dcp::Time (0, 0, 0, 0, 24)
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleString (
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               " line",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
                        )
                );
 
-       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
        check_xml (
                c.xml_as_string (),
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
-               "  <dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>\n"
-               "  <dcst:ContentTitleText>Test</dcst:ContentTitleText>\n"
-               "  <dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>\n"
-               "  <dcst:ReelNumber>1</dcst:ReelNumber>\n"
-               "  <dcst:Language>EN</dcst:Language>\n"
-               "  <dcst:EditRate>24 1</dcst:EditRate>\n"
-               "  <dcst:TimeCodeRate>24</dcst:TimeCodeRate>\n"
-               "  <dcst:SubtitleList>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
-               "      <dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"80\">\n"
-               "          <dcst:Font Italic=\"no\">Testing is </dcst:Font>\n"
-               "          <dcst:Font Italic=\"yes\">really</dcst:Font>\n"
-               "          <dcst:Font Italic=\"no\"> fun</dcst:Font>\n"
-               "        </dcst:Text>\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"90\">\n"
-               "          <dcst:Font Italic=\"no\">This is the </dcst:Font>\n"
-               "          <dcst:Font Italic=\"yes\">second</dcst:Font>\n"
-               "          <dcst:Font Italic=\"no\"> line</dcst:Font>\n"
-               "        </dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "  </dcst:SubtitleList>\n"
-               "</dcst:SubtitleReel>\n",
+               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
+                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
+                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
+                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
+                 "<dcst:Language>EN</dcst:Language>"
+                 "<dcst:EditRate>24 1</dcst:EditRate>"
+                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
+                 "<dcst:SubtitleList>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<dcst:Text Valign=\"top\" Vposition=\"80\">"
+                         "<dcst:Font Italic=\"no\">Testing is </dcst:Font>"
+                         "<dcst:Font Italic=\"yes\">really</dcst:Font>"
+                         "<dcst:Font Italic=\"no\"> fun</dcst:Font>"
+                       "</dcst:Text>"
+                       "<dcst:Text Valign=\"top\" Vposition=\"90\">"
+                         "<dcst:Font Italic=\"no\">This is the </dcst:Font>"
+                         "<dcst:Font Italic=\"yes\">second</dcst:Font>"
+                         "<dcst:Font Italic=\"no\"> line</dcst:Font>"
+                       "</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                 "</dcst:SubtitleList>"
+               "</dcst:SubtitleReel>",
                list<string> ()
                );
 }
+
+/* Write some subtitle content as SMPTE using bitmaps and check that it is right */
+BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
+{
+       dcp::SMPTESubtitleAsset c;
+       c.set_reel_number (1);
+       c.set_language ("EN");
+       c.set_content_title_text ("Test");
+
+       c.add (
+               shared_ptr<dcp::Subtitle> (
+                       new dcp::SubtitleImage (
+                               dcp::Data ("test/data/sub.png"),
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+
+       boost::filesystem::create_directories ("build/test/write_smpte_subtitle_test3");
+       c.write ("build/test/write_smpte_subtitle_test3/subs.mxf");
+
+       /* XXX: check this result when we can read them back in again */
+}