From 89fbc8d186378cd72ab3e9a259073d45b7b993ad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Feb 2023 21:56:22 +0100 Subject: Change how whitespace in subtitles is handled. Previously we would discard any whitespace subtitle content we found. This had the side-effect of making a verification test fail (checking that at least one subtitle is in each reel; blank subtitles are often used to avoid this warning). Here we take any subtitle content, whitespace or not, inside a or node which I think is a little more correct. --- test/data/subs5.xml | 13 +++++++++++++ test/verify_test.cc | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 test/data/subs5.xml (limited to 'test') diff --git a/test/data/subs5.xml b/test/data/subs5.xml new file mode 100644 index 00000000..d75583b9 --- /dev/null +++ b/test/data/subs5.xml @@ -0,0 +1,13 @@ + + +12345678-9abc-def0-1234-56789abcdef0 +Frobozz +1 +English + + + + + + + diff --git a/test/verify_test.cc b/test/verify_test.cc index cde49830..396a1ef5 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -825,6 +825,24 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles) } +BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle) +{ + path const dir("build/test/verify_interop_subtitle_asset_with_single_space_subtitle"); + prepare_directory(dir); + copy_file("test/data/subs5.xml", dir / "subs.xml"); + auto asset = make_shared(dir / "subs.xml"); + auto reel_asset = make_shared(asset, dcp::Fraction(24, 1), 16 * 24, 0); + write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP); + + check_verify_result ( + { dir }, + { + { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_STANDARD }, + }); + +} + + BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles) { path const dir("build/test/verify_valid_smpte_subtitles"); -- cgit v1.2.3