Don't write Markers to interop CPLs (#2537).

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 062d3ca812441a984fbd79eeca912f3f58f89366..658de0a62953bbd5b498c8f58f09f9a7e198e8ae 100644 (file)
--- 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
index e9a0aaeeafed9ba73d09e0ee97f6fe2f6ba1b9d6..31458f4b7a93bd95d23b4b58eb89503e8cec8759 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit e9a0aaeeafed9ba73d09e0ee97f6fe2f6ba1b9d6
+Subproject commit 31458f4b7a93bd95d23b4b58eb89503e8cec8759

diff --git a/test/markers_test.cc b/test/markers_test.cc
index afea00d525ebcce2db2b376b215db6a27d1b1dc2..a3c46af44109e237de0aad77f390b418905f1ec3 100644 (file)
--- 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);
+}
+