Rename read_interop_subtitle_test -> interop_subtitle_test.
authorCarl Hetherington <cth@carlh.net>
Wed, 14 Apr 2021 09:23:59 +0000 (11:23 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Apr 2021 15:46:46 +0000 (17:46 +0200)
Cherry-picked from 72d9cb462c03b1b41380e50ab9cccf2950207c18 in master.

test/interop_subtitle_test.cc [new file with mode: 0644]
test/read_interop_subtitle_test.cc [deleted file]
test/wscript

diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
new file mode 100644 (file)
index 0000000..f111b80
--- /dev/null
@@ -0,0 +1,610 @@
+/*
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "interop_subtitle_asset.h"
+#include "interop_load_font_node.h"
+#include "subtitle_string.h"
+#include "subtitle_image.h"
+#include <boost/test/unit_test.hpp>
+#include <iostream>
+
+using std::list;
+using std::string;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+/** Load some subtitle content from Interop XML and check that it is read correctly */
+BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
+{
+       dcp::InteropSubtitleAsset subs ("test/data/subs1.xml");
+
+       BOOST_CHECK_EQUAL (subs.id(), "cab5c268-222b-41d2-88ae-6d6999441b17");
+       BOOST_CHECK_EQUAL (subs.movie_title(), "Movie Title");
+       BOOST_CHECK_EQUAL (subs.reel_number(), "1");
+       BOOST_CHECK_EQUAL (subs.language(), "French");
+
+       list<shared_ptr<dcp::LoadFontNode> > lfn = subs.load_font_nodes ();
+       BOOST_REQUIRE_EQUAL (lfn.size(), 1);
+       shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ());
+       BOOST_REQUIRE (interop_lfn);
+       BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
+       BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
+
+       list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 1);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFontId"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  39,
+                                  1.0,
+                                  dcp::Time (0, 0, 5, 198, 250),
+                                  dcp::Time (0, 0, 7, 115, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.15,
+                                  dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
+                                  "My jacket was Idi Amin's",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 1, 250),
+                                  dcp::Time (0, 0, 0, 1, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFontId"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  39,
+                                  1.0,
+                                  dcp::Time (0, 0, 7, 177, 250),
+                                  dcp::Time (0, 0, 11, 31, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.21,
+                                  dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
+                                  "My corset was H.M. The Queen's",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 1, 250),
+                                  dcp::Time (0, 0, 0, 1, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFontId"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  39,
+                                  1.0,
+                                  dcp::Time (0, 0, 7, 177, 250),
+                                  dcp::Time (0, 0, 11, 31, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.15,
+                                  dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
+                                  "My large wonderbra",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 1, 250),
+                                  dcp::Time (0, 0, 0, 1, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 1);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFontId"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  39,
+                                  1.0,
+                                  dcp::Time (0, 0, 11, 94, 250),
+                                  dcp::Time (0, 0, 13, 63, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.15,
+                                  dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
+                                  "Once belonged to the Shah",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 1, 250),
+                                  dcp::Time (0, 0, 0, 1, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 1);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFontId"),
+                                  false,
+                                  true,
+                                  true,
+                                  dcp::Colour (255, 255, 255),
+                                  39,
+                                  1.0,
+                                  dcp::Time (0, 0, 13, 104, 250),
+                                  dcp::Time (0, 0, 15, 177, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.15,
+                                  dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
+                                  "And these are Roy Hattersley's jeans",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 1, 250),
+                                  dcp::Time (0, 0, 0, 1, 250)
+                                  ));
+}
+
+/** And similarly for another one */
+BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
+{
+       dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
+
+       list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 0, 41, 62, 250),
+                                  dcp::Time (0, 0, 43, 52, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "At afternoon tea with John Peel",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 0, 41, 62, 250),
+                                  dcp::Time (0, 0, 43, 52, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "I enquired if his accent was real",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 0, 50, 42, 250),
+                                  dcp::Time (0, 0, 52, 21, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "He said \"out of the house",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 0, 50, 42, 250),
+                                  dcp::Time (0, 0, 52, 21, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "I'm incredibly scouse",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 2, 208, 250),
+                                  dcp::Time (0, 1, 4, 10, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "At home it depends how I feel.\"",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 2, 208, 250),
+                                  dcp::Time (0, 1, 4, 10, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "I spent a long weekend in Brighton",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 15, 42, 250),
+                                  dcp::Time (0, 1, 16, 42, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_RTL,
+                                  "With the legendary Miss Enid Blyton",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 15, 42, 250),
+                                  dcp::Time (0, 1, 16, 42, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_TTB,
+                                  "She said \"you be Noddy",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 27, 115, 250),
+                                  dcp::Time (0, 1, 28, 208, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_BTT,
+                                  "That curious creature the Sphinx",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 27, 115, 250),
+                                  dcp::Time (0, 1, 28, 208, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "Is smarter than anyone thinks",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 42, 229, 250),
+                                  dcp::Time (0, 1, 45, 62, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "It sits there and smirks",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 42, 229, 250),
+                                  dcp::Time (0, 1, 45, 62, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "And you don't think it works",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 45, 146, 250),
+                                  dcp::Time (0, 1, 47, 94, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "Then when you're not looking, it winks.",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 45, 146, 250),
+                                  dcp::Time (0, 1, 47, 94, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "When it snows you will find Sister Sledge",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 47, 146, 250),
+                                  dcp::Time (0, 1, 48, 167, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "Out mooning, at night, on the ledge",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  false,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 1, 47, 146, 250),
+                                  dcp::Time (0, 1, 48, 167, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "One storey down",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+
+       s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
+       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 2, 5, 208, 250),
+                                  dcp::Time (0, 2, 7, 31, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.89,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "HELLO",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+                                  string ("theFont"),
+                                  true,
+                                  false,
+                                  false,
+                                  dcp::Colour (255, 255, 255),
+                                  42,
+                                  1.0,
+                                  dcp::Time (0, 2, 5, 208, 250),
+                                  dcp::Time (0, 2, 7, 31, 250),
+                                  0,
+                                  dcp::HALIGN_CENTER,
+                                  0.95,
+                                  dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
+                                  "WORLD",
+                                  dcp::BORDER,
+                                  dcp::Colour (0, 0, 0),
+                                  dcp::Time (0, 0, 0, 0, 250),
+                                  dcp::Time (0, 0, 0, 0, 250)
+                                  ));
+}
+
+/** And one with bitmap subtitles */
+BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
+{
+       dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
+
+       BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
+       shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
+       BOOST_REQUIRE (si);
+       BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+}
diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
deleted file mode 100644 (file)
index f111b80..0000000
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
-
-    This file is part of libdcp.
-
-    libdcp is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    libdcp is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "interop_subtitle_asset.h"
-#include "interop_load_font_node.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include <boost/test/unit_test.hpp>
-#include <iostream>
-
-using std::list;
-using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-
-/** Load some subtitle content from Interop XML and check that it is read correctly */
-BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
-{
-       dcp::InteropSubtitleAsset subs ("test/data/subs1.xml");
-
-       BOOST_CHECK_EQUAL (subs.id(), "cab5c268-222b-41d2-88ae-6d6999441b17");
-       BOOST_CHECK_EQUAL (subs.movie_title(), "Movie Title");
-       BOOST_CHECK_EQUAL (subs.reel_number(), "1");
-       BOOST_CHECK_EQUAL (subs.language(), "French");
-
-       list<shared_ptr<dcp::LoadFontNode> > lfn = subs.load_font_nodes ();
-       BOOST_REQUIRE_EQUAL (lfn.size(), 1);
-       shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ());
-       BOOST_REQUIRE (interop_lfn);
-       BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
-       BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
-
-       list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 1);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFontId"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  39,
-                                  1.0,
-                                  dcp::Time (0, 0, 5, 198, 250),
-                                  dcp::Time (0, 0, 7, 115, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
-                                  "My jacket was Idi Amin's",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 1, 250),
-                                  dcp::Time (0, 0, 0, 1, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFontId"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  39,
-                                  1.0,
-                                  dcp::Time (0, 0, 7, 177, 250),
-                                  dcp::Time (0, 0, 11, 31, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.21,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
-                                  "My corset was H.M. The Queen's",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 1, 250),
-                                  dcp::Time (0, 0, 0, 1, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFontId"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  39,
-                                  1.0,
-                                  dcp::Time (0, 0, 7, 177, 250),
-                                  dcp::Time (0, 0, 11, 31, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
-                                  "My large wonderbra",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 1, 250),
-                                  dcp::Time (0, 0, 0, 1, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 1);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFontId"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  39,
-                                  1.0,
-                                  dcp::Time (0, 0, 11, 94, 250),
-                                  dcp::Time (0, 0, 13, 63, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
-                                  "Once belonged to the Shah",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 1, 250),
-                                  dcp::Time (0, 0, 0, 1, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 1);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFontId"),
-                                  false,
-                                  true,
-                                  true,
-                                  dcp::Colour (255, 255, 255),
-                                  39,
-                                  1.0,
-                                  dcp::Time (0, 0, 13, 104, 250),
-                                  dcp::Time (0, 0, 15, 177, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.15,
-                                  dcp::VALIGN_BOTTOM,
-                                  dcp::DIRECTION_LTR,
-                                  "And these are Roy Hattersley's jeans",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 1, 250),
-                                  dcp::Time (0, 0, 0, 1, 250)
-                                  ));
-}
-
-/** And similarly for another one */
-BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
-{
-       dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
-
-       list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 0, 41, 62, 250),
-                                  dcp::Time (0, 0, 43, 52, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "At afternoon tea with John Peel",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 0, 41, 62, 250),
-                                  dcp::Time (0, 0, 43, 52, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "I enquired if his accent was real",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 0, 50, 42, 250),
-                                  dcp::Time (0, 0, 52, 21, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "He said \"out of the house",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 0, 50, 42, 250),
-                                  dcp::Time (0, 0, 52, 21, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "I'm incredibly scouse",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 2, 208, 250),
-                                  dcp::Time (0, 1, 4, 10, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "At home it depends how I feel.\"",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 2, 208, 250),
-                                  dcp::Time (0, 1, 4, 10, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "I spent a long weekend in Brighton",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 15, 42, 250),
-                                  dcp::Time (0, 1, 16, 42, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_RTL,
-                                  "With the legendary Miss Enid Blyton",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 15, 42, 250),
-                                  dcp::Time (0, 1, 16, 42, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_TTB,
-                                  "She said \"you be Noddy",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 27, 115, 250),
-                                  dcp::Time (0, 1, 28, 208, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_BTT,
-                                  "That curious creature the Sphinx",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 27, 115, 250),
-                                  dcp::Time (0, 1, 28, 208, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "Is smarter than anyone thinks",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 42, 229, 250),
-                                  dcp::Time (0, 1, 45, 62, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "It sits there and smirks",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 42, 229, 250),
-                                  dcp::Time (0, 1, 45, 62, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "And you don't think it works",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 45, 146, 250),
-                                  dcp::Time (0, 1, 47, 94, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "Then when you're not looking, it winks.",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 45, 146, 250),
-                                  dcp::Time (0, 1, 47, 94, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "When it snows you will find Sister Sledge",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 47, 146, 250),
-                                  dcp::Time (0, 1, 48, 167, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "Out mooning, at night, on the ledge",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  false,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 1, 47, 146, 250),
-                                  dcp::Time (0, 1, 48, 167, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "One storey down",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-
-       s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 2, 5, 208, 250),
-                                  dcp::Time (0, 2, 7, 31, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.89,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "HELLO",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
-                                  string ("theFont"),
-                                  true,
-                                  false,
-                                  false,
-                                  dcp::Colour (255, 255, 255),
-                                  42,
-                                  1.0,
-                                  dcp::Time (0, 2, 5, 208, 250),
-                                  dcp::Time (0, 2, 7, 31, 250),
-                                  0,
-                                  dcp::HALIGN_CENTER,
-                                  0.95,
-                                  dcp::VALIGN_TOP,
-                                  dcp::DIRECTION_LTR,
-                                  "WORLD",
-                                  dcp::BORDER,
-                                  dcp::Colour (0, 0, 0),
-                                  dcp::Time (0, 0, 0, 0, 250),
-                                  dcp::Time (0, 0, 0, 0, 250)
-                                  ));
-}
-
-/** And one with bitmap subtitles */
-BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
-{
-       dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
-
-       BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-       shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
-       BOOST_REQUIRE (si);
-       BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
-}
index aab970424b6bfa18df2266d9929862e5cb5cf906..eea4c68d058f7ee122dcf0b4e28d008416204014 100644 (file)
@@ -78,12 +78,12 @@ def build(bld):
                  frame_info_hash_test.cc
                  gamma_transfer_function_test.cc
                  interop_load_font_test.cc
+                 interop_subtitle_test.cc
                  local_time_test.cc
                  make_digest_test.cc
                  kdm_test.cc
                  raw_convert_test.cc
                  read_dcp_test.cc
-                 read_interop_subtitle_test.cc
                  reel_asset_test.cc
                  recovery_test.cc
                  rgb_xyz_test.cc