);
break;
case ParseState::Type::IMAGE:
+ {
+ switch (standard) {
+ case Standard::INTEROP:
+ if (text.size() >= 4) {
+ /* Remove file extension */
+ text = text.substr(0, text.size() - 4);
+ }
+ break;
+ case Standard::SMPTE:
+ /* It looks like this urn:uuid: is required, but DoM wasn't expecting it (and not writing it)
+ * until around 2.15.140 so I guess either:
+ * a) it is not (always) used in the field, or
+ * b) nobody noticed / complained.
+ */
+ if (text.substr(0, 9) == "urn:uuid:") {
+ text = text.substr(9);
+ }
+ break;
+ }
+
/* Add a subtitle with no image data and we'll fill that in later */
_subtitles.push_back (
make_shared<SubtitleImage>(
ArrayData(),
- standard == Standard::INTEROP ? text.substr(0, text.size() - 4) : text,
+ text,
ps.in.get(),
ps.out.get(),
ps.h_position.get_value_or(0),
);
break;
}
+ }
}
}
-/** And another one featuring image subtitles */
-BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
-{
- dcp::SMPTESubtitleAsset subs ("test/data/subs.mxf");
-
- BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
- auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles()[0]);
- BOOST_REQUIRE (si);
- BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
-}
-
-
/* Write some subtitle content as SMPTE XML and check that it is right */
BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
{
c.set_reel_number (1);
c.set_language (dcp::LanguageTag("en"));
c.set_content_title_text ("Test");
+ c.set_start_time (dcp::Time());
+
+ boost::filesystem::path const sub_image = "test/data/sub.png";
c.add (
make_shared<dcp::SubtitleImage>(
- dcp::ArrayData ("test/data/sub.png"),
+ dcp::ArrayData(sub_image),
dcp::Time (0, 4, 9, 22, 24),
dcp::Time (0, 4, 11, 22, 24),
0,
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 */
+ boost::filesystem::path path = "build/test/write_smpte_subtitle_test3";
+ boost::filesystem::create_directories (path);
+ c.write (path / "subs.mxf");
+
+ dcp::SMPTESubtitleAsset read_back (path / "subs.mxf");
+ auto subs = read_back.subtitles ();
+ BOOST_REQUIRE_EQUAL (subs.size(), 1U);
+ auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subs[0]);
+ BOOST_REQUIRE (image);
+
+ BOOST_CHECK (image->png_image() == dcp::ArrayData(sub_image));
+ BOOST_CHECK (image->in() == dcp::Time(0, 4, 9, 22, 24));
+ BOOST_CHECK (image->out() == dcp::Time(0, 4, 11, 22, 24));
+ BOOST_CHECK_CLOSE (image->h_position(), 0.0, 1);
+ BOOST_CHECK (image->h_align() == dcp::HAlign::CENTER);
+ BOOST_CHECK_CLOSE (image->v_position(), 0.8, 1);
+ BOOST_CHECK (image->v_align() == dcp::VAlign::TOP);
+ BOOST_CHECK (image->fade_up_time() == dcp::Time(0, 0, 0, 0, 24));
+ BOOST_CHECK (image->fade_down_time() == dcp::Time(0, 0, 0, 0, 24));
}
};
-#if 0
+LIBDCP_DISABLE_WARNINGS
static
void
dump_notes (vector<dcp::VerificationNote> const & notes)
std::cout << dcp::note_to_string(i) << "\n";
}
}
-#endif
+LIBDCP_ENABLE_WARNINGS
static
path const dir("build/test/verify_invalid_smpte_subtitles");
prepare_directory (dir);
+ /* This broken_smpte.mxf does not use urn:uuid: for its subtitle ID, which we tolerate (rightly or wrongly) */
copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);