diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-14 09:56:21 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-14 16:20:53 +0200 |
| commit | 098007a1ee6a46b6ff11398f94faff5c85951da4 (patch) | |
| tree | 3459f804ad51d8e22a2a0c1e9bcca5cf0e623a6f /test/verify_test.cc | |
| parent | 1ffc787c6318815592e8d81c4878488eb6183ca4 (diff) | |
Improve handling of image subtitle IDs in XML (DoM bug #1965)
When reading/writing the XML for image subtitles, we assumed that
the content of the <Image> tag is just the ID of the PNG in the MXF,
without any prefix.
DoM bug #1965 mentions a DCP where this is not the case, and SMPTE
429-5-2009 has an example where there is urn:uuid: in the XML.
This change makes DoM write this urn:uuid: prefix, and accept it if
it's present (but not complain if it's not).
If the urn:uuid: _is_ required in the field, it's a bit surprising
that nobody has complained up to this point. Maybe nobody noticed,
or nobody reported it.
Diffstat (limited to 'test/verify_test.cc')
| -rw-r--r-- | test/verify_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/verify_test.cc b/test/verify_test.cc index 4e26c66e..e1637911 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -193,7 +193,7 @@ private: }; -#if 0 +LIBDCP_DISABLE_WARNINGS static void dump_notes (vector<dcp::VerificationNote> const & notes) @@ -202,7 +202,7 @@ dump_notes (vector<dcp::VerificationNote> const & notes) std::cout << dcp::note_to_string(i) << "\n"; } } -#endif +LIBDCP_ENABLE_WARNINGS static @@ -706,6 +706,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles) 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); |