diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-05-28 20:59:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-05-29 10:25:55 +0200 |
| commit | 86b88c37c34de9cd0c51e0825d28b6258e2451d2 (patch) | |
| tree | b7c19b3b49fa321607b29f9ff0356ced6ba8ed36 | |
| parent | 002488d046de36f7795bc0d21e1171d414953b1a (diff) | |
Don't write Markers to interop CPLs (#2537).
| -rw-r--r-- | src/lib/reel_writer.cc | 4 | ||||
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/markers_test.cc | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 062d3ca81..658de0a62 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -762,7 +762,9 @@ ReelWriter::create_reel ( auto reel_picture_asset = create_reel_picture (reel, refs); duration = reel_picture_asset->actual_duration (); create_reel_sound (reel, refs); - create_reel_markers (reel); + if (!film()->interop()) { + create_reel_markers(reel); + } } create_reel_text(reel, refs, duration, output_dcp, ensure_subtitles, ensure_closed_captions); diff --git a/test/data b/test/data -Subproject e9a0aaeeafed9ba73d09e0ee97f6fe2f6ba1b9d +Subproject 31458f4b7a93bd95d23b4b58eb89503e8cec875 diff --git a/test/markers_test.cc b/test/markers_test.cc index afea00d52..a3c46af44 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -139,3 +139,16 @@ BOOST_AUTO_TEST_CASE(markers_correct_with_reels) BOOST_CHECK(*lfoc == dcp::Time(0, 0, 9, 23, 24)); } + +BOOST_AUTO_TEST_CASE(no_markers_with_interop) +{ + string const name = "no_markers_with_interop"; + auto film = new_test_film2(name, content_factory("test/data/flat_red.png")); + + film->set_interop(true); + make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_STANDARD }); + + auto cpl = find_file(film->dir(film->dcp_name()), "cpl_"); + BOOST_CHECK(dcp::file_to_string(cpl).find("MainMarkers") == std::string::npos); +} + |