From 8edc349253daf5eb0d9ceb75f467cdbbc668f27a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Feb 2017 13:39:12 +0000 Subject: [PATCH] Default to SMPTE for tests. --- test/import_dcp_test.cc | 2 -- test/isdcf_name_test.cc | 1 - test/test.cc | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 4e08324ae..cd0396d07 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -40,7 +40,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) A->set_container (Ratio::from_id ("185")); A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); A->set_name ("frobozz"); - A->set_interop (false); shared_ptr c (new FFmpegContent (A, "test/data/test.mp4")); A->examine_and_add_content (c); @@ -68,7 +67,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) B->set_container (Ratio::from_id ("185")); B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); B->set_name ("frobozz"); - B->set_interop (false); shared_ptr d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); d->add_kdm (kdm); diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index bb47fa9c0..44d67f97d 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -71,7 +71,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) m.studio = "DI"; m.facility = "PP"; film->set_isdcf_metadata (m); - film->set_interop (false); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV"); /* Test interior aspect ratio: shouldn't be shown with trailers */ diff --git a/test/test.cc b/test/test.cc index 86dddbeda..374f14637 100644 --- a/test/test.cc +++ b/test/test.cc @@ -79,6 +79,7 @@ struct TestConfig Config::instance()->set_default_dcp_content_type (static_cast (0)); Config::instance()->set_default_audio_delay (0); Config::instance()->set_default_j2k_bandwidth (100000000); + Config::instance()->set_default_interop (false); Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); EncodeServerFinder::instance()->stop (); -- 2.30.2